Skip to content

Commit a2cbaba

Browse files
8sunyuan0xClandestine
8sunyuan
authored and
0xClandestine
committed
fix: try catch out of gas edge case (#971)
1 parent f360658 commit a2cbaba

File tree

4 files changed

+241
-0
lines changed

4 files changed

+241
-0
lines changed

‎script/releases/v1.0.2-slashing/1-eoa.s.sol‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
// SPDX-License-Identifier: BUSL-1.1
2+
pragma solidity ^0.8.12;
3+
4+
import {EOADeployer} from "zeus-templates/templates/EOADeployer.sol";
5+
import "../Env.sol";
6+
7+
import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
8+
import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
9+
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
10+
import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
11+
12+
// Just upgrade StrategyManager
13+
contract Deploy is EOADeployer {
14+
using Env for *;
15+
16+
function _runAsEOA() internal override {
17+
vm.startBroadcast();
18+
deployImpl({
19+
name: type(StrategyManager).name,
20+
deployedTo: address(new StrategyManager({
21+
_delegation: Env.proxy.delegationManager(),
22+
_pauserRegistry: Env.impl.pauserRegistry()
23+
}))
24+
});
25+
26+
vm.stopBroadcast();
27+
}
28+
29+
function testDeploy() public virtual {
30+
_runAsEOA();
31+
_validateNewImplAddresses(false);
32+
_validateImplConstructors();
33+
_validateImplsInitialized();
34+
}
35+
36+
37+
/// @dev Validate that the `Env.impl` addresses are updated to be distinct from what the proxy
38+
/// admin reports as the current implementation address.
39+
///
40+
/// Note: The upgrade script can call this with `areMatching == true` to check that these impl
41+
/// addresses _are_ matches.
42+
function _validateNewImplAddresses(bool areMatching) internal view {
43+
function (address, address, string memory) internal pure assertion =
44+
areMatching ? _assertMatch : _assertNotMatch;
45+
46+
47+
assertion(
48+
_getProxyImpl(address(Env.proxy.strategyManager())),
49+
address(Env.impl.strategyManager()),
50+
"strategyManager impl failed"
51+
);
52+
}
53+
54+
/// @dev Validate the immutables set in the new implementation constructors
55+
function _validateImplConstructors() internal view {
56+
StrategyManager strategyManager = Env.impl.strategyManager();
57+
assertTrue(strategyManager.delegation() == Env.proxy.delegationManager(), "sm.dm invalid");
58+
assertTrue(strategyManager.pauserRegistry() == Env.impl.pauserRegistry(), "sm.pR invalid");
59+
}
60+
61+
/// @dev Call initialize on all deployed implementations to ensure initializers are disabled
62+
function _validateImplsInitialized() internal {
63+
bytes memory errInit = "Initializable: contract is already initialized";
64+
65+
StrategyManager strategyManager = Env.impl.strategyManager();
66+
vm.expectRevert(errInit);
67+
strategyManager.initialize(address(0), address(0), 0);
68+
}
69+
70+
/// @dev Query and return `proxyAdmin.getProxyImplementation(proxy)`
71+
function _getProxyImpl(address proxy) internal view returns (address) {
72+
return ProxyAdmin(Env.proxyAdmin()).getProxyImplementation(ITransparentUpgradeableProxy(proxy));
73+
}
74+
75+
/// @dev Query and return `proxyAdmin.getProxyAdmin(proxy)`
76+
function _getProxyAdmin(address proxy) internal view returns (address) {
77+
return ProxyAdmin(Env.proxyAdmin()).getProxyAdmin(ITransparentUpgradeableProxy(proxy));
78+
}
79+
80+
function _assertMatch(address a, address b, string memory err) private pure {
81+
assertEq(a, b, err);
82+
}
83+
84+
function _assertNotMatch(address a, address b, string memory err) private pure {
85+
assertNotEq(a, b, err);
86+
}
87+
}

‎script/releases/v1.0.2-slashing/2-multisig.s.sol‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
// SPDX-License-Identifier: BUSL-1.1
2+
pragma solidity ^0.8.12;
3+
4+
import {Deploy} from "./1-eoa.s.sol";
5+
import "../Env.sol";
6+
7+
import {MultisigBuilder} from "zeus-templates/templates/MultisigBuilder.sol";
8+
import "zeus-templates/utils/Encode.sol";
9+
10+
import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";
11+
12+
contract Queue is MultisigBuilder, Deploy {
13+
using Env for *;
14+
using Encode for *;
15+
16+
function _runAsMultisig() prank(Env.opsMultisig()) internal virtual override {
17+
bytes memory calldata_to_executor = _getCalldataToExecutor();
18+
19+
TimelockController timelock = Env.timelockController();
20+
timelock.schedule({
21+
target: Env.executorMultisig(),
22+
value: 0,
23+
data: calldata_to_executor,
24+
predecessor: 0,
25+
salt: 0,
26+
delay: timelock.getMinDelay()
27+
});
28+
}
29+
30+
/// @dev Get the calldata to be sent from the timelock to the executor
31+
function _getCalldataToExecutor() internal returns (bytes memory) {
32+
MultisigCall[] storage executorCalls = Encode.newMultisigCalls()
33+
/// core/
34+
.append({
35+
to: Env.proxyAdmin(),
36+
data: Encode.proxyAdmin.upgrade({
37+
proxy: address(Env.proxy.strategyManager()),
38+
impl: address(Env.impl.strategyManager())
39+
})
40+
});
41+
42+
return Encode.gnosisSafe.execTransaction({
43+
from: address(Env.timelockController()),
44+
to: address(Env.multiSendCallOnly()),
45+
op: Encode.Operation.DelegateCall,
46+
data: Encode.multiSend(executorCalls)
47+
});
48+
}
49+
50+
function testScript() public virtual {
51+
runAsEOA();
52+
53+
TimelockController timelock = Env.timelockController();
54+
bytes memory calldata_to_executor = _getCalldataToExecutor();
55+
bytes32 txHash = timelock.hashOperation({
56+
target: Env.executorMultisig(),
57+
value: 0,
58+
data: calldata_to_executor,
59+
predecessor: 0,
60+
salt: 0
61+
});
62+
63+
// Check that the upgrade does not exist in the timelock
64+
assertFalse(timelock.isOperationPending(txHash), "Transaction should NOT be queued.");
65+
66+
execute();
67+
68+
// Check that the upgrade has been added to the timelock
69+
assertTrue(timelock.isOperationPending(txHash), "Transaction should be queued.");
70+
}
71+
}

‎script/releases/v1.0.2-slashing/3-execute.s.sol‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
// SPDX-License-Identifier: BUSL-1.1
2+
pragma solidity ^0.8.12;
3+
4+
import "../Env.sol";
5+
import {Queue} from "./2-multisig.s.sol";
6+
7+
import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
8+
import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
9+
10+
contract Execute is Queue {
11+
using Env for *;
12+
13+
function _runAsMultisig() prank(Env.protocolCouncilMultisig()) internal override(Queue) {
14+
bytes memory calldata_to_executor = _getCalldataToExecutor();
15+
16+
TimelockController timelock = Env.timelockController();
17+
timelock.execute({
18+
target: Env.executorMultisig(),
19+
value: 0,
20+
payload: calldata_to_executor,
21+
predecessor: 0,
22+
salt: 0
23+
});
24+
}
25+
26+
function testScript() public virtual override(Queue){
27+
// 0. Deploy Impls
28+
runAsEOA();
29+
30+
TimelockController timelock = Env.timelockController();
31+
bytes memory calldata_to_executor = _getCalldataToExecutor();
32+
bytes32 txHash = timelock.hashOperation({
33+
target: Env.executorMultisig(),
34+
value: 0,
35+
data: calldata_to_executor,
36+
predecessor: 0,
37+
salt: 0
38+
});
39+
assertFalse(timelock.isOperationPending(txHash), "Transaction should NOT be queued.");
40+
41+
// 1. Queue Upgrade
42+
Queue._runAsMultisig();
43+
_unsafeResetHasPranked(); // reset hasPranked so we can use it again
44+
45+
// 2. Warp past delay
46+
vm.warp(block.timestamp + timelock.getMinDelay()); // 1 tick after ETA
47+
assertEq(timelock.isOperationReady(txHash), true, "Transaction should be executable.");
48+
49+
// 3- execute
50+
execute();
51+
52+
assertTrue(timelock.isOperationDone(txHash), "Transaction should be complete.");
53+
54+
// 4. Validate
55+
_validateNewImplAddresses(true);
56+
_validateProxyConstructors();
57+
}
58+
59+
function _validateProxyConstructors() internal view {
60+
StrategyManager strategyManager = Env.proxy.strategyManager();
61+
assertTrue(strategyManager.delegation() == Env.proxy.delegationManager(), "sm.dm invalid");
62+
assertTrue(strategyManager.pauserRegistry() == Env.impl.pauserRegistry(), "sm.pR invalid");
63+
}
64+
}

‎script/releases/v1.0.2-slashing/upgrade.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"name": "slashing-patch",
3+
"from": "1.0.1",
4+
"to": "1.0.2",
5+
"phases": [
6+
{
7+
"type": "eoa",
8+
"filename": "1-eoa.s.sol"
9+
},
10+
{
11+
"type": "multisig",
12+
"filename": "2-multisig.s.sol"
13+
},
14+
{
15+
"type": "multisig",
16+
"filename": "3-execute.s.sol"
17+
}
18+
]
19+
}

0 commit comments

Comments
 (0)