Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: prod deploy gas opt #6

Merged
merged 3 commits into from
Dec 11, 2024
Merged

fix: prod deploy gas opt #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
030cb4b
chore: update prod deploy scripts
0xRaccoon Dec 9, 2024
838f89e
fix: optimize prod deploy
0xRaccoon Dec 11, 2024
9ba322d
Merge branch 'feat/wind-down-upgrade' of github-defi:defi-wonderland/…
0xRaccoon Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/contracts-bedrock/scripts/winddown-upgrade/local/Winddown.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ contract WinddownUpgrade is Script {
bytes32 storageData = vm.load(address(optimismPortalProxy), OWNER_KEY);
address adminAddress = address(uint160(uint256(storageData)));

console.log("OptimismPortal admin address: ", adminAddress);

vm.startBroadcast(adminAddress);

// Deploy OptimismPortal implementation
Expand Down Expand Up @@ -86,6 +88,8 @@ contract WinddownUpgrade is Script {

vm.startBroadcast(adminAddress);

console.log("L1StandardBridge admin address: ", adminAddress);

// Deploy L1StandardBridge implementation
L1StandardBridge l1StandardBridgeImpl = new L1StandardBridge({
_messenger: payable(WinddownConstants.MESSENGER),
Expand Down
28 changes: 14 additions & 14 deletions packages/contracts-bedrock/scripts/winddown-upgrade/prod/Winddown-implementation.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ contract WinddownImplementationDeploy is Script {
uint256 _deployerPk = vm.envUint("PRIVATE_KEY_DEPLOYER");
address _deployer = vm.addr(_deployerPk);
address _balanceClaimerProxyAdmin = vm.envAddress("BALANCE_CLAIMER_PROXY_ADMIN_PUBLIC_ADDRESS");

vm.startBroadcast(_deployer);

// Deploy BalanceClaimer proxy
Expand All @@ -38,11 +37,6 @@ contract WinddownImplementationDeploy is Script {
// Change the admin of the BalanceClaimer proxy
balanceClaimerProxy.changeAdmin(_balanceClaimerProxyAdmin);

// BalanceClaimer assertions
assert(address(BalanceClaimer(address(balanceClaimerProxy)).ETH_BALANCE_WITHDRAWER()) == WinddownConstants.OPTIMISM_PORTAL_PROXY);
assert(address(BalanceClaimer(address(balanceClaimerProxy)).ERC20_BALANCE_WITHDRAWER()) == WinddownConstants.L1_STANDARD_BRIDGE_PROXY);
assert(BalanceClaimer(address(balanceClaimerProxy)).ROOT() == WinddownConstants.MERKLE_ROOT);

// Deploy OptimismPortal implementation
OptimismPortal opPortalImpl = new OptimismPortal({
_l2Oracle: L2OutputOracle(WinddownConstants.L2_ORACLE),
Expand All @@ -52,19 +46,27 @@ contract WinddownImplementationDeploy is Script {
_balanceClaimer: address(balanceClaimerProxy)
});

// OptimismPortal assertions
assert(address(OptimismPortal(payable(address(opPortalImpl))).L2_ORACLE()) == WinddownConstants.L2_ORACLE);
assert(address(OptimismPortal(payable(address(opPortalImpl))).GUARDIAN()) == WinddownConstants.GUARDIAN);
assert(address(OptimismPortal(payable(address(opPortalImpl))).SYSTEM_CONFIG()) == WinddownConstants.SYSTEM_CONFIG);
assert(address(OptimismPortal(payable(address(opPortalImpl))).BALANCE_CLAIMER()) == address(balanceClaimerProxy));
// No assertion for pause since it's set in the initializer and setting true or false in the new implementation constructor parameter is idempotent

// Deploy L1StandardBridge implementation
L1StandardBridge l1StandardBridgeImpl = new L1StandardBridge({
_messenger: payable(WinddownConstants.MESSENGER),
_balanceClaimer: address(balanceClaimerProxy)
});

vm.stopBroadcast();

// BalanceClaimer assertions
assert(address(BalanceClaimer(address(balanceClaimerProxy)).ETH_BALANCE_WITHDRAWER()) == WinddownConstants.OPTIMISM_PORTAL_PROXY);
assert(address(BalanceClaimer(address(balanceClaimerProxy)).ERC20_BALANCE_WITHDRAWER()) == WinddownConstants.L1_STANDARD_BRIDGE_PROXY);
assert(BalanceClaimer(address(balanceClaimerProxy)).ROOT() == WinddownConstants.MERKLE_ROOT);

// OptimismPortal assertions
assert(address(OptimismPortal(payable(address(opPortalImpl))).L2_ORACLE()) == WinddownConstants.L2_ORACLE);
assert(address(OptimismPortal(payable(address(opPortalImpl))).GUARDIAN()) == WinddownConstants.GUARDIAN);
assert(address(OptimismPortal(payable(address(opPortalImpl))).SYSTEM_CONFIG()) == WinddownConstants.SYSTEM_CONFIG);
assert(address(OptimismPortal(payable(address(opPortalImpl))).BALANCE_CLAIMER()) == address(balanceClaimerProxy));
// No assertion for pause since it's set in the initializer and setting true or false in the new implementation constructor parameter is idempotent

// L1StandardBridge assertions
assert(address(L1StandardBridge(payable(address(l1StandardBridgeImpl))).BALANCE_CLAIMER()) == address(balanceClaimerProxy));
assert(address(L1StandardBridge(payable(address(l1StandardBridgeImpl))).MESSENGER()) == WinddownConstants.MESSENGER);
Expand All @@ -73,7 +75,5 @@ contract WinddownImplementationDeploy is Script {
console.log("BalanceClaimer implementatoin deployed at: ", address(balanceClaimerImpl));
console.log("OptimismPortal implementation deployed at: ", address(opPortalImpl));
console.log("L1StandardBridge implementation deployed at: ", address(l1StandardBridgeImpl));

vm.stopBroadcast();
}
}
Loading