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

…8c19065 Update optimism submodule version to 8c19065
ethereum-optimism · Apr 29, 2024 · 7f7893e · 7f7893e
2 parents b02bc5d + 6e00f0a
commit 7f7893e
Show file tree

Hide file tree

Showing 11 changed files with 51,356 additions and 54,594 deletions.
diff --git a/go.mod b/go.mod
@@ -4,10 +4,10 @@ go 1.21
 
 toolchain go1.21.1
 
-replace github.com/ethereum/go-ethereum v1.13.11 => github.com/ethereum-optimism/op-geth v1.101311.0
+replace github.com/ethereum/go-ethereum v1.13.11 => github.com/ethereum-optimism/op-geth v1.101311.1-rc.1
 
 require (
-	github.com/ethereum-optimism/optimism v1.7.4-0.20240423190714-24a8d3e06e61
+	github.com/ethereum-optimism/optimism v1.7.5-0.20240426020511-8c19065a93a9
 	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

diff --git a/go.sum b/go.sum
@@ -55,10 +55,10 @@ github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5il
 github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs=
 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.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/op-geth v1.101311.1-rc.1 h1:oOLkib+1GGZAgOMc5cG0dcku928ml/L+1SsbBnXoGko=
+github.com/ethereum-optimism/op-geth v1.101311.1-rc.1/go.mod h1:K23yb9efVf9DdUOv/vl/Ux57Tng00rLaFqWYlFF45CA=
+github.com/ethereum-optimism/optimism v1.7.5-0.20240426020511-8c19065a93a9 h1:n63zOei0lK+NWfFGt7mmaeCxKGH7puwbi1FoE8ZRg4s=
+github.com/ethereum-optimism/optimism v1.7.5-0.20240426020511-8c19065a93a9/go.mod h1:A8ZV09pgVVmjabprGRKyQK5aJVldB7oOH3IiCS362MY=
 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=

diff --git a/rvsol/foundry.toml b/rvsol/foundry.toml
@@ -9,12 +9,7 @@ remappings = [
   '@optimism/=lib/optimism/packages/contracts-bedrock',
   '@openzeppelin/contracts-upgradeable/=lib/optimism/packages/contracts-bedrock/lib/openzeppelin-contracts-upgradeable/contracts',
   '@openzeppelin/contracts/=lib/optimism/packages/contracts-bedrock/lib/openzeppelin-contracts/contracts',
-  '@rari-capital/solmate/=lib/optimism/packages/contracts-bedrock/lib/solmate',
-  '@cwia/=lib/optimism/packages/contracts-bedrock/lib/clones-with-immutable-args/src',
   '@lib-keccak/=lib/optimism/packages/contracts-bedrock/lib/lib-keccak/contracts/lib',
-  'safe-contracts/=lib/optimism/packages/contracts-bedrock/lib/safe-contracts/contracts',
-  'kontrol-cheatcodes/=lib/optimism/packages/contracts-bedrock/lib/kontrol-cheatcodes/src',
-  'solady/=lib/optimism/packages/contracts-bedrock/lib/solady/src',
   '@solady/=lib/optimism/packages/contracts-bedrock/lib/solady/src',
 
   # We need these remappings to use the Optimism monorepo contracts as a library.

diff --git a/rvsol/lib/optimism b/rvsol/lib/optimism
diff --git a/tests/op-program-test/VERSION b/tests/op-program-test/VERSION
@@ -1 +1 @@
-24a8d3e06e61c7a8938dfb7a591345a437036381
+8c19065a93a9fef055e34935b284a6c226e63c29
diff --git a/tests/op-program-test/chain-artifacts/genesis-l2.json b/tests/op-program-test/chain-artifacts/genesis-l2.json
diff --git a/tests/op-program-test/chain-artifacts/rollup.json b/tests/op-program-test/chain-artifacts/rollup.json
@@ -1,14 +1,14 @@
 {
   "genesis": {
     "l1": {
-      "hash": "0x1c5bfc11e91b66dd64239c9ffcaf371c729294068f1a4c98e8001570081c876f",
+      "hash": "0x7b6ac985066ba268c1e858029ddb6e11df3e4d005c92ffc8501a462e01252e07",
       "number": 0
     },
     "l2": {
-      "hash": "0x43e77696357ba085401fb455c606bade7aa4230e850e1448870caf0dbee8f313",
+      "hash": "0x16c264aa8e328be6341e1f2a11fd2aa0a0fe86a91b92dbf17a2f77fdcbf28b52",
       "number": 0
     },
-    "l2_time": 1713572352,
+    "l2_time": 1714428171,
     "system_config": {
       "batcherAddr": "0x3c44cdddb6a900fa2b585dd299e03d12fa4293bc",
       "overhead": "0x0000000000000000000000000000000000000000000000000000000000000834",

diff --git a/tests/op-program-test/local_cmd.sh b/tests/op-program-test/local_cmd.sh
@@ -10,10 +10,10 @@
   --l2.genesis ./chain-artifacts/genesis-l2.json \
   --l1.trustrpc \
   --l1.rpckind debug_geth \
-  --l1.head 0xdbfb0caff9c3c3d75ed48b7ff7a6eeb26fdb5329e669e9e0d700a7a05c32db74 \
-  --l2.head 0xdb19a102d2f4e2778ceb1121843aa9a47e7c68ceaff9407d02f1519e0716ec8d \
-  --l2.outputroot 0x53983aa145265affe0675b43cda64baffdb97fea5dfb7a7144386b80430d27de \
-  --l2.claim 0x7a35b8c93e63f12fb6078afff0ebf8b2ab41328419ec413ad010b22a74444ef1 \
+  --l1.head 0xce8f502bb58452ab4597292b354949016f65b255030d044f15c2290dcbf15b96 \
+  --l2.head 0x721f4eb085f68959c0eb7df26cc7b6ec55873e8c8f0c987c09731a2d0fe9d774 \
+  --l2.outputroot 0xa4d328501f15ad607dd796aede9d71c2124b7d6985a9f960a0333b2939e538a2 \
+  --l2.claim 0x821c4841a99b02a501d2a6803f19737ee47039acbeb54b073f23bb3389bf075a \
   --l2.blocknumber 20 \
   --datadir ./preimages \
   --log.format terminal \
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		24a8d3e06e61c7a8938dfb7a591345a437036381
		8c19065a93a9fef055e34935b284a6c226e63c29