Merge branch 'main' into eip4844

.github/workflows/test.yml

@@ -45,6 +45,7 @@ jobs:
         with:
           repository: taikoxyz/taiko-mono
           path: ${{ env.TAIKO_MONO_DIR }}
+          ref: reentrance
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1

.gitignore

@@ -24,3 +24,4 @@ dbdata
 
 # Testing
 integration_test/nodes/deployments/mainnet.json
+.env

bindings/.githead

@@ -1 +1 @@
-a19922dc58e3cdffbb582866fbf4bba41bc74d35
+a3a12de9accb77f9acada4e608b9c41e7c61bff0

bindings/encoding/struct.go

@@ -16,7 +16,6 @@ var (
 	TierSgxAndPseZkevmID uint16 = 400
 	TierGuardianID       uint16 = 1000
 	ProtocolTiers               = []uint16{TierOptimisticID, TierSgxID, TierSgxAndPseZkevmID, TierGuardianID}
-	AnchorTxGasLimit     uint64 = 250_000
 	GoldenTouchPrivKey          = "92954368afd3caa1f3ce3ead0069c1af414054aefe1ef9aeacc1bf426222ce38"
 )
 

driver/anchor_tx_constructor/anchor_tx_constructor.go

@@ -17,7 +17,7 @@ import (
 )
 
 // Each TaikoL2.anchor transaction should use this value as it's gas limit.
-const anchorGasLimit = 250_000
+const AnchorGasLimit = 1_000_000
 
 // AnchorTxConstructor is responsible for assembling the anchor transaction (TaikoL2.anchor) in
 // each L2 block, which is always the first transaction.
@@ -121,7 +121,7 @@ func (c *AnchorTxConstructor) transactOpts(
 		Context:   ctx,
 		GasFeeCap: baseFee,
 		GasTipCap: common.Big0,
-		GasLimit:  c.GasLimit(),
+		GasLimit:  AnchorGasLimit,
 		NoSend:    true,
 	}, nil
 }
@@ -145,11 +145,6 @@ func (c *AnchorTxConstructor) signTxPayload(hash []byte) ([]byte, error) {
 	return sig[:], nil
 }
 
-// GasLimit returns protocol's anchorTxGasLimit constant.
-func (c *AnchorTxConstructor) GasLimit() uint64 {
-	return anchorGasLimit
-}
-
 // SignalServiceAddress returns protocol's L1 singalService constant address.
 func (c *AnchorTxConstructor) SignalServiceAddress() common.Address {
 	return c.signalServiceAddress

driver/anchor_tx_constructor/anchor_tx_constructor_test.go

@@ -36,7 +36,7 @@ func (s *AnchorTxConstructorTestSuite) SetupTest() {
 }
 
 func (s *AnchorTxConstructorTestSuite) TestGasLimit() {
-	s.Greater(s.c.GasLimit(), uint64(0))
+	s.Greater(AnchorGasLimit, 0)
 }
 
 func (s *AnchorTxConstructorTestSuite) TestAssembleAnchorTx() {

driver/chain_syncer/calldata/syncer.go

@@ -438,7 +438,7 @@ func (s *Syncer) createExecutionPayloads(
 		BlockMetadata: &engine.BlockMetadata{
 			HighestBlockID: headBlockID,
 			Beneficiary:    event.Meta.Coinbase,
-			GasLimit:       uint64(event.Meta.GasLimit) + s.anchorConstructor.GasLimit(),
+			GasLimit:       uint64(event.Meta.GasLimit) + anchorTxConstructor.AnchorGasLimit,
 			Timestamp:      event.Meta.Timestamp,
 			TxList:         txListBytes,
 			MixHash:        event.Meta.Difficulty,

internal/docker/docker_env.sh

@@ -14,7 +14,6 @@ until cast chain-id --rpc-url "$L2_PROBE_URL" 2> /dev/null; do
     sleep 1
 done
 
-
 L1_NODE_PORT=$(docker port l1_node | grep '0.0.0.0' | awk -F ':' '{print $2}')
 export L1_NODE_HTTP_ENDPOINT=http://localhost:$L1_NODE_PORT
 export L1_NODE_WS_ENDPOINT=ws://localhost:$L1_NODE_PORT

prover/proof_producer/zkevm_rpcd_producer.go

@@ -18,6 +18,7 @@ import (
 
 	"github.com/taikoxyz/taiko-client/bindings"
 	"github.com/taikoxyz/taiko-client/bindings/encoding"
+	anchorTxConstructor "github.com/taikoxyz/taiko-client/driver/anchor_tx_constructor"
 	"github.com/taikoxyz/taiko-client/internal/metrics"
 )
 
@@ -285,7 +286,7 @@ func (p *ZkevmRpcdProducer) requestProof(
 				ParentGasUsed:     opts.ParentGasUsed,
 				BlockMaxGasLimit:  uint64(p.ProtocolConfig.BlockMaxGasLimit),
 				MaxBytesPerTxList: p.ProtocolConfig.BlockMaxTxListBytes.Uint64(),
-				AnchorGasLimit:    encoding.AnchorTxGasLimit,
+				AnchorGasLimit:    anchorTxConstructor.AnchorGasLimit,
 				RequestMetaData: &RequestMetaData{
 					L1Hash:           common.BytesToHash(meta.L1Hash[:]).Hex()[2:],
 					Difficulty:       common.BytesToHash(meta.Difficulty[:]).Hex()[2:],