diff --git a/go/enclave/crosschain/message_bus_manager.go b/go/enclave/crosschain/message_bus_manager.go index b4f2548bc8..4b16e911c1 100644 --- a/go/enclave/crosschain/message_bus_manager.go +++ b/go/enclave/crosschain/message_bus_manager.go @@ -94,7 +94,7 @@ func (m *MessageBusManager) GenerateMessageBusDeployTx() (*common.L2Tx, error) { tx := &types.LegacyTx{ Nonce: 0, // The first transaction of the owner identity should always be deploying the contract Value: gethcommon.Big0, - Gas: 500_000_000, // It's quite the expensive contract. + Gas: 5_000_000, // It's quite the expensive contract. GasPrice: gethcommon.Big0, // Synthetic transactions are on the house. Or the house. Data: gethcommon.FromHex(MessageBus.MessageBusMetaData.Bin), To: nil, // Geth requires nil instead of gethcommon.Address{} which equates to zero address in order to return receipt. diff --git a/go/enclave/system/contracts.go b/go/enclave/system/contracts.go index a7fb17d1eb..cdfb6c2e45 100644 --- a/go/enclave/system/contracts.go +++ b/go/enclave/system/contracts.go @@ -15,7 +15,7 @@ func GenerateDeploymentTransaction(initCode []byte, logger gethlog.Logger) (*com tx := &types.LegacyTx{ Nonce: 0, // The first transaction of the owner identity should always be deploying the contract Value: gethcommon.Big0, - Gas: 500_000_000, // It's quite the expensive contract. + Gas: 10_000_000, // It's quite the expensive contract. GasPrice: gethcommon.Big0, // Synthetic transactions are on the house. Or the house. Data: initCode, // gethcommon.FromHex(SystemDeployer.SystemDeployerMetaData.Bin), To: nil, // Geth requires nil instead of gethcommon.Address{} which equates to zero address in order to return receipt. diff --git a/integration/simulation/transaction_injector.go b/integration/simulation/transaction_injector.go index 6888055def..cf200134e9 100644 --- a/integration/simulation/transaction_injector.go +++ b/integration/simulation/transaction_injector.go @@ -447,7 +447,7 @@ func (ti *TransactionInjector) issueRandomWithdrawals() { tx := &types.LegacyTx{ Nonce: fromWallet.GetNonceAndIncrement(), Value: gethcommon.Big1, - Gas: uint64(1_000_000_000), + Gas: uint64(1_000_000), GasPrice: price, Data: nil, To: &msgBusAddr, @@ -530,7 +530,7 @@ func (ti *TransactionInjector) newTx(data []byte, nonce uint64, ercType testcomm return &types.LegacyTx{ Nonce: nonce, Value: gethcommon.Big0, - Gas: uint64(1_000_000_000), + Gas: uint64(1_000_000), GasPrice: gethcommon.Big1, Data: data, To: ti.wallets.Tokens[ercType].L2ContractAddress, diff --git a/integration/tengateway/tengateway_test.go b/integration/tengateway/tengateway_test.go index 322bc1b4c7..e6b4b213cd 100644 --- a/integration/tengateway/tengateway_test.go +++ b/integration/tengateway/tengateway_test.go @@ -263,7 +263,7 @@ func interactWithSmartContractUnsigned(client *ethclient.Client, sendRaw bool, n interactionTx := types.LegacyTx{ Nonce: nonce, To: &contractAddress, - Gas: uint64(10_000_000), + Gas: uint64(1_000_000), GasPrice: result.ToInt(), Data: contractInteractionData, Value: value, @@ -769,7 +769,7 @@ func testUnsubscribe(t *testing.T, _ int, httpURL, wsURL string, w wallet.Wallet // deploy events contract deployTx := &types.LegacyTx{ Nonce: w.GetNonceAndIncrement(), - Gas: uint64(10_000_000), + Gas: uint64(1_000_000), GasPrice: gethcommon.Big1, Data: gethcommon.FromHex(eventsContractBytecode), } diff --git a/tools/hardhatdeployer/contract_deployer.go b/tools/hardhatdeployer/contract_deployer.go index 59684be16e..ab64493731 100644 --- a/tools/hardhatdeployer/contract_deployer.go +++ b/tools/hardhatdeployer/contract_deployer.go @@ -93,7 +93,7 @@ func (cd *contractDeployer) run() (string, error) { deployContractTx := types.LegacyTx{ Nonce: cd.wallet.GetNonceAndIncrement(), GasPrice: big.NewInt(params.InitialBaseFee), - Gas: uint64(500_000_000), + Gas: uint64(1_000_000), Data: cd.contractCode, }