Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

optimism: bump gaslimit to 10 million #870 #871

Merged
merged 6 commits into from
May 19, 2021
Merged

optimism: bump gaslimit to 10 million #870 #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0e006c7
optimism: bump gaslimit to 10million
tynes May 13, 2021
74f4094
chore: add changeset
tynes May 13, 2021
4b7a662
optimism: bump max gaslimit to 10 mil
tynes May 17, 2021
aa58f6a
chore: add changeset
tynes May 17, 2021
b906b8f
chore: remove unnecessary changeset
gakonst May 19, 2021
51e92cc
chore: remove unnecessary changeset
gakonst May 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion l2geth/scripts/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ REPO=$DIR/..
IS_VERIFIER=
ROLLUP_SYNC_SERVICE_ENABLE=true
DATADIR=$HOME/.ethereum
TARGET_GAS_LIMIT=9000000
TARGET_GAS_LIMIT=10000000
CHAIN_ID=10
ETH1_CTC_DEPLOYMENT_HEIGHT=12410807
ETH1_L1_GATEWAY_ADDRESS=0xe681F80966a8b1fFadECf8068bD6F99034791c95
Expand Down
2 changes: 1 addition & 1 deletion ops/envs/geth.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ IPC_DISABLE=true
NETWORK_ID=420
NO_USB=true
NO_DISCOVER=true
TARGET_GAS_LIMIT=9000000
TARGET_GAS_LIMIT=10000000
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a question on how the update to ExecutionManager.maxTransactionGasLimit was done here since I am reading maxTransactionGasLimit being stored in slot 2 not 4. What am I missing?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We spoke out of band and have agreed that the slot is 4, see #840

USING_OVM=true
2 changes: 1 addition & 1 deletion packages/contracts/src/contract-dumps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export const makeStateDump = async (cfg: RollupDeployConfig): Promise<any> => {
deploymentSigner: signer,
ovmGasMeteringConfig: {
minTransactionGasLimit: 0,
maxTransactionGasLimit: 9_000_000,
maxTransactionGasLimit: 10_000_000,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we've upped the maxTransactionGasLimit in EM we might want to up the L2_GAS_DISCOUNT_DIVISOR as well as now the burned gas will be higher for txs sent with a default gas limit. Or at least we could make a note to consider this as part of the work in #762

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it ok if we handle that in #762?

maxGasPerQueuePerEpoch: 1_000_000_000_000,
secondsPerEpoch: 0,
},
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts/tasks/deploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 9_000_000
const DEFAULT_CTC_MAX_TRANSACTION_GAS_LIMIT = 10_000_000
const DEFAULT_EM_MIN_TRANSACTION_GAS_LIMIT = 50_000
const DEFAULT_EM_MAX_TRANSACTION_GAS_LIMIT = 9_000_000
const DEFAULT_EM_MAX_TRANSACTION_GAS_LIMIT = 10_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
Expand Down
2 changes: 1 addition & 1 deletion packages/data-transport-layer/src/utils/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export const SEQUENCER_GAS_LIMIT = 9_000_000 // TODO: Remove and use value from event.
export const SEQUENCER_GAS_LIMIT = 10_000_000 // TODO: Remove and use value from event.
export const SEQUENCER_ENTRYPOINT_ADDRESS =
'0x4200000000000000000000000000000000000005'