Merge branch 'use-state-root' into eip4844

taikoxyz · Feb 14, 2024 · 1516230 · 1516230
2 parents 7a90069 + be64dcc
commit 1516230
Show file tree

Hide file tree

Showing 23 changed files with 167 additions and 219 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -84,7 +84,7 @@ jobs:
 
       - name: Install protocol dependencies
         working-directory: ${{ env.TAIKO_MONO_DIR }}
-        run: cd ./packages/protocol && pnpm install && forge install
+        run: cd ./packages/protocol && pnpm install
 
       - name: Test
         working-directory: ${{ env.CLIENT_DIR }}

diff --git a/bindings/.githead b/bindings/.githead
@@ -1 +1 @@
-6e2771c54e62e73715cfbe2e7d4fc5a2fb54cf5c
+a19922dc58e3cdffbb582866fbf4bba41bc74d35
diff --git a/bindings/encoding/input.go b/bindings/encoding/input.go
@@ -85,13 +85,17 @@ var (
 			Type: "bytes32",
 		},
 		{
-			Name: "signalRoot",
+			Name: "stateRoot",
 			Type: "bytes32",
 		},
 		{
 			Name: "graffiti",
 			Type: "bytes32",
 		},
+		{
+			Name: "__reserved",
+			Type: "bytes32[2]",
+		},
 	}
 	tierProofComponents = []abi.ArgumentMarshaling{
 		{
@@ -108,6 +112,10 @@ var (
 			Name: "assignedProver",
 			Type: "address",
 		},
+		{
+			Name: "coinbase",
+			Type: "address",
+		},
 		{
 			Name: "extraData",
 			Type: "bytes32",

diff --git a/bindings/encoding/struct.go b/bindings/encoding/struct.go
@@ -29,6 +29,7 @@ type HookCall struct {
 // BlockParams should be same with TaikoData.BlockParams.
 type BlockParams struct {
 	AssignedProver    common.Address
+	Coinbase          common.Address
 	ExtraData         [32]byte
 	BlobHash          [32]byte
 	TxListByteOffset  *big.Int

diff --git a/bindings/gen_assignment_hook.go b/bindings/gen_assignment_hook.go
diff --git a/bindings/gen_guardian_prover.go b/bindings/gen_guardian_prover.go
diff --git a/bindings/gen_lib_proving.go b/bindings/gen_lib_proving.go