Merge branch 'main' into error-handling

taikoxyz · Apr 29, 2024 · 33533db · 33533db
2 parents 530d7ce + a352b40
commit 33533db
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 18 deletions.
diff --git a/bindings/.githead b/bindings/.githead
@@ -1 +1 @@
-c55b532924020b9cf169d4338ce4299481b0a56c
+d8c189f79367c1182b5eb6dd6101cdbd8dc460b2
diff --git a/bindings/gen_taiko_l1.go b/bindings/gen_taiko_l1.go
diff --git a/integration_test/l1_env.sh b/integration_test/l1_env.sh
@@ -10,6 +10,7 @@ export TAIKO_TOKEN_PREMINT_RECIPIENT=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
 export TAIKO_TOKEN_NAME="Taiko Token Test"
 export TAIKO_TOKEN_SYMBOL="TTKOt"
 export TIER_PROVIDER="devnet"
+export PAUSE_TAIKO_L1="false"
 export TAIKO_TOKEN=0x0000000000000000000000000000000000000000
 export SHARED_ADDRESS_MANAGER=0x0000000000000000000000000000000000000000
 export PROPOSER=0x0000000000000000000000000000000000000000

diff --git a/internal/testutils/helper.go b/internal/testutils/helper.go
@@ -18,6 +18,7 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/go-resty/resty/v2"
 	"github.com/phayes/freeport"
@@ -130,7 +131,7 @@ func (s *ClientTestSuite) ProposeAndInsertValidBlock(
 		common.BytesToAddress(RandomBytes(32)),
 		common.Big1,
 		100000,
-		baseFeeInfo.Basefee,
+		new(big.Int).SetUint64(uint64(10*params.GWei)+baseFeeInfo.Basefee.Uint64()),
 		[]byte{},
 	)
 	signedTx, err := types.SignTx(tx, types.LatestSignerForChainID(s.RPCClient.L2.ChainID), s.TestAddrPrivKey)
@@ -198,7 +199,7 @@ func (s *ClientTestSuite) ProposeValidBlock(
 		common.BytesToAddress(RandomBytes(32)),
 		common.Big1,
 		100000,
-		baseFeeInfo.Basefee,
+		new(big.Int).SetUint64(uint64(10*params.GWei)+baseFeeInfo.Basefee.Uint64()),
 		[]byte{},
 	)
 	signedTx, err := types.SignTx(tx, types.LatestSignerForChainID(s.RPCClient.L2.ChainID), s.TestAddrPrivKey)

diff --git a/pkg/rpc/utils_test.go b/pkg/rpc/utils_test.go
@@ -2,13 +2,15 @@ package rpc
 
 import (
 	"context"
+	"math/big"
 	"os"
 	"strconv"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/params"
 	"github.com/stretchr/testify/require"
 )
 
@@ -42,7 +44,7 @@ func TestL1ContentFrom(t *testing.T) {
 		testAddr,
 		common.Big1,
 		100000,
-		baseFeeInfo.Basefee,
+		new(big.Int).SetUint64(uint64(10*params.GWei)+baseFeeInfo.Basefee.Uint64()),
 		[]byte{},
 	)
 	signedTx, err := types.SignTx(tx, types.LatestSignerForChainID(client.L2.ChainID), testAddrPrivKey)

diff --git a/pkg/txlist_validator/tx_list_validator_test.go b/pkg/txlist_validator/tx_list_validator_test.go
@@ -91,7 +91,7 @@ func rlpEncodedTransactionBytes(l int, signed bool) []byte {
 
 			tx = types.MustSignNewTx(testKey, types.LatestSigner(genesis.Config), txData)
 		} else {
-			tx = types.NewTransaction(1, testAddr, common.Big1, 10, common.Big256, nil)
+			tx = types.NewTransaction(1, testAddr, common.Big1, 10, new(big.Int).SetUint64(10*params.GWei), nil)
 		}
 		txs = append(
 			txs,