fix: justfile fixes

succinctlabs · Nov 26, 2024 · 949b14e · 949b14e
1 parent ac65619
commit 949b14e
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 12 deletions.
diff --git a/configs/14567/rollup.json b/configs/14567/rollup.json
@@ -0,0 +1,49 @@
+{
+  "genesis": {
+    "l1": {
+      "number": 7116781,
+      "hash": "0xe280a82039d1162ec2e62c411010dfb01b183adb4eb76c16d118f4b4c3b545b2"
+    },
+    "l2": {
+      "number": 0,
+      "hash": "0xc7db405d93c2a650616fcbbdfe448622243af767fd829313cad711b3f4ceb47d"
+    },
+    "l2_time": 1732118604,
+    "system_config": {
+      "batcherAddr": "0xdc708653f8ddf3530e4c234095abfb5d2c7f5cf9",
+      "overhead": "0xbc",
+      "scalar": "0x10b30",
+      "gasLimit": 30000000,
+      "baseFeeScalar": null,
+      "blobBaseFeeScalar": null,
+      "eip1559Denominator": null,
+      "eip1559Elasticity": null
+    }
+  },
+  "block_time": 10,
+  "max_sequencer_drift": 600,
+  "seq_window_size": 3600,
+  "channel_timeout": 300,
+  "granite_channel_timeout": 50,
+  "l1_chain_id": 11155111,
+  "l2_chain_id": 14567,
+  "base_fee_params": {
+    "max_change_denominator": "0x32",
+    "elasticity_multiplier": "0x6"
+  },
+  "canyon_base_fee_params": {
+    "max_change_denominator": "0xfa",
+    "elasticity_multiplier": "0x6"
+  },
+  "regolith_time": 0,
+  "canyon_time": 0,
+  "delta_time": 0,
+  "ecotone_time": 0,
+  "fjord_time": 0,
+  "granite_time": 1732546800,
+  "holocene_time": 1732633200,
+  "batch_inbox_address": "0x4cd75b834c8c7839b1f02ee5060e91fc2fe1e011",
+  "deposit_contract_address": "0xe3aebf3575aa11340f968264adf6b255c9aa8a23",
+  "l1_system_config_address": "0x67a6cdb89bec7553a301203aa337f0cfb750a9dd",
+  "protocol_versions_address": "0x0000000000000000000000000000000000000000"
+}
diff --git a/contracts/opsuccinctl2ooconfig.json b/contracts/opsuccinctl2ooconfig.json
@@ -5,9 +5,9 @@
   "owner": "0xDEd0000E32f8F40414d3ab3a830f735a3553E18e",
   "proposer": "0xDEd0000E32f8F40414d3ab3a830f735a3553E18e",
   "rollupConfigHash": "0x0d7101e2acc7eae1fb42cfce5c604d14da561726e4e01b509315e5a9f97a9816",
-  "startingBlockNumber": 5121984,
-  "startingOutputRoot": "0xc25a9a3d288bab81ed02c3fc0da90f6324656a623077f711a3dcbba85c36c60c",
-  "startingTimestamp": 1732596456,
+  "startingBlockNumber": 5144835,
+  "startingOutputRoot": "0xfab9aa702f6ce506b02522cf2ea15e119b512cf61b4c9c1a62da1a5d6c6341f9",
+  "startingTimestamp": 1732642158,
   "submissionInterval": 1200,
   "verifier": "0x397A5f7f3dBd538f23DE225B51f532c34448dA9B",
   "aggregationVkey": "0x00da4ccbfe4221b7a2d4944b90d739383a85db05295d385bda008ac73a133183",

diff --git a/justfile b/justfile
@@ -1,5 +1,3 @@
-set dotenv-load
-
 default:
   @just --list
 
@@ -178,12 +176,12 @@ upgrade-oracle env_file=".env":
 
     # Run the forge upgrade script
     if [ "${EXECUTE_UPGRADE_CALL:-true}" = "false" ]; then
-        forge script script/OPSuccinctUpgrader.s.sol:OPSuccinctUpgrader \
+        L2OO_ADDRESS=$L2OO_ADDRESS forge script script/OPSuccinctUpgrader.s.sol:OPSuccinctUpgrader \
             --rpc-url $L1_RPC \
             --private-key $PRIVATE_KEY \
             --etherscan-api-key $ETHERSCAN_API_KEY
     else
-        forge script script/OPSuccinctUpgrader.s.sol:OPSuccinctUpgrader \
+        L2OO_ADDRESS=$L2OO_ADDRESS forge script script/OPSuccinctUpgrader.s.sol:OPSuccinctUpgrader \
             --rpc-url $L1_RPC \
             --private-key $PRIVATE_KEY \
             --verify \
@@ -208,14 +206,12 @@ update-parameters env_file=".env":
 
     # Run the forge upgrade script
     if [ "${EXECUTE_UPGRADE_CALL:-true}" = "false" ]; then
-        forge script script/OPSuccinctParameterUpdater.s.sol:OPSuccinctParameterUpdater \
+        L2OO_ADDRESS=$L2OO_ADDRESS forge script script/OPSuccinctParameterUpdater.s.sol:OPSuccinctParameterUpdater \
             --rpc-url $L1_RPC \
-            --private-key $PRIVATE_KEY \
-            --etherscan-api-key $ETHERSCAN_API_KEY
+            --private-key $PRIVATE_KEY
     else
-        forge script script/OPSuccinctParameterUpdater.s.sol:OPSuccinctParameterUpdater \
+        L2OO_ADDRESS=$L2OO_ADDRESS forge script script/OPSuccinctParameterUpdater.s.sol:OPSuccinctParameterUpdater \
             --rpc-url $L1_RPC \
             --private-key $PRIVATE_KEY \
-            --etherscan-api-key $ETHERSCAN_API_KEY \
             --broadcast
     fi