Merge pull request #59 from ethereum-optimism/tip/pcw109550/optimism-…

…24a8d3e

Update optimism submodule version to 24a8d3e

.circleci/config.yml

@@ -73,15 +73,7 @@ jobs:
           command: pnpm build
           working_directory: rvsol/lib/optimism
       - run:
-          name: Generate FPAC allocs
-          command: DEVNET_FPAC="true" make devnet-allocs
-          working_directory: rvsol/lib/optimism
-      - run:
-          name: Copy FPAC allocs to .devnet-fpac
-          command: cp -r .devnet/ .devnet-fault-proofs/
-          working_directory: rvsol/lib/optimism
-      - run:
-          name: Generate non-FPAC allocs
+          name: Generate allocs
           command: make devnet-allocs
           working_directory: rvsol/lib/optimism
       - persist_to_workspace:
@@ -93,9 +85,9 @@ jobs:
             - "packages/contracts-bedrock/forge-artifacts"
             - "packages/contracts-bedrock/tsconfig.tsbuildinfo"
             - "packages/contracts-bedrock/tsconfig.build.tsbuildinfo"
-            - ".devnet-fault-proofs/allocs-l1.json"
-            - ".devnet-fault-proofs/addresses.json"
             - ".devnet/allocs-l1.json"
+            - ".devnet/allocs-l2.json"
+            - ".devnet/allocs-l2-delta.json"      
             - ".devnet/addresses.json"
             - "packages/contracts-bedrock/deploy-config/devnetL1.json"
             - "packages/contracts-bedrock/deployments/devnetL1"
@@ -269,6 +261,8 @@ jobs:
           command: |
             mkdir -p .devnet
             cp /tmp/workspace/.devnet/allocs-l1.json .devnet/allocs-l1.json
+            cp /tmp/workspace/.devnet/allocs-l2.json .devnet/allocs-l2.json
+            cp /tmp/workspace/.devnet/allocs-l2-delta.json .devnet/allocs-l2-delta.json
             cp /tmp/workspace/.devnet/addresses.json .devnet/addresses.json
             cp /tmp/workspace/packages/contracts-bedrock/deploy-config/devnetL1.json devnetL1.json
             cp -r /tmp/workspace/packages/contracts-bedrock/deployments/devnetL1 devnetL1
@@ -316,6 +310,12 @@ jobs:
             echo $ASTERISC_ADDR
             jq --arg key $ASTERISC_ADDR '.[$key]' ./allocs-l1-asterisc.json
           working_directory: rvsol
+      - run:
+          name: Copy L2 Allocs
+          command: |
+            cp .devnet/allocs-l2.json .devnet-asterisc/allocs-l2.json 
+            cp .devnet/allocs-l2-delta.json .devnet-asterisc/allocs-l2-delta.json 
+          working_directory: rvsol
       - persist_to_workspace:
           root: rvsol
           paths:

go.mod

@@ -7,7 +7,7 @@ toolchain go1.21.1
 replace github.com/ethereum/go-ethereum v1.13.11 => github.com/ethereum-optimism/op-geth v1.101311.0
 
 require (
-	github.com/ethereum-optimism/optimism v1.7.4-0.20240419175707-d2263b19958f
+	github.com/ethereum-optimism/optimism v1.7.4-0.20240423190714-24a8d3e06e61
 	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240418160534-4156733e7232
 	github.com/ethereum/go-ethereum v1.13.11
 	github.com/holiman/uint256 v1.2.4

go.sum

@@ -57,8 +57,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etly
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
 github.com/ethereum-optimism/op-geth v1.101311.0 h1:n0e5WD9kEwuXb5prAO7b+2ctz/sLy6tlJ2qmbbPEi9Y=
 github.com/ethereum-optimism/op-geth v1.101311.0/go.mod h1:K23yb9efVf9DdUOv/vl/Ux57Tng00rLaFqWYlFF45CA=
-github.com/ethereum-optimism/optimism v1.7.4-0.20240419175707-d2263b19958f h1:Y7u66VLjC7JvU1q4816cWVK9D388nDpW3NQbMhJZY8g=
-github.com/ethereum-optimism/optimism v1.7.4-0.20240419175707-d2263b19958f/go.mod h1:+M2UOTyG20iuKiQOi+Pzz3abOtTYbTnwah/CIp8o6Y8=
+github.com/ethereum-optimism/optimism v1.7.4-0.20240423190714-24a8d3e06e61 h1:SpffjnyRUyBoFxpimKbBPTeEgV8nGFVQwAOIJHzDBpc=
+github.com/ethereum-optimism/optimism v1.7.4-0.20240423190714-24a8d3e06e61/go.mod h1:+M2UOTyG20iuKiQOi+Pzz3abOtTYbTnwah/CIp8o6Y8=
 github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240418160534-4156733e7232 h1:jRdLJs4E3ilsDGK7+k39QPi3QKL/b1cLnyv8mfOCVo4=
 github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240418160534-4156733e7232/go.mod h1:7xh2awFQqsiZxFrHKTgEd+InVfDRrkKVUIuK8SAFHp0=
 github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY=

tests/op-program-test/VERSION

@@ -1 +1 @@
-d2263b19958f7f1e738ff79dae7ebb240cca1375
+24a8d3e06e61c7a8938dfb7a591345a437036381

tests/op-program-test/local_cmd.sh

@@ -10,11 +10,11 @@
   --l2.genesis ./chain-artifacts/genesis-l2.json \
   --l1.trustrpc \
   --l1.rpckind debug_geth \
-  --l1.head 0x722330dbad7965f62d1ca187f1f4468fadc57669613b9db17321f2514882ff45 \
-  --l2.head 0x47e53c1c90ff2e52f3b7eb5121d655499ce714f65d6de3856df122c762466323 \
-  --l2.outputroot 0xd6db4d9b8e1fb700a8c8f36c01dabea14713d99989ffcca12074bbd564071515 \
-  --l2.claim 0xa84525e49f8c8ef78a50ed6c9185933257b26628d478ddd3cd63ceaa79ddd01b \
-  --l2.blocknumber 30 \
+  --l1.head 0xdbfb0caff9c3c3d75ed48b7ff7a6eeb26fdb5329e669e9e0d700a7a05c32db74 \
+  --l2.head 0xdb19a102d2f4e2778ceb1121843aa9a47e7c68ceaff9407d02f1519e0716ec8d \
+  --l2.outputroot 0x53983aa145265affe0675b43cda64baffdb97fea5dfb7a7144386b80430d27de \
+  --l2.claim 0x7a35b8c93e63f12fb6078afff0ebf8b2ab41328419ec413ad010b22a74444ef1 \
+  --l2.blocknumber 20 \
   --datadir ./preimages \
   --log.format terminal \
   --server