feat: merge 1.14.10

taikoxyz · Sep 29, 2024 · 25e1b1d · 25e1b1d
1 parent d11d7ba
commit 25e1b1d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![CI](https://github.com/taikoxyz/taiko-geth/actions/workflows/ci.yml/badge.svg)](https://github.com/taikoxyz/taiko-geth/actions/workflows/ci.yml)
 
-The codebase is based on [go-ethereum v1.13.15](https://github.com/ethereum/go-ethereum/releases/tag/v1.13.15).
+The codebase is based on [go-ethereum v1.14.10](https://github.com/ethereum/go-ethereum/releases/tag/v1.14.10).
 
 ## Tracing changes
 
@@ -116,7 +116,7 @@ useful on the testnet too.
 
 Specifying the `--holesky` flag, however, will reconfigure your `geth` instance a bit:
 
- * Instead of connecting to the main Ethereum network, the client will connect to the Holesky 
+ * Instead of connecting to the main Ethereum network, the client will connect to the Holesky
    test network, which uses different P2P bootnodes, different network IDs and genesis
    states.
  * Instead of using the default data directory (`~/.ethereum` on Linux for example), `geth`

diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go
@@ -470,7 +470,7 @@ func (api *ConsensusAPI) forkchoiceUpdated(update engine.ForkchoiceStateV1, payl
 				Version:      payloadVersion,
 			}
 			id := args.Id()
-			payload, err := api.eth.Miner().BuildPayload(args)
+			payload, err := api.eth.Miner().BuildPayload(args, false)
 			if err != nil {
 				log.Error("Failed to build payload", "err", err)
 				return valid(nil), engine.InvalidPayloadAttributes.With(err)

diff --git a/miner/taiko_payload_building_test.go b/miner/taiko_payload_building_test.go
@@ -36,7 +36,7 @@ func TestSetFullBlock_AvoidPanic(t *testing.T) {
 		Random:       common.Hash{},
 		FeeRecipient: recipient,
 	}
-	payload, err := w.buildPayload(args)
+	payload, err := w.buildPayload(args, false)
 	if err != nil {
 		t.Fatalf("Failed to build payload %v", err)
 	}
@@ -66,7 +66,7 @@ func TestAfterSetFullBlock_Panic_DoneChannelNotSent(t *testing.T) {
 		Random:       common.Hash{},
 		FeeRecipient: recipient,
 	}
-	payload, err := w.buildPayload(args)
+	payload, err := w.buildPayload(args, false)
 	if err != nil {
 		t.Fatalf("Failed to build payload %v", err)
 	}
@@ -94,7 +94,7 @@ func TestAfterSetFullBlockAvoidPanicDoneChannelSent(t *testing.T) {
 		Random:       common.Hash{},
 		FeeRecipient: recipient,
 	}
-	payload, err := w.buildPayload(args)
+	payload, err := w.buildPayload(args, false)
 	if err != nil {
 		t.Fatalf("Failed to build payload %v", err)
 	}
@@ -121,7 +121,7 @@ func TestSetFullBlock(t *testing.T) {
 		Random:       common.Hash{},
 		FeeRecipient: recipient,
 	}
-	payload, err := w.buildPayload(args)
+	payload, err := w.buildPayload(args, false)
 	if err != nil {
 		t.Fatalf("Failed to build payload %v", err)
 	}

diff --git a/miner/taiko_worker.go b/miner/taiko_worker.go
@@ -58,7 +58,7 @@ func (w *Miner) buildTransactionsLists(
 		baseFeePerGas: baseFee,
 	}
 
-	env, err := w.prepareWork(params)
+	env, err := w.prepareWork(params, false)
 	if err != nil {
 		return nil, err
 	}
@@ -161,7 +161,7 @@ func (w *Miner) sealBlockWith(
 	// Set extraData
 	w.SetExtra(blkMeta.ExtraData)
 
-	env, err := w.prepareWork(params)
+	env, err := w.prepareWork(params, false)
 	if err != nil {
 		return nil, err
 	}