feat(ctb): Account for worst-case `CALL` gas in `SafeCall` by clabby · Pull Request #5470 · ethereum-optimism/optimism

clabby · 2023-04-17T16:10:35Z

Overview

Adjusts SafeCall.callWithMinGas to account for the worst-case cost of 3/5 of the CALL opcode's dynamic gas factors:

address_access_cost
positive_value_cost
value_to_empty_account_cost

As for memory_expansion_cost & code_execution_cost, these are expected to be covered by the minGasLimit itself.

changeset-bot · 2023-04-17T16:10:40Z

⚠️ No Changeset found

Latest commit: 8796b41

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

clabby · 2023-04-17T16:10:49Z

Current dependencies on/for this PR:

develop
- PR feat(ctb): Account for worst-case CALL gas in SafeCall #5470 👈

This comment was auto-generated by Graphite.

netlify · 2023-04-17T16:10:53Z

✅ Deploy Preview for opstack-docs canceled.

Name	Link
🔨 Latest commit	`8796b41`
🔍 Latest deploy log	https://app.netlify.com/sites/opstack-docs/deploys/6446c7aed85c540008133b5f

packages/contracts-bedrock/contracts/universal/CrossDomainMessenger.sol

packages/contracts-bedrock/contracts/test/invariants/SafeCall.t.sol

packages/contracts-bedrock/contracts/L1/OptimismPortal.sol

Clean up the script that is used to migrate legacy withdrawals. This script is very important for testing the legacy withdrawal migration. A bug was introduced with #4911 which was a sherlock audit fix. This was a bug because the change resulted in the withdrawal hashes changing, meaning that the storage slots computed client side also changed. This resulted in breaking the script. This commit reverts this change. The changes landing in #5470 will cause the buffer in the gas limit for the migrated withdrawals to be too small, so we can reintroduce this code behind a switch with the network. Its not ideal that the migration code isn't going to match 1:1 with goerli but thats ok because we will be able to thoroughly test it.

maurelian · 2023-04-18T00:34:23Z

Fixes CLI-3832

mergify · 2023-04-18T17:18:23Z

Hey @clabby! This PR has merge conflicts. Please fix them before continuing review.

semgrep-app · 2023-04-19T02:17:12Z

Semgrep found 2 unchecked-type-assertion findings:

op-bindings/bindings/l2crossdomainmessenger.go: L432
op-bindings/bindings/l1crossdomainmessenger.go: L463

Unchecked type assertion.

_{Created by unchecked-type-assertion.}

packages/contracts-bedrock/contracts/L2/L2CrossDomainMessenger.sol

packages/contracts-bedrock/contracts/L1/OptimismPortal.sol

refcell

Few comments, otherwise looks great!

packages/contracts-bedrock/contracts/L2/L2CrossDomainMessenger.sol

packages/contracts-bedrock/contracts/L1/L1CrossDomainMessenger.sol

packages/contracts-bedrock/contracts/test/invariants/SafeCall.t.sol

packages/contracts-bedrock/contracts/universal/CrossDomainMessenger.sol

refcell

This looks pretty ironed out to me at this point pending other's reviews.

clabby · 2023-04-23T14:58:39Z

Waiting for @tynes' approval to remove the do-not-merge and mergify-ignore labels.

tynes · 2023-04-24T13:50:00Z

Do you mind squashing this PR in a commit or a few commits?

packages/contracts-bedrock/contracts/libraries/SafeCall.sol

mergify · 2023-04-24T18:17:22Z

This PR has been added to the merge queue, and will be merged soon.

mergify · 2023-04-24T18:17:53Z

This PR is next in line to be merged, and will be merged as soon as checks pass.

…Gas` Adjusts `SafeCall.callWithMinGas` to account for the worst-case cost of 3/5 of the `CALL` opcode's dynamic gas factors: - `address_access_cost` - `positive_value_cost` - `value_to_empty_account_cost` As for `memory_expansion_cost` & `code_execution_cost`, these are expected to be covered by the `minGasLimit` itself. Also removes the division from `hasMinGas` for extra precision. See: - ethereum-optimism/optimism#5470 - ethereum-optimism/optimism#5540

Clean up the script that is used to migrate legacy withdrawals. This script is very important for testing the legacy withdrawal migration. A bug was introduced with #4911 which was a sherlock audit fix. This was a bug because the change resulted in the withdrawal hashes changing, meaning that the storage slots computed client side also changed. This resulted in breaking the script. This commit reverts this change. The changes landing in #5470 will cause the buffer in the gas limit for the migrated withdrawals to be too small, so we can reintroduce this code behind a switch with the network. Its not ideal that the migration code isn't going to match 1:1 with goerli but thats ok because we will be able to thoroughly test it.

clabby force-pushed the clabby/ctb/call-with-min-gas-fix branch from b5c2a44 to 2201cee Compare April 17, 2023 17:03

maurelian reviewed Apr 17, 2023

View reviewed changes

packages/contracts-bedrock/contracts/universal/CrossDomainMessenger.sol Outdated Show resolved Hide resolved

tynes reviewed Apr 17, 2023

View reviewed changes

packages/contracts-bedrock/contracts/test/invariants/SafeCall.t.sol Show resolved Hide resolved

tynes reviewed Apr 17, 2023

View reviewed changes

packages/contracts-bedrock/contracts/L1/OptimismPortal.sol Outdated Show resolved Hide resolved

tynes mentioned this pull request Apr 17, 2023

op-chain-ops: legacy withdrawal script refactoring #5474

Merged

mergify bot added the conflict label Apr 18, 2023

clabby force-pushed the clabby/ctb/call-with-min-gas-fix branch from 2201cee to ec0adb7 Compare April 18, 2023 22:07

clabby changed the base branch from develop to jm/nonreentrant-with-replays April 18, 2023 22:07

mergify bot removed the conflict label Apr 18, 2023

clabby changed the base branch from jm/nonreentrant-with-replays to develop April 18, 2023 22:13

clabby force-pushed the clabby/ctb/call-with-min-gas-fix branch from ec0adb7 to 0dfefff Compare April 18, 2023 22:13

clabby changed the base branch from develop to jm/nonreentrant-with-replays April 18, 2023 22:18

Base automatically changed from jm/nonreentrant-with-replays to develop April 19, 2023 00:30

clabby force-pushed the clabby/ctb/call-with-min-gas-fix branch from 0dfefff to bc124c4 Compare April 19, 2023 02:16

clabby force-pushed the clabby/ctb/call-with-min-gas-fix branch from bc124c4 to 5b8ab37 Compare April 19, 2023 13:20

maurelian reviewed Apr 19, 2023

View reviewed changes

packages/contracts-bedrock/contracts/L2/L2CrossDomainMessenger.sol Outdated Show resolved Hide resolved

clabby force-pushed the clabby/ctb/call-with-min-gas-fix branch from 38bc389 to cfb60fb Compare April 19, 2023 14:34

maurelian reviewed Apr 19, 2023

View reviewed changes

packages/contracts-bedrock/contracts/L1/OptimismPortal.sol Outdated Show resolved Hide resolved

clabby force-pushed the clabby/ctb/call-with-min-gas-fix branch from cfb60fb to f7e83ad Compare April 19, 2023 14:59

clabby marked this pull request as ready for review April 19, 2023 15:24

clabby requested a review from a team as a code owner April 19, 2023 15:24

clabby requested a review from smartcontracts April 19, 2023 15:24

refcell suggested changes Apr 19, 2023

View reviewed changes

refcell approved these changes Apr 20, 2023

View reviewed changes

clabby requested review from maurelian, smartcontracts and tynes April 21, 2023 19:17

maurelian approved these changes Apr 21, 2023

View reviewed changes

tynes reviewed Apr 24, 2023

View reviewed changes

packages/contracts-bedrock/contracts/libraries/SafeCall.sol Show resolved Hide resolved

tynes reviewed Apr 24, 2023

View reviewed changes

packages/contracts-bedrock/contracts/libraries/SafeCall.sol Show resolved Hide resolved

tynes removed do-not-merge labels Apr 24, 2023

clabby force-pushed the clabby/ctb/call-with-min-gas-fix branch 2 times, most recently from c136b42 to 48ef885 Compare April 24, 2023 17:36

tynes approved these changes Apr 24, 2023

View reviewed changes

tynes removed the request for review from sebastianst April 24, 2023 17:47

Account for worst-case cost of CALL opcode in callWithMinGas

1c61224

clabby force-pushed the clabby/ctb/call-with-min-gas-fix branch from 48ef885 to 1c61224 Compare April 24, 2023 17:55

Merge branch 'develop' into clabby/ctb/call-with-min-gas-fix

8796b41

mergify bot added the on-merge-train label Apr 24, 2023

OptimismBot merged commit dd2bef6 into develop Apr 24, 2023

OptimismBot deleted the clabby/ctb/call-with-min-gas-fix branch April 24, 2023 18:32

mergify bot removed the on-merge-train label Apr 24, 2023

Conversation

clabby commented Apr 17, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Overview

Uh oh!

changeset-bot bot commented Apr 17, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚠️ No Changeset found

Uh oh!

clabby commented Apr 17, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

netlify bot commented Apr 17, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for opstack-docs canceled.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

maurelian commented Apr 18, 2023

Uh oh!

mergify bot commented Apr 18, 2023

Uh oh!

semgrep-app bot commented Apr 19, 2023

Uh oh!

Uh oh!

Uh oh!

refcell left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

refcell left a comment

Choose a reason for hiding this comment

Uh oh!

clabby commented Apr 23, 2023

Uh oh!

tynes commented Apr 24, 2023

Uh oh!

Uh oh!

Uh oh!

mergify bot commented Apr 24, 2023

Uh oh!

mergify bot commented Apr 24, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

clabby commented Apr 17, 2023 •

edited

Loading

changeset-bot bot commented Apr 17, 2023 •

edited

Loading

clabby commented Apr 17, 2023 •

edited

Loading

netlify bot commented Apr 17, 2023 •

edited

Loading