diff --git a/go/ethadapter/geth_rpc_client.go b/go/ethadapter/geth_rpc_client.go index 9c9c1e5307..983ab08877 100644 --- a/go/ethadapter/geth_rpc_client.go +++ b/go/ethadapter/geth_rpc_client.go @@ -273,11 +273,6 @@ func (e *gethRPCClient) PrepareTransactionToRetry(ctx context.Context, txData ty // prices aren't big enough for float error to matter retryPrice, _ := retryPriceFloat.Int(nil) - println("from ", from.Hex()) - println("unEstimatedTx.To() ", unEstimatedTx.To()) - println("unEstimatedTx.Value() ", unEstimatedTx.Value()) - println("unEstimatedTx.Data() ", unEstimatedTx.Data()) - gasLimit, err := e.EthClient().EstimateGas(ctx, ethereum.CallMsg{ From: from, To: unEstimatedTx.To(), diff --git a/go/wallet/wallet.go b/go/wallet/wallet.go index 1b87d46965..c3dc1a2806 100644 --- a/go/wallet/wallet.go +++ b/go/wallet/wallet.go @@ -67,7 +67,7 @@ func NewInMemoryWalletFromConfig(pkStr string, l1ChainID int64, logger gethlog.L // SignTransaction returns a signed transaction func (m *inMemoryWallet) SignTransaction(tx types.TxData) (*types.Transaction, error) { - return types.MustSignNewTx(m.prvKey, types.NewCancunSigner(m.chainID), tx), nil + return types.SignNewTx(m.prvKey, types.NewCancunSigner(m.chainID), tx) } // Address returns the current wallet address diff --git a/integration/datagenerator/common.go b/integration/datagenerator/common.go index ac2d04c4f4..50514bec27 100644 --- a/integration/datagenerator/common.go +++ b/integration/datagenerator/common.go @@ -39,8 +39,8 @@ func RandomUInt64() uint64 { return val.Uint64() } -func RandomUint32() uint64 { - val, err := rand.Int(rand.Reader, big.NewInt(math.MaxInt32)) +func RandomUint16() uint64 { + val, err := rand.Int(rand.Reader, big.NewInt(math.MaxInt16)) if err != nil { panic(err) } diff --git a/integration/eth2network/eth2_configs.go b/integration/eth2network/eth2_configs.go index a298d02ab6..ae35dca7a0 100644 --- a/integration/eth2network/eth2_configs.go +++ b/integration/eth2network/eth2_configs.go @@ -103,26 +103,26 @@ const _baseGenesis = `{ "config": { "chainId": 32382, "homesteadBlock": 0, - "daoForkSupport": true, - "eip150Block": 0, - "eip155Block": 0, - "eip158Block": 0, - "byzantiumBlock": 0, - "constantinopleBlock": 0, - "petersburgBlock": 0, - "istanbulBlock": 0, - "muirGlacierBlock": 0, - "berlinBlock": 0, - "londonBlock": 0, - "arrowGlacierBlock": 0, - "grayGlacierBlock": 0, - "shanghaiTime": 1717192598, - "cancunTime": 1736601494, - "terminalTotalDifficulty": 0, - "terminalTotalDifficultyPassed": true, + "eip150Block": 6, + "eip155Block": 12, + "eip158Block": 12, + "byzantiumBlock": 18, + "constantinopleBlock": 24, + "petersburgBlock": 30, + "istanbulBlock": 36, + "muirGlacierBlock": 42, + "berlinBlock": 48, + "londonBlock": 54, + "arrowGlacierBlock": 60, + "grayGlacierBlock": 66, + "mergeNetsplitBlock": 72, + "shanghaiTime": 780, + "cancunTime": 840, + "terminalTotalDifficulty": 9454784, + "terminalTotalDifficultyPassed": true, "clique": { - "period": 1, - "epoch": 1000 + "period": 0, + "epoch": 30000 } }, "nonce": "0", diff --git a/integration/eth2network/eth2_network_test.go b/integration/eth2network/eth2_network_test.go index 442ac5a115..b00ab7320f 100644 --- a/integration/eth2network/eth2_network_test.go +++ b/integration/eth2network/eth2_network_test.go @@ -42,7 +42,7 @@ func TestStartEth2Network(t *testing.T) { binDir, err := EnsureBinariesExist() assert.Nil(t, err) - chainID := int(datagenerator.RandomUint32()) + chainID := int(datagenerator.RandomUint16()) randomWallets := make([]wallet.Wallet, _numTestNodes) randomWalletAddrs := make([]string, _numTestNodes) for i := 0; i < _numTestNodes; i++ {