Skip to content

Commit 0fd4ad2

Browse files
anna-carrollanna-carroll
authored
feat: deploy Rollup contracts (#76)
* feat: deploy script for rollup contracts * add deps * fix: rm deprecated script * refactor, simplify * feat: WETH9 deploy script * fix: fmt * update MINTER address
1 parent 914146a commit 0fd4ad2

8 files changed

+167
-10
lines changed

‎.gitmodules

+9
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,12 @@
77
[submodule "lib/permit2"]
88
path = lib/permit2
99
url = https://github.com/Uniswap/permit2
10+
[submodule "lib/simple-erc20"]
11+
path = lib/simple-erc20
12+
url = https://github.com/init4tech/simple-erc20
13+
[submodule "lib/safe-smart-account"]
14+
path = lib/safe-smart-account
15+
url = https://github.com/safe-global/safe-smart-account
16+
[submodule "lib/stablecoin-evm"]
17+
path = lib/stablecoin-evm
18+
url = https://github.com/circlefin/stablecoin-evm

‎lib/safe-smart-account

Submodule safe-smart-account added at bf943f8

‎lib/simple-erc20

Submodule simple-erc20 added at 36523ad

‎lib/stablecoin-evm

Submodule stablecoin-evm added at 405efc1

‎script/DeployGnosisSafe.s.sol

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
// SPDX-License-Identifier: MIT OR Apache-2.0
2+
pragma solidity 0.8.26;
3+
4+
// deps
5+
import {SafeL2} from "safe-smart-account/contracts/SafeL2.sol";
6+
import {SafeProxyFactory} from "safe-smart-account/contracts/proxies/SafeProxyFactory.sol";
7+
import {CompatibilityFallbackHandler} from "safe-smart-account/contracts/handler/CompatibilityFallbackHandler.sol";
8+
// script deps
9+
import {Script, console2} from "forge-std/Script.sol";
10+
11+
struct SafeSetup {
12+
address[] owners;
13+
uint256 threshold;
14+
address to;
15+
bytes data;
16+
address fallbackHandler;
17+
address paymentToken;
18+
uint256 payment;
19+
address payable paymentReceiver;
20+
uint256 saltNonce;
21+
}
22+
23+
address constant OWNER_ONE = 0x1111111111111111111111111111111111111111;
24+
address constant OWNER_TWO = 0x2222222222222222222222222222222222222222;
25+
bytes32 constant SENTINEL_VALUE = 0x0000000000000000000000000000000000000000000000000000000000000001;
26+
27+
contract GnosisScript is Script {
28+
// deploy:
29+
// forge script GnosisScript --sig "deployGnosis()" --rpc-url $RPC_URL --broadcast [signing args]
30+
function deployGnosis()
31+
public
32+
returns (address gnosisFactory, address gnosisSingleton, address gnosisFallbackHandler, address usdcAdmin)
33+
{
34+
vm.startBroadcast();
35+
36+
// deploy gnosis safe singleton & proxy factory
37+
(gnosisFactory, gnosisSingleton, gnosisFallbackHandler) = deployGnosisCore();
38+
39+
// deploy a gnosis safe proxy as the USDC admin
40+
usdcAdmin = deploySafeInstance(gnosisFactory, gnosisSingleton, getUsdcAdminSetup(gnosisFallbackHandler));
41+
}
42+
43+
function deployGnosisCore() public returns (address factory, address singleton, address fallbackHandler) {
44+
factory = address(new SafeProxyFactory{salt: "zenith.gnosisFactory"}());
45+
singleton = address(new SafeL2{salt: "zenith.gnosisSingleton"}());
46+
fallbackHandler = address(new CompatibilityFallbackHandler{salt: "zenith.gnosisFallbackHandlder"}());
47+
}
48+
49+
function deploySafeInstance(address factory, address singleton, SafeSetup memory setup)
50+
public
51+
returns (address safe)
52+
{
53+
bytes memory init = abi.encodeWithSignature(
54+
"setup(address[],uint256,address,bytes,address,address,uint256,address)",
55+
setup.owners,
56+
setup.threshold,
57+
setup.to,
58+
setup.data,
59+
setup.fallbackHandler,
60+
setup.paymentToken,
61+
setup.payment,
62+
setup.paymentReceiver
63+
);
64+
safe = address(SafeProxyFactory(factory).createProxyWithNonce(singleton, init, setup.saltNonce));
65+
}
66+
67+
// setup the gnosis safe with 2 owners, threshold of 1.
68+
// make the owners recognizable addrs to aid in inspecting storage layout
69+
function getUsdcAdminSetup(address fallbackHandler) public pure returns (SafeSetup memory usdcAdminSetup) {
70+
address[] memory owners = new address[](2);
71+
owners[0] = OWNER_ONE;
72+
owners[1] = OWNER_TWO;
73+
usdcAdminSetup = SafeSetup({
74+
owners: owners,
75+
threshold: 1,
76+
to: address(0),
77+
data: "",
78+
fallbackHandler: fallbackHandler,
79+
paymentToken: address(0),
80+
payment: 0,
81+
paymentReceiver: payable(address(0)),
82+
saltNonce: 17001
83+
});
84+
}
85+
86+
// example run:
87+
// forge script GnosisScript --sig "printOwnerSlots" "[0x1111111111111111111111111111111111111111, 0x2222222222222222222222222222222222222222]"
88+
function printOwnerSlots(address[] memory owners) public pure {
89+
for (uint256 i = 0; i <= owners.length; i++) {
90+
bytes32 value = (i == 0) ? SENTINEL_VALUE : addressToBytes32(owners[i - 1]);
91+
bytes32 slot = keccak256(abi.encodePacked(value, uint256(2)));
92+
console2.logBytes32(slot);
93+
}
94+
}
95+
96+
function addressToBytes32(address addr) internal pure returns (bytes32) {
97+
return bytes32(uint256(uint160(addr)));
98+
}
99+
}

‎script/DeployWETH9.s.sol

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// SPDX-License-Identifier: MIT OR Apache-2.0
2+
pragma solidity 0.8.26;
3+
4+
// utils
5+
import {Script, console2} from "forge-std/Script.sol";
6+
7+
contract WETHScript is Script {
8+
// forge script WETHScript --sig "deployWETH9()" --rpc-url $RPC_URL --broadcast [signing args]
9+
function deployWETH9() public returns (address weth9) {
10+
vm.startBroadcast();
11+
12+
bytes memory deployCode =
13+
hex"60606040526040805190810160405280600d81526020017f57726170706564204574686572000000000000000000000000000000000000008152506000908051906020019061004f9291906100c8565b506040805190810160405280600481526020017f57455448000000000000000000000000000000000000000000000000000000008152506001908051906020019061009b9291906100c8565b506012600260006101000a81548160ff021916908360ff16021790555034156100c357600080fd5b61016d565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061010957805160ff1916838001178555610137565b82800160010185558215610137579182015b8281111561013657825182559160200191906001019061011b565b5b5090506101449190610148565b5090565b61016a91905b8082111561016657600081600090555060010161014e565b5090565b90565b610c348061017c6000396000f3006060604052600436106100af576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100b9578063095ea7b31461014757806318160ddd146101a157806323b872dd146101ca5780632e1a7d4d14610243578063313ce5671461026657806370a082311461029557806395d89b41146102e2578063a9059cbb14610370578063d0e30db0146103ca578063dd62ed3e146103d4575b6100b7610440565b005b34156100c457600080fd5b6100cc6104dd565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561010c5780820151818401526020810190506100f1565b50505050905090810190601f1680156101395780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561015257600080fd5b610187600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061057b565b604051808215151515815260200191505060405180910390f35b34156101ac57600080fd5b6101b461066d565b6040518082815260200191505060405180910390f35b34156101d557600080fd5b610229600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061068c565b604051808215151515815260200191505060405180910390f35b341561024e57600080fd5b61026460048080359060200190919050506109d9565b005b341561027157600080fd5b610279610b05565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a057600080fd5b6102cc600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610b18565b6040518082815260200191505060405180910390f35b34156102ed57600080fd5b6102f5610b30565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561033557808201518184015260208101905061031a565b50505050905090810190601f1680156103625780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561037b57600080fd5b6103b0600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610bce565b604051808215151515815260200191505060405180910390f35b6103d2610440565b005b34156103df57600080fd5b61042a600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610be3565b6040518082815260200191505060405180910390f35b34600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055503373ffffffffffffffffffffffffffffffffffffffff167fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c346040518082815260200191505060405180910390a2565b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156105735780601f1061054857610100808354040283529160200191610573565b820191906000526020600020905b81548152906001019060200180831161055657829003601f168201915b505050505081565b600081600460003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a36001905092915050565b60003073ffffffffffffffffffffffffffffffffffffffff1631905090565b600081600360008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101515156106dc57600080fd5b3373ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff16141580156107b457507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600460008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205414155b156108cf5781600460008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015151561084457600080fd5b81600460008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055505b81600360008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254039250508190555081600360008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190509392505050565b80600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410151515610a2757600080fd5b80600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610ab457600080fd5b3373ffffffffffffffffffffffffffffffffffffffff167f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65826040518082815260200191505060405180910390a250565b600260009054906101000a900460ff1681565b60036020528060005260406000206000915090505481565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610bc65780601f10610b9b57610100808354040283529160200191610bc6565b820191906000526020600020905b815481529060010190602001808311610ba957829003601f168201915b505050505081565b6000610bdb33848461068c565b905092915050565b60046020528160005260406000206020528060005260406000206000915091505054815600a165627a7a72305820deb4c2ccab3c2fdca32ab3f46728389c2fe2c165d5fafa07661e4e004f6c344a0029";
14+
15+
assembly {
16+
weth9 := create(0, add(deployCode, 0x20), mload(deployCode))
17+
}
18+
}
19+
}

‎script/Zenith.s.sol

-10
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ pragma solidity 0.8.26;
55
import {Zenith} from "../src/Zenith.sol";
66
import {Transactor} from "../src/Transactor.sol";
77
import {HostOrders} from "../src/orders/HostOrders.sol";
8-
import {RollupOrders} from "../src/orders/RollupOrders.sol";
98
import {Passage} from "../src/passage/Passage.sol";
10-
import {RollupPassage} from "../src/passage/RollupPassage.sol";
119
// utils
1210
import {Script} from "forge-std/Script.sol";
1311

@@ -28,14 +26,6 @@ contract ZenithScript is Script {
2826
m = new HostOrders(permit2);
2927
}
3028

31-
// deploy:
32-
// forge script ZenithScript --sig "deployL2(address)" --rpc-url $L2_RPC_URL --private-key $PRIVATE_KEY --broadcast $PERMIT_2
33-
function deployL2(address permit2) public returns (RollupPassage p, RollupOrders m) {
34-
vm.startBroadcast();
35-
p = new RollupPassage(permit2);
36-
m = new RollupOrders(permit2);
37-
}
38-
3929
// NOTE: script must be run using SequencerAdmin key
4030
// set sequencer:
4131
// forge script ZenithScript --sig "setSequencerRole(address,address)" --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast $ZENITH_ADDRESS $SEQUENCER_ADDRESS

‎script/ZenithL2.s.sol

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// SPDX-License-Identifier: MIT OR Apache-2.0
2+
pragma solidity 0.8.26;
3+
4+
// system contracts
5+
import {RollupOrders} from "../src/orders/RollupOrders.sol";
6+
import {RollupPassage} from "../src/passage/RollupPassage.sol";
7+
// simple erc20
8+
import {SimpleERC20} from "simple-erc20/SimpleERC20.sol";
9+
// utils
10+
import {Script, console2} from "forge-std/Script.sol";
11+
12+
// create2 address for Permit2
13+
address constant PERMIT2 = 0x000000000022D473030F116dDEE9F6B43aC78BA3;
14+
// address that can mint ERC20 tokens. equal to "tokenadmin" in hex.
15+
// the Signet Node makes evm executions from this address to perform ERC20 bridge-ins.
16+
address constant MINTER = 0x00000000000000000000746f6b656E61646d696E;
17+
18+
contract L2Script is Script {
19+
// deploy:
20+
// forge script L2Script --sig "deploySystem()" --rpc-url $RPC_URL --broadcast [signing args]
21+
function deploySystem() public returns (address rollupPassage, address rollupOrders, address wbtc, address usdt) {
22+
vm.startBroadcast();
23+
24+
// deploy system contracts
25+
rollupPassage = address(new RollupPassage{salt: "zenith.rollupPassage"}(PERMIT2));
26+
rollupOrders = address(new RollupOrders{salt: "zenith.rollupOrders"}(PERMIT2));
27+
28+
// deploy simple erc20 tokens
29+
wbtc = address(new SimpleERC20{salt: "zenith.wbtc"}(MINTER, "Wrapped BTC", "WBTC"));
30+
usdt = address(new SimpleERC20{salt: "zenith.usdt"}(MINTER, "Tether USD", "USDT"));
31+
}
32+
}
33+
34+
// NOTE: must deploy Permit2 via https://github.com/Uniswap/permit2/blob/main/script/DeployPermit2.s.sol
35+
// in order to properly setup _CACHED_CHAIN_ID and _CACHED_DOMAIN_SEPARATOR
36+
37+
// NOTE: must deploy USDC via https://github.com/circlefin/stablecoin-evm/blob/master/scripts/deploy/deploy-fiat-token.s.sol

0 commit comments

Comments
 (0)