Fix packed encoding of espresso L1 block values

EspressoSystems · Jan 31, 2024 · e42292e · e42292e
1 parent e920aa3
commit e42292e
Show file tree

Hide file tree

Showing 14 changed files with 458 additions and 313 deletions.
diff --git a/op-bindings/bindings/l1block.go b/op-bindings/bindings/l1block.go
diff --git a/op-bindings/bindings/l1block_more.go b/op-bindings/bindings/l1block_more.go
diff --git a/op-node/rollup/derive/l1_block_info.go b/op-node/rollup/derive/l1_block_info.go
@@ -244,8 +244,8 @@ func (info *L1BlockInfo) unmarshalBinaryBedrock(data []byte) error {
 // | 32      | BlobBaseFee              |
 // | 32      | BlockHash                |
 // | 32      | BatcherHash              |
-// | 8       | Espresso                 |
 // | 8       | EspressoL1ConfDepth      |
+// | 8       | Espresso                 |
 // | variable| Justification            |
 // +---------+--------------------------+
 
@@ -286,6 +286,9 @@ func (info *L1BlockInfo) marshalBinaryEcotone() ([]byte, error) {
 	if err := solabi.WriteAddress(w, info.BatcherAddr); err != nil {
 		return nil, err
 	}
+	if err := binary.Write(w, binary.BigEndian, info.EspressoL1ConfDepth); err != nil {
+		return nil, err
+	}
 	if info.Espresso {
 		if err := binary.Write(w, binary.BigEndian, uint64(1)); err != nil {
 			return nil, err
@@ -295,9 +298,6 @@ func (info *L1BlockInfo) marshalBinaryEcotone() ([]byte, error) {
 			return nil, err
 		}
 	}
-	if err := binary.Write(w, binary.BigEndian, info.EspressoL1ConfDepth); err != nil {
-		return nil, err
-	}
 	rlpBytes, err := rlp.EncodeToBytes(info.Justification)
 	if err != nil {
 		return nil, err
@@ -343,14 +343,14 @@ func (info *L1BlockInfo) unmarshalBinaryEcotone(data []byte) error {
 	if info.BatcherAddr, err = solabi.ReadAddress(r); err != nil {
 		return err
 	}
+	if err := binary.Read(r, binary.BigEndian, &info.EspressoL1ConfDepth); err != nil {
+		return fmt.Errorf("invalid ecotone l1 block info format: %w", err)
+	}
 	var espresso uint64
 	if err := binary.Read(r, binary.BigEndian, &espresso); err != nil {
 		return fmt.Errorf("invalid ecotone l1 block info format: %w", err)
 	}
 	info.Espresso = espresso != 0
-	if err := binary.Read(r, binary.BigEndian, &info.EspressoL1ConfDepth); err != nil {
-		return fmt.Errorf("invalid ecotone l1 block info format: %w", err)
-	}
 	rlpBytes, err := io.ReadAll(r)
 	if err != nil {
 		return fmt.Errorf("invalid ecotone l1 block info format: %w", err)

diff --git a/packages/contracts-bedrock/package.json b/packages/contracts-bedrock/package.json
@@ -18,7 +18,7 @@
     "build": "forge build",
     "build:go-ffi": "(cd scripts/go-ffi && go build)",
     "autogen:invariant-docs": "npx tsx scripts/invariant-doc-gen.ts",
-    "test": "pnpm build:go-ffi && forge test",
+    "test": "pnpm build:go-ffi && forge test -vvv",
     "test:kontrol": "./test/kontrol/scripts/run-kontrol.sh",
     "genesis": "./scripts/generate-l2-genesis.sh",
     "coverage": "pnpm build:go-ffi && forge coverage",

diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
@@ -52,8 +52,8 @@
     "sourceCodeHash": "0xde06becce9514f46ba78b4cb0732c7a714d49ba8f131258d56a5f5b22b51be7e"
   },
   "src/L2/L1Block.sol": {
-    "initCodeHash": "0xf039cf5c5f0787d2e76feead9206fbc36bd27ca2a58b853df4e0a64f8b065e23",
-    "sourceCodeHash": "0x8f318ea1f16af6ccf7bed5cdaacd8d31bdaf485f072a746b8a88eec35054ed55"
+    "initCodeHash": "0x4b17c70695f872a8f68a8be4c2971481b9fc4827a397076f7e5e8c61aa4c2993",
+    "sourceCodeHash": "0x72e6257fc5fec28b56865d2e1f8627944e9f9f06b91bb63e24d98ce3ecd680c9"
   },
   "src/L2/L1FeeVault.sol": {
     "initCodeHash": "0x2744d34573be83206d1b75d049d18a7bb37f9058e68c0803e5008c46b0dc2474",

diff --git a/packages/contracts-bedrock/snapshots/abi/AddressManager.json b/packages/contracts-bedrock/snapshots/abi/AddressManager.json
@@ -1,48 +1,4 @@
 [
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "string",
-        "name": "name",
-        "type": "string"
-      },
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "newAddress",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "oldAddress",
-        "type": "address"
-      }
-    ],
-    "name": "AddressSet",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "previousOwner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnershipTransferred",
-    "type": "event"
-  },
   {
     "inputs": [
       {
@@ -112,5 +68,49 @@
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "string",
+        "name": "name",
+        "type": "string"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "newAddress",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "oldAddress",
+        "type": "address"
+      }
+    ],
+    "name": "AddressSet",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "previousOwner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "newOwner",
+        "type": "address"
+      }
+    ],
+    "name": "OwnershipTransferred",
+    "type": "event"
   }
 ]