From 1849cc74cf2927867716cf86998c41d6f8aa6dc7 Mon Sep 17 00:00:00 2001 From: Georgios Konstantopoulos Date: Thu, 20 May 2021 14:03:08 +0300 Subject: [PATCH] fix: configure max gas limit to 11m Uniswap V3 contracts require that, otherwise they throw call exceptions at deployment --- l2geth/scripts/start.sh | 2 +- ops/envs/geth.env | 2 +- packages/contracts/src/state-dump/make-dump.ts | 2 +- packages/contracts/tasks/deploy.ts | 4 ++-- packages/data-transport-layer/src/utils/constants.ts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/l2geth/scripts/start.sh b/l2geth/scripts/start.sh index 40dfc6b702c9..88fb39883c28 100755 --- a/l2geth/scripts/start.sh +++ b/l2geth/scripts/start.sh @@ -6,7 +6,7 @@ REPO=$DIR/.. IS_VERIFIER= ROLLUP_SYNC_SERVICE_ENABLE=true DATADIR=$HOME/.ethereum -TARGET_GAS_LIMIT=10000000 +TARGET_GAS_LIMIT=11000000 CHAIN_ID=10 ETH1_CTC_DEPLOYMENT_HEIGHT=12410807 ETH1_L1_GATEWAY_ADDRESS=0xe681F80966a8b1fFadECf8068bD6F99034791c95 diff --git a/ops/envs/geth.env b/ops/envs/geth.env index a9a5e08efad0..680bd78af698 100644 --- a/ops/envs/geth.env +++ b/ops/envs/geth.env @@ -29,5 +29,5 @@ IPC_DISABLE=true NETWORK_ID=420 NO_USB=true NO_DISCOVER=true -TARGET_GAS_LIMIT=10000000 +TARGET_GAS_LIMIT=11000000 USING_OVM=true diff --git a/packages/contracts/src/state-dump/make-dump.ts b/packages/contracts/src/state-dump/make-dump.ts index 6a1ea0cbc373..5897461c43f6 100644 --- a/packages/contracts/src/state-dump/make-dump.ts +++ b/packages/contracts/src/state-dump/make-dump.ts @@ -99,7 +99,7 @@ export const makeStateDump = async (cfg: RollupDeployConfig): Promise => { deploymentSigner: signer, ovmGasMeteringConfig: { minTransactionGasLimit: 0, - maxTransactionGasLimit: 10_000_000, + maxTransactionGasLimit: 11_000_000, maxGasPerQueuePerEpoch: 1_000_000_000_000, secondsPerEpoch: 0, }, diff --git a/packages/contracts/tasks/deploy.ts b/packages/contracts/tasks/deploy.ts index 4e28e199b736..cfe3ad3e80bc 100644 --- a/packages/contracts/tasks/deploy.ts +++ b/packages/contracts/tasks/deploy.ts @@ -5,9 +5,9 @@ import * as types from 'hardhat/internal/core/params/argumentTypes' const DEFAULT_L1_BLOCK_TIME_SECONDS = 15 const DEFAULT_CTC_FORCE_INCLUSION_PERIOD_SECONDS = 60 * 60 * 24 * 30 // 30 days -const DEFAULT_CTC_MAX_TRANSACTION_GAS_LIMIT = 10_000_000 +const DEFAULT_CTC_MAX_TRANSACTION_GAS_LIMIT = 11_000_000 const DEFAULT_EM_MIN_TRANSACTION_GAS_LIMIT = 50_000 -const DEFAULT_EM_MAX_TRANSACTION_GAS_LIMIT = 10_000_000 +const DEFAULT_EM_MAX_TRANSACTION_GAS_LIMIT = 11_000_000 const DEFAULT_EM_MAX_GAS_PER_QUEUE_PER_EPOCH = 250_000_000 const DEFAULT_EM_SECONDS_PER_EPOCH = 0 const DEFAULT_EM_OVM_CHAIN_ID = 420 diff --git a/packages/data-transport-layer/src/utils/constants.ts b/packages/data-transport-layer/src/utils/constants.ts index b7655cc638fa..8309786c3b56 100644 --- a/packages/data-transport-layer/src/utils/constants.ts +++ b/packages/data-transport-layer/src/utils/constants.ts @@ -1,3 +1,3 @@ -export const SEQUENCER_GAS_LIMIT = 10_000_000 // TODO: Remove and use value from event. +export const SEQUENCER_GAS_LIMIT = 11_000_000 // TODO: Remove and use value from event. export const SEQUENCER_ENTRYPOINT_ADDRESS = '0x4200000000000000000000000000000000000005'