x

Author: mattstam

contracts/deployments/1.json

@@ -1,6 +1,12 @@
 {
   "GENESIS_STATE_ROOT": "0x7f1150ec996e291947d4a9a30a49155b5f042042f841f25db4d41da04cef63f4",
+  "GOVERNOR": "0x04AEf68a07151b4940bbde042B70ab298D77e85d",
+  "I_PROVE": "0x51Ae4c6bc32579c782Ce77D575280058BF9409Fa",
   "PROVE": "0x6BEF15D938d4E72056AC92Ea4bDD0D76B1C4ad29",
+  "STAKING": "0x9c539310fdAad2EB080587bF52a366cC5615108F",
+  "STAKING_IMPL": "0xAd729CA02dE58A7a179C6b2BB16657bA759DBD2c",
+  "VAPP": "0x22B61CC74102A2702E26B25deBAD6cb2dDeB0c07",
+  "VAPP_IMPL": "0x2272FEd07bbcda3b9A106A6EEdd9939c053BB73b",
   "VERIFIER": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B",
   "VKEY": "0x00379594d327723819f32e812d869de681100f77f766869b8d672072ab73e27c"
 }

contracts/deployments/11155111.json

@@ -4,7 +4,8 @@
   "I_PROVE": "0xda5b610ea2109636a8ce728dB5141c12499feA1B",
   "PROVE": "0x376099fd6B50B60FE8b24B909827C1795D6e5096",
   "PROVER": "0x7B7797E652C930A708eF761C93cbf427BA6aEa42",
-  "STAKING": "0x837D40650aB3b0AA02E7e28238D9FEA73031856C",
+  "STAKING": "0x33D3D91FD84FA388d1E4C99A2D0Cee6ec73a97c3",
+  "STAKING_IMPL": "0xAd729CA02dE58A7a179C6b2BB16657bA759DBD2c",
   "VAPP": "0x26CCcCBfd8474606EF575bbFa67F9654Da604379",
   "VERIFIER": "0x29A39a8Ecd2473FBcD7bfAA2526Fcb1B1F692Eb1",
   "VKEY": "0x004988f252500633b4d3d369b3726d5bdacfbe35236b36eb2d487af3742c905e"

contracts/foundry.toml

@@ -16,14 +16,10 @@ exclude_lints = ["mixed-case-variable", "mixed-case-function", "screaming-snake-
 [profile.deploy]
 optimizer = true
 optimizer_runs = 100
-bytecode_hash = "none"
-cbor_metadata = false
 
 [profile.fuzz]
 optimizer = true
 optimizer_runs = 100
-bytecode_hash = "none"
-cbor_metadata = false
 runs = 10000
 seed = "0x1234"
 

contracts/script/deploy/SuccinctStaking.s.sol

@@ -12,6 +12,21 @@ contract SuccinctStakingScript is BaseScript {
     function run() external broadcaster {
         // Read config
         bytes32 salt = readBytes32("CREATE2_SALT");
+
+        // Deploy contract
+        address STAKING_IMPL = address(new SuccinctStaking{salt: salt}());
+        address STAKING = address(
+            SuccinctStaking(payable(address(new ERC1967Proxy{salt: salt}(STAKING_IMPL, ""))))
+        );
+
+        // Write address
+        writeAddress(KEY, STAKING);
+        writeAddress(string.concat(KEY, "_IMPL"), STAKING_IMPL);
+    }
+
+    /// @dev Only run this once all of the other contracts are deployed. Script must be ran with OWNER's private key.
+    function initialize() external broadcaster {
+        address STAKING = readAddress(KEY);
         address OWNER = readAddress("OWNER");
         address GOVERNOR = readAddress("GOVERNOR");
         address VAPP = readAddress("VAPP");
@@ -23,31 +38,17 @@ contract SuccinctStakingScript is BaseScript {
         uint256 UNSTAKE_PERIOD = readUint256("UNSTAKE_PERIOD");
         uint256 SLASH_CANCELLATION_PERIOD = readUint256("SLASH_CANCELLATION_PERIOD");
 
-        // Encode the initialize function call data
-        bytes memory initData = abi.encodeCall(
-            SuccinctStaking.initialize,
-            (
-                OWNER,
-                GOVERNOR,
-                VAPP,
-                PROVE,
-                I_PROVE,
-                DISPENSER,
-                MIN_STAKE_AMOUNT,
-                MAX_UNSTAKE_REQUESTS,
-                UNSTAKE_PERIOD,
-                SLASH_CANCELLATION_PERIOD
-            )
-        );
-
-        // Deploy contract
-        address STAKING_IMPL = address(new SuccinctStaking{salt: salt}());
-        address STAKING = address(
-            SuccinctStaking(payable(address(new ERC1967Proxy{salt: salt}(STAKING_IMPL, initData))))
+        SuccinctStaking(STAKING).initialize(
+            OWNER,
+            GOVERNOR,
+            VAPP,
+            PROVE,
+            I_PROVE,
+            DISPENSER,
+            MIN_STAKE_AMOUNT,
+            MAX_UNSTAKE_REQUESTS,
+            UNSTAKE_PERIOD,
+            SLASH_CANCELLATION_PERIOD
         );
-
-        // Write address
-        writeAddress(KEY, STAKING);
-        writeAddress(string.concat(KEY, "_IMPL"), STAKING_IMPL);
     }
 }