Merge branch 'main' into add-blockbuilder-tip

bindings/.githead

@@ -1 +1 @@
-dc46b27612398dd05e818d7439a8e872a227b603
+5fa1331f8a03c3bd3769f273faf7c80339368054

bindings/encoding/struct.go

@@ -17,28 +17,9 @@ var (
 	TierGuardianID       uint16 = 1000
 	ProtocolTiers               = []uint16{TierOptimisticID, TierSgxID, TierSgxAndPseZkevmID, TierGuardianID}
 	AnchorTxGasLimit     uint64 = 250_000
+	GoldenTouchPrivKey          = "92954368afd3caa1f3ce3ead0069c1af414054aefe1ef9aeacc1bf426222ce38"
 )
 
-// BlockHeader represents an Ethereum block header.
-type BlockHeader struct {
-	ParentHash       [32]byte
-	OmmersHash       [32]byte
-	Beneficiary      common.Address
-	StateRoot        [32]byte
-	TransactionsRoot [32]byte
-	ReceiptsRoot     [32]byte
-	LogsBloom        [8][32]byte
-	Difficulty       *big.Int
-	Height           *big.Int
-	GasLimit         uint64
-	GasUsed          uint64
-	Timestamp        uint64
-	ExtraData        []byte
-	MixHash          [32]byte
-	Nonce            uint64
-	BaseFeePerGas    *big.Int
-}
-
 // HookCall should be same with TaikoData.HookCall
 type HookCall struct {
 	Hook common.Address
@@ -88,58 +69,6 @@ type ZKEvmProof struct {
 	PointProof []byte
 }
 
-// FromGethHeader converts a GETH *types.Header to *BlockHeader.
-func FromGethHeader(header *types.Header) *BlockHeader {
-	baseFeePerGas := header.BaseFee
-	if baseFeePerGas == nil {
-		baseFeePerGas = common.Big0
-	}
-	return &BlockHeader{
-		ParentHash:       header.ParentHash,
-		OmmersHash:       header.UncleHash,
-		Beneficiary:      header.Coinbase,
-		StateRoot:        header.Root,
-		TransactionsRoot: header.TxHash,
-		ReceiptsRoot:     header.ReceiptHash,
-		LogsBloom:        BloomToBytes(header.Bloom),
-		Difficulty:       header.Difficulty,
-		Height:           header.Number,
-		GasLimit:         header.GasLimit,
-		GasUsed:          header.GasUsed,
-		Timestamp:        header.Time,
-		ExtraData:        header.Extra,
-		MixHash:          header.MixDigest,
-		Nonce:            header.Nonce.Uint64(),
-		BaseFeePerGas:    baseFeePerGas,
-	}
-}
-
-// ToGethHeader converts a *BlockHeader to GETH *types.Header.
-func ToGethHeader(header *BlockHeader) *types.Header {
-	baseFeePerGas := header.BaseFeePerGas
-	if baseFeePerGas.Cmp(common.Big0) == 0 {
-		baseFeePerGas = nil
-	}
-	return &types.Header{
-		ParentHash:  header.ParentHash,
-		UncleHash:   header.OmmersHash,
-		Coinbase:    header.Beneficiary,
-		Root:        header.StateRoot,
-		TxHash:      header.TransactionsRoot,
-		ReceiptHash: header.ReceiptsRoot,
-		Bloom:       BytesToBloom(header.LogsBloom),
-		Difficulty:  header.Difficulty,
-		Number:      header.Height,
-		GasLimit:    header.GasLimit,
-		GasUsed:     header.GasUsed,
-		Time:        header.Timestamp,
-		Extra:       header.ExtraData,
-		MixDigest:   header.MixHash,
-		Nonce:       types.EncodeNonce(header.Nonce),
-		BaseFee:     baseFeePerGas,
-	}
-}
-
 // ToExecutableData converts a GETH *types.Header to *engine.ExecutableData.
 func ToExecutableData(header *types.Header) *engine.ExecutableData {
 	executableData := &engine.ExecutableData{

bindings/encoding/struct_test.go

@@ -35,53 +35,6 @@ var (
 	}
 )
 
-func TestFromGethHeader(t *testing.T) {
-	header := FromGethHeader(testHeader)
-
-	require.Equal(t, testHeader.ParentHash, common.BytesToHash(header.ParentHash[:]))
-	require.Equal(t, testHeader.UncleHash, common.BytesToHash(header.OmmersHash[:]))
-	require.Equal(t, testHeader.Coinbase, header.Beneficiary)
-	require.Equal(t, testHeader.Root, common.BytesToHash(header.StateRoot[:]))
-	require.Equal(t, testHeader.TxHash, common.BytesToHash(header.TransactionsRoot[:]))
-	require.Equal(t, testHeader.ReceiptHash, common.BytesToHash(header.ReceiptsRoot[:]))
-	require.Equal(t, BloomToBytes(testHeader.Bloom), header.LogsBloom)
-	require.Equal(t, testHeader.Difficulty, header.Difficulty)
-	require.Equal(t, testHeader.Number, header.Height)
-	require.Equal(t, testHeader.GasLimit, header.GasLimit)
-	require.Equal(t, testHeader.GasUsed, header.GasUsed)
-	require.Equal(t, testHeader.Time, header.Timestamp)
-	require.Equal(t, testHeader.Extra, header.ExtraData)
-	require.Equal(t, testHeader.MixDigest, common.BytesToHash(header.MixHash[:]))
-	require.Equal(t, testHeader.Nonce.Uint64(), header.Nonce)
-	require.Equal(t, testHeader.BaseFee.Uint64(), header.BaseFeePerGas.Uint64())
-}
-
-func TestFromToGethHeaderLegacyTx(t *testing.T) {
-	testHeader := testHeader // Copy the original struct
-	testHeader.BaseFee = nil
-	header := FromGethHeader(testHeader)
-
-	require.Equal(t, testHeader.ParentHash, common.BytesToHash(header.ParentHash[:]))
-	require.Equal(t, testHeader.UncleHash, common.BytesToHash(header.OmmersHash[:]))
-	require.Equal(t, testHeader.Coinbase, header.Beneficiary)
-	require.Equal(t, testHeader.Root, common.BytesToHash(header.StateRoot[:]))
-	require.Equal(t, testHeader.TxHash, common.BytesToHash(header.TransactionsRoot[:]))
-	require.Equal(t, testHeader.ReceiptHash, common.BytesToHash(header.ReceiptsRoot[:]))
-	require.Equal(t, BloomToBytes(testHeader.Bloom), header.LogsBloom)
-	require.Equal(t, testHeader.Difficulty, header.Difficulty)
-	require.Equal(t, testHeader.Number, header.Height)
-	require.Equal(t, testHeader.GasLimit, header.GasLimit)
-	require.Equal(t, testHeader.GasUsed, header.GasUsed)
-	require.Equal(t, testHeader.Time, header.Timestamp)
-	require.Equal(t, testHeader.Extra, header.ExtraData)
-	require.Equal(t, testHeader.MixDigest, common.BytesToHash(header.MixHash[:]))
-	require.Equal(t, testHeader.Nonce.Uint64(), header.Nonce)
-	require.Equal(t, new(big.Int).SetInt64(0).Uint64(), header.BaseFeePerGas.Uint64())
-
-	gethHeader := ToGethHeader(header)
-	require.Equal(t, testHeader, gethHeader)
-}
-
 func TestToExecutableData(t *testing.T) {
 	data := ToExecutableData(testHeader)
 	require.Equal(t, testHeader.ParentHash, data.ParentHash)