refactor, simplify

Author: anna-carroll

script/DeployGnosisSafe.s.sol

@@ -20,29 +20,68 @@ struct SafeSetup {
     uint256 saltNonce;
 }
 
-function deployGnosisCore() returns (address factory, address singleton, address fallbackHandler) {
-    factory = address(new SafeProxyFactory{salt: "zenith.gnosisFactory"}());
-    singleton = address(new SafeL2{salt: "zenith.gnosisSingleton"}());
-    fallbackHandler = address(new CompatibilityFallbackHandler{salt: "zenith.gnosisFallbackHandlder"}());
-}
-
-function deploySafeInstance(address factory, address singleton, SafeSetup memory setup) returns (address safe) {
-    bytes memory init = abi.encodeWithSignature(
-        "setup(address[],uint256,address,bytes,address,address,uint256,address)",
-        setup.owners,
-        setup.threshold,
-        setup.to,
-        setup.data,
-        setup.fallbackHandler,
-        setup.paymentToken,
-        setup.payment,
-        setup.paymentReceiver
-    );
-    safe = address(SafeProxyFactory(factory).createProxyWithNonce(singleton, init, setup.saltNonce));
-}
+address constant OWNER_ONE = 0x1111111111111111111111111111111111111111;
+address constant OWNER_TWO = 0x2222222222222222222222222222222222222222;
+bytes32 constant SENTINEL_VALUE = 0x0000000000000000000000000000000000000000000000000000000000000001;
 
 contract GnosisScript is Script {
-    bytes32 constant SENTINEL_VALUE = 0x0000000000000000000000000000000000000000000000000000000000000001;
+    // deploy:
+    // forge script GnosisScript --sig "deployGnosis()" --rpc-url $RPC_URL --broadcast [signing args]
+    function deployGnosis()
+        public
+        returns (address gnosisFactory, address gnosisSingleton, address gnosisFallbackHandler, address usdcAdmin)
+    {
+        vm.startBroadcast();
+
+        // deploy gnosis safe singleton & proxy factory
+        (gnosisFactory, gnosisSingleton, gnosisFallbackHandler) = deployGnosisCore();
+
+        // deploy a gnosis safe proxy as the USDC admin
+        usdcAdmin = deploySafeInstance(gnosisFactory, gnosisSingleton, getUsdcAdminSetup(gnosisFallbackHandler));
+    }
+
+    function deployGnosisCore() public returns (address factory, address singleton, address fallbackHandler) {
+        factory = address(new SafeProxyFactory{salt: "zenith.gnosisFactory"}());
+        singleton = address(new SafeL2{salt: "zenith.gnosisSingleton"}());
+        fallbackHandler = address(new CompatibilityFallbackHandler{salt: "zenith.gnosisFallbackHandlder"}());
+    }
+
+    function deploySafeInstance(address factory, address singleton, SafeSetup memory setup)
+        public
+        returns (address safe)
+    {
+        bytes memory init = abi.encodeWithSignature(
+            "setup(address[],uint256,address,bytes,address,address,uint256,address)",
+            setup.owners,
+            setup.threshold,
+            setup.to,
+            setup.data,
+            setup.fallbackHandler,
+            setup.paymentToken,
+            setup.payment,
+            setup.paymentReceiver
+        );
+        safe = address(SafeProxyFactory(factory).createProxyWithNonce(singleton, init, setup.saltNonce));
+    }
+
+    // setup the gnosis safe with 2 owners, threshold of 1.
+    // make the owners recognizable addrs to aid in inspecting storage layout
+    function getUsdcAdminSetup(address fallbackHandler) public pure returns (SafeSetup memory usdcAdminSetup) {
+        address[] memory owners = new address[](2);
+        owners[0] = OWNER_ONE;
+        owners[1] = OWNER_TWO;
+        usdcAdminSetup = SafeSetup({
+            owners: owners,
+            threshold: 1,
+            to: address(0),
+            data: "",
+            fallbackHandler: fallbackHandler,
+            paymentToken: address(0),
+            payment: 0,
+            paymentReceiver: payable(address(0)),
+            saltNonce: 17001
+        });
+    }
 
     // example run:
     // forge script GnosisScript --sig "printOwnerSlots" "[0x1111111111111111111111111111111111111111, 0x2222222222222222222222222222222222222222]"

script/DeployL2.s.sol

@@ -2,25 +2,35 @@
 pragma solidity 0.8.26;
 
 // system contracts
-import {deployPartOne, deployPartTwo} from "./DeployL2.s.sol";
+import {RollupOrders} from "../src/orders/RollupOrders.sol";
+import {RollupPassage} from "../src/passage/RollupPassage.sol";
+// simple erc20
+import {SimpleERC20} from "simple-erc20/SimpleERC20.sol";
 // utils
 import {Script, console2} from "forge-std/Script.sol";
 
+// create2 address for Permit2
+address constant PERMIT2 = 0x000000000022D473030F116dDEE9F6B43aC78BA3;
+// address of Minter with permission to mint ERC20 tokens
+address constant MINTER = 0x9999999999999999999999999999999999999999;
+
 contract L2Script is Script {
     // deploy:
-    // forge script L2Script --sig "deployOne()" --fork-url $ANVIL_URL --broadcast
-    function deployOne() public returns (address rollupPassage, address rollupOrders, address wbtc, address usdt) {
+    // forge script L2Script --sig "deploySystem()" --rpc-url $RPC_URL --broadcast [signing args]
+    function deploySystem() public returns (address rollupPassage, address rollupOrders, address wbtc, address usdt) {
         vm.startBroadcast();
-        (rollupPassage, rollupOrders, wbtc, usdt) = deployPartOne();
-    }
 
-    // deploy:
-    // forge script L2Script --sig "deployTwo()" --fork-url $ANVIL_URL --broadcast
-    function deployTwo()
-        public
-        returns (address gnosisFactory, address gnosisSingleton, address gnosisFallbackHandler, address usdcAdmin)
-    {
-        vm.startBroadcast();
-        (gnosisFactory, gnosisSingleton, gnosisFallbackHandler, usdcAdmin) = deployPartTwo();
+        // deploy system contracts
+        rollupPassage = address(new RollupPassage{salt: "zenith.rollupPassage"}(PERMIT2));
+        rollupOrders = address(new RollupOrders{salt: "zenith.rollupOrders"}(PERMIT2));
+
+        // deploy simple erc20 tokens
+        wbtc = address(new SimpleERC20{salt: "zenith.wbtc"}(MINTER, "Wrapped BTC", "WBTC"));
+        usdt = address(new SimpleERC20{salt: "zenith.usdt"}(MINTER, "Tether USD", "USDT"));
     }
 }
+
+// NOTE: must deploy Permit2 via https://github.com/Uniswap/permit2/blob/main/script/DeployPermit2.s.sol
+// in order to properly setup _CACHED_CHAIN_ID and _CACHED_DOMAIN_SEPARATOR
+
+// NOTE: must deploy USDC via https://github.com/circlefin/stablecoin-evm/blob/master/scripts/deploy/deploy-fiat-token.s.sol