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.

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

Add pre-deployed HC contracts to genesis file #46

Merged
merged 24 commits into from
Sep 19, 2023

Conversation

boyuan-chen
Copy link

@boyuan-chen boyuan-chen commented Sep 12, 2023

This PR integrates the HC contracts to the pre-deployed addresses.

  • The BobeTuringCredit is pre-deployed at 0x42000000000000000000000000000000000003e8.
  • The BobaHCHelper is pre-deployed at 0x42000000000000000000000000000000000003E9

Other changes:

bedrock-devnet/devnet/__init__.py
bedrock-devnet/hardhat/__init__.py
boba-bindings/artifacts.json
boba-bindings/bindings/boba.go
boba-bindings/bindings/boba_gaspriceoracle.go
boba-bindings/bindings/boba_gaspriceoracle_more.go
boba-bindings/bindings/boba_more.go
boba-bindings/bindings/bobahchelper.go
boba-bindings/bindings/bobahchelper_more.go
boba-bindings/bindings/bobaturingcredit.go
boba-bindings/bindings/bobaturingcredit_more.go
boba-bindings/bindings/governancetoken.go
boba-bindings/bindings/l2governanceerc20.go
boba-bindings/bindings/mips_more.go
boba-bindings/bindings/preimageoracle_more.go
boba-bindings/gen/main.go
boba-bindings/predeploys/addresses.go
boba-chain-ops/README.md
boba-chain-ops/cmd/check-l2/main.go
boba-chain-ops/genesis/check.go
boba-chain-ops/genesis/config.go
boba-chain-ops/genesis/layer_two_test.go
boba-chain-ops/genesis/setters.go
boba-chain-ops/immutables/immutables.go
boba-chain-ops/immutables/immutables_test.go
op-bindings/artifacts.json
op-bindings/bindings/boba.go
op-bindings/bindings/boba_more.go
op-bindings/bindings/bobahchelper.go
op-bindings/bindings/bobahchelper_more.go
op-bindings/bindings/bobaturingcredit.go
op-bindings/bindings/bobaturingcredit_more.go
op-bindings/bindings/l2governanceerc20.go
op-bindings/bindings/l2governanceerc20_more.go
op-bindings/bindings/mips_more.go
op-bindings/bindings/preimageoracle_more.go
op-bindings/bindings/registry.go
op-bindings/gen/main.go
op-bindings/predeploys/addresses.go
op-chain-ops/cmd/check-l2/main.go
op-chain-ops/genesis/config.go
op-chain-ops/genesis/layer_two_test.go
op-chain-ops/genesis/setters.go
op-chain-ops/immutables/immutables.go
op-chain-ops/immutables/immutables_test.go
op-chain-ops/state/state.go
packages/contracts-bedrock/scripts/Deploy.s.sol
packages/contracts-bedrock/scripts/Deployer.sol
packages/contracts-bedrock/src/boba/BOBA.sol
packages/contracts-bedrock/src/boba/BobaHCHelper.sol
packages/contracts-bedrock/src/boba/BobaTuringCredit.sol
packages/contracts-bedrock/src/boba/Boba_GasPriceOracle.sol
packages/sdk/tasks/deposit-boba.ts

TODO:

  1. Add a script in boba-chain-ops to migrate storage from the old BobeTuringCredit to the new one.
  2. Add a script to adapt boba-chain-ops for the Ethereum mainnet L2.

These two changes will be created in separate PRs, as this PR is already too large.

mmontour1306 and others added 2 commits September 12, 2023 10:07
the legacy TuringCredit contract to allow billing through the
new mechanism.
 Changes to be committed:
	new file:   packages/contracts-bedrock/src/boba/BobaHCHelper.sol
	modified:   packages/contracts-bedrock/src/boba/BobaTuringCredit.sol
@boyuan-chen boyuan-chen changed the title Add pre-deploy HC contracts Add pre-deployed HC contracts to genesis file Sep 12, 2023
@boyuan-chen boyuan-chen marked this pull request as ready for review September 18, 2023 23:59
Copy link

@jyellick jyellick left a comment

Choose a reason for hiding this comment

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

Overall LGTM

boba-chain-ops/README.md Outdated Show resolved Hide resolved
// ----------------------------------------------------
// New for Anchorage

// Could make this configurable, but for now it's hard-coded to a predeploy address

Choose a reason for hiding this comment

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

If we made this configurable, would it give us more flexibility for what degree of EVM vs. Application space the implementation lands -- or are we generally protected by the ability to upgrade the contract itself?

Copy link
Author

Choose a reason for hiding this comment

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

@mmontour1306 Any thoughts about this?

Choose a reason for hiding this comment

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

The BobaTuringCredit contract is only needed for legacy support, and at present I can't think of any cases where we would need to make the HCHelper address configurable. Even if we do move some of the implementation logic out of the Sequencer we would still want to have the Helper contract deployed to a known address.

@boyuan-chen boyuan-chen merged commit 9ed930c into develop Sep 19, 2023
@boyuan-chen boyuan-chen deleted the predeploy-hc-contracts branch September 19, 2023 22:09
boyuan-chen pushed a commit that referenced this pull request Oct 22, 2024
…11776)

* chore: configure medusa with basic supERC20 self-bridging (#19)

- used --foundry-compile-all to ensure the test contract under
  `test/properties` is compiled (otherwise it is not compiled and medusa
  crashes when it can't find it's compiled representation)
- set src,test,script to test/properties/medusa to not waste time
  compiling contracts that are not required for the medusa campaign
- used an atomic bridge, which doesnt allow for testing of several of
  the proposed invariants

fix: delete dead code
test: give the fuzzer a head start
docs: fix properties order
test: document & implement assertions 22, 23  and 24
fix: fixes from self-review
test: guide the fuzzer a little bit less
  previously: initial mint, bound on transfer amount: 146625 calls in 200s
  now: no initial mint, no bound on transfer amount: 176835 calls in 200s
  it doesn't seem to slow the fuzzer down
fix: fixes after lovely feedback by disco
docs: merge both documents and categorized properties by their milestone
fix: fixes from parti's review
fix: feedback from disco
fix: feedback from doc
refactor: separate state transitions from pure properties
docs: update tested properties
refactor: move all assertions into properties contract
fix: move function without assertions back into handler
test: only use assertion mode
fix: improve justfile recipie for medusa

* feat: halmos symbolic tests (#21)

* feat: introduce OptimismSuperchainERC20

* fix: contract fixes

* feat: add snapshots and semver

* test: add supports interface tests

* test: add invariant test

* feat: add parameters to the RelayERC20 event

* fix: typo

* fix: from param description

* fix: event signature and interface pragma

* feat: add initializer

* feat: use unstructured storage and OZ v5

* feat: update superchain erc20 interfaces

* fix: adapt storage to ERC7201

* test: add initializable OZ v5 test

* fix: invariant docs

* fix: ERC165 implementation

* test: improve superc20 invariant (#11)

* fix: gas snapshot

* chore: configure medusa with basic supERC20 self-bridging

- used --foundry-compile-all to ensure the test contract under
  `test/properties` is compiled (otherwise it is not compiled and medusa
  crashes when it can't find it's compiled representation)
- set src,test,script to test/properties/medusa to not waste time
  compiling contracts that are not required for the medusa campaign
- used an atomic bridge, which doesnt allow for testing of several of
  the proposed invariants

* fix: delete dead code

* test: give the fuzzer a head start

* feat: create suite for sybolic tests with halmos

* test: setup and 3 properties with symbolic tests

* chore: remove todo comment

* docs: fix properties order

* test: document & implement assertions 22, 23  and 24

* fix: fixes from self-review

* test: guide the fuzzer a little bit less

previously: initial mint, bound on transfer amount: 146625 calls in 200s
now: no initial mint, no bound on transfer amount: 176835 calls in 200s

it doesn't seem to slow the fuzzer down

* feat: add property for burn

* refactor: remove symbolic address on mint property

* refactor: order the tests based on the property id

* feat: checkpoint

* chore: set xdomain sender on failing test

* chore: enhance mocks

* Revert "Merge branch 'chore/setup-medusa' into feat/halmos-symbolic-tests"

This reverts commit 945d6b6, reversing
changes made to 5dcb3a8.

* refactor: remove symbolic addresses to make all of the test work

* chore: remove console logs

* feat: add properties file

* chore: polish

* refactor: enhance test on property 7 using direct try catch (now works)

* fix: review comments

* refactor: add symbolic addresses on test functions

* feat: create halmos toml

* chore: polish test contract and mock

* chore: update property

* refactor: move symbolic folder into properties one

* feat: create advanced tests helper contract

* refactor: enhance tests using symbolic addresses instead of concrete ones

* chore: remove 0 property natspec

* feat: add halmos profile and just script

* chore: rename symbolic folder to halmos

* feat: add halmos commands to justfile

* chore: reorder assertions on one test

* refactor: complete test property seven

* chore: mark properties as completed

* chore: add halmos-cheatcodes dependency

* chore: rename advancedtest->halmosbase

* chore: minimize mocked messenger

* chore: delete empty halmos file

* chore: revert changes to medusa.json

* docs: update changes to PROPERTIES.md from base branch

* test: sendERC20 destination fix

* chore: natspec fixes

---------

Co-authored-by: agusduha <[email protected]>
Co-authored-by: 0xng <[email protected]>
Co-authored-by: teddy <[email protected]>

* test: remaining protocol properties (#26)

* test: cross-user fuzzed bridges + actor setup

* test: fuzz properties 8 and 9

* test: properties 7 and 25

* fix: implement doc's feedback

* test: superc20 tob properties (#27)

* chore: add crytic/properties dependency

* test: extend protocol properties so it also covers ToB erc20 properties

* chore: small linter fixes

* docs: update property list

* test: handlers for remaining superc20 state transitions

* fix: disable ToB properties we are not using and guide the fuzzer a bit more

* fix: disable another ToB property not implemented by solady

* chore: remove zero-initializations

* fix: feedback from disco

* chore: separate fuzz campaign tests in guided vs unguided

* test: dont revert on successful unguided relay

* test: add fuzzed calls to burn and mint

* docs: document the separation of fuzz test functions

* chore: move the properties file to its own directory

* chore: consistently use fuzz_ and property_ + camelcase

* chore: fix typo

* chore: camelcase for handlers as well

* fix: revert change that broke halmos campaign compile :D

* test: fuzz non atomic bridging (#31)

* test: changed mocked messenger ABI for message sending but kept assertions the same

* docs: add new properties 26&27

* test: queue cross-chain messages and test related properties

* test: relay random messages from queue and check associated invariants

* chore: rename bridge->senderc20 method for consistency with relayerc20

* test: not-yet-deployed supertokens can get funds sent to them

* chore: medusa runs forever by default

doable since it also handles SIGINTs gracefully

* chore: document the reason behind relay zero and send zero inconsistencies

* fix: feedback from doc

* fix: walk around possible medusa issue

I'm getting an 'unknown opcode 0x4e' in ProtocolAtomic constructor when
calling the MockL2ToL2CrossDomainMessenger for the first time

* test: unguided handler for sendERC20

* fix: feedback from disco

* chore: remove halmos testsuite

* chore: foundry migration (#40)

* chore: track assertion failures

this is so foundry's invariant contract can check that an assertion
returned false in the handler, while still allowing `fail_on_revert =
false` so we can still take full advantage of medusa's fuzzer & coverage
reports

* fix: explicitly skip duplicate supertoken deployments

* chore: remove duplicated PROPERTIES.md file

* chore: expose data to foundry's external invariant checker

* test: run medusa fuzzing campaign from within foundry

* fix: eagerly check for duplicate deployments

* fix: feedback from doc

* chore: shoehorn medusa campaign into foundry dir structure

* chore: remove PROPERTIES.md file

* chore: delete medusa config

* docs: limited support for subdirectories in test/invariant

* chore: rename contracts to be more sneaky about medusa

* docs: rewrite invariant docs in a way compliant with autogen scripts

* chore: fixes from rebase

* fix: cleanup superc20 invariants (#46)

* chore: revert modifications from medusa campaign

* docs: extra docs on why ForTest contract is required

* doc: add list of all supertoken properties

* chore: run forge fmt

* ci: allow for testfiles to be deleted

* fix: run doc autogen script after rebase

---------

Co-authored-by: Disco <[email protected]>
Co-authored-by: agusduha <[email protected]>
Co-authored-by: 0xng <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants