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

feat: bold #193

Merged
merged 94 commits into from
Dec 11, 2024
Merged

feat: bold #193

merged 94 commits into from
Dec 11, 2024

Conversation

gzeoneth
Copy link
Member

@gzeoneth gzeoneth commented Jun 18, 2024

merging OffchainLabs/bold@6b42a38f /contracts into nitro-contracts

contracts should be identical to the https://github.com/OffchainLabs/bold except some mocks, precompiles interface, and some renamed variables in BOLDUpgradeAction

$ diff -qr ./src ../bold/contracts/src
Only in ./src: chain
Only in ./src/mocks: Benchmarks.sol
Only in ./src/mocks: MultiCallTest.sol
Only in ./src/mocks: PendingBlkTimeAndNrAdvanceCheck.sol
Only in ./src/mocks: Program.sol
Only in ./src/mocks: SdkStorage.sol
Only in ./src/mocks: SimpleCacheManager.sol
Files ./src/precompiles/ArbWasmCache.sol and ../bold/contracts/src/precompiles/ArbWasmCache.sol differ
Files ./src/rollup/BOLDUpgradeAction.sol and ../bold/contracts/src/rollup/BOLDUpgradeAction.sol differ

e2e test is currently disabled due to lack of nitro support

resolves BLK-176

Co-authored-by: Lee Bousfield <[email protected]>
Co-authored-by: Chris Buckland <[email protected]>
Co-authored-by: shotaro <[email protected]>
Co-authored-by: Henry <[email protected]>
@cla-bot cla-bot bot added the s label Jun 18, 2024
src/rollup/RollupCore.sol Fixed Show fixed Hide fixed
src/rollup/RollupCore.sol Fixed Show fixed Hide fixed
src/rollup/RollupCore.sol Fixed Show fixed Hide fixed
src/rollup/RollupCore.sol Fixed Show fixed Hide fixed
src/rollup/RollupCore.sol Fixed Show fixed Hide fixed
src/challengeV2/EdgeChallengeManager.sol Fixed Show fixed Hide fixed
src/rollup/BOLDUpgradeAction.sol Fixed Show fixed Hide fixed
src/challengeV2/EdgeChallengeManager.sol Fixed Show fixed Hide fixed
gzeoneth and others added 17 commits October 10, 2024 01:29
* refactor: bold interfaces

* 3.0.0-alpha.1

* fix: missing interface methods

* fix: use interface when possible

* fix: format

* 3.0.0-alpha.2

* chore: update slither db

* fix: allowlist npm audit issue
* chore: use 2.1.0 for OldRollup

* fix: wait for deployment

* feat: allow excessStakeReceiver to be eoa

* wip: print action calldata

* wip: show executor perform call data

* fix: testnode master rollup addr

* wip: add local testnode executor

* wip: testnode validator

* wip: testnode validator wallet

* fix: small range lookup

* chore: sample env for testnode

* feat: bold upgrade execute and improved logging

* fix: use nextInboxPosition at upgrade to verify

* Revert "fix: use nextInboxPosition at upgrade to verify"

This reverts commit 6948823.

* fix: getlog range

* fix: nextInboxPosition

* chore: print bold addresses

* chore: log more stuffs

* chore: use 1000 range when searching log

* fix: parse event to get nextInboxPosition and more logging

* feat: allow ROLLUP_ADDRESS override in bold upgrade

* chore: whitelist npm audit issue

* chore: remove excessStakeReceiver check

* chore: revert typo
* chore: use 2.1.0 for OldRollup

* fix: wait for deployment

* feat: allow excessStakeReceiver to be eoa

* wip: print action calldata

* wip: show executor perform call data

* fix: testnode master rollup addr

* wip: add local testnode executor

* wip: testnode validator

* wip: testnode validator wallet

* fix: small range lookup

* chore: sample env for testnode

* feat: bold upgrade execute and improved logging

* fix: use nextInboxPosition at upgrade to verify

* Revert "fix: use nextInboxPosition at upgrade to verify"

This reverts commit 6948823.

* fix: getlog range

* fix: nextInboxPosition

* chore: print bold addresses

* chore: log more stuffs

* chore: use 1000 range when searching log

* fix: parse event to get nextInboxPosition and more logging

* feat: allow ROLLUP_ADDRESS override in bold upgrade

* refactor: remove rollup reader

* format: fix

* refactor: do not upgrade old rollup

* fix: format again

* fix: typo

* fix: min version required

* chore: warn if old rollup is old

* feat: make bold rollup address predictable easily

* fix: expectedRollupAddress

* feat: isRollupDeployedAtAddress

* feat: validateRollupDeployedAtAddress

* fix: squeeze within size limit

* chore: whitelist npm audit issue

* chore: remove excessStakeReceiver check

* chore: revert typo
* chore: testnode for bold upgrade

* test: stakeToken should be contract
* create failing test for rollup creator

* annotate

* fix rollup creator failure

* move test token

* test outbox execution with zero value

* rule out a zero transfer

* rule out rollup zero transfers

* rule out FactoryDeployerHelper

* test: createRetryableTicket with NoZeroTransferToken

---------

Co-authored-by: gzeon <[email protected]>
* chore: effectively disableing delay buffer

* chore: typo

Co-authored-by: Henry <[email protected]>

---------

Co-authored-by: Henry <[email protected]>
* refactor: move hardcoded value to config

* refactor: minimumAssertionPeriod and validatorAfkBlocks in bold upgrade setting

* perf: remove onchain verification

* chore: update sigs

* refactor: remove hardcode in rollup initialize

* chore: update example

* test: new config param

* fix: format test

* test: fix config

* Apply suggestions from code review

Co-authored-by: Henry <[email protected]>

---------

Co-authored-by: Henry <[email protected]>
* docs: add note regarding reorg

* wip: use create2

* edit comment

* start over

* use create2 in bridge creator

* require rollup exists

* fix tests

* fix lint

* Revert "docs: add note regarding reorg"

This reverts commit d451b72.

* remove unnecessary args from salt

* fmt

* put the salt args back

* refactor: move hardcoded value to config

* refactor: minimumAssertionPeriod and validatorAfkBlocks in bold upgrade setting

* perf: remove onchain verification

* chore: update sigs

* refactor: remove hardcode in rollup initialize

* chore: update example

* test: new config param

* fix: format

* fix: BridgeTemplates

* fix: memory

* fix: format test

* feat: use msg.data hash as salt

* test: fix

* test: fix config

* fix: slither

* refactor: bridge creator create2Salt

* chore: remove unintended change

* chore: slither

---------

Co-authored-by: gzeon <[email protected]>
Co-authored-by: gzeon <[email protected]>
@gzeoneth gzeoneth requested a review from yahgwai December 10, 2024 16:22
godzillaba
godzillaba previously approved these changes Dec 10, 2024
Copy link
Contributor

@godzillaba godzillaba left a comment

Choose a reason for hiding this comment

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

🎉

* update links in README.md

* update link in README.md

update link to deployed nitro contract addresses

* adding #core-contracts to end of link text

---------

Co-authored-by: gzeon <[email protected]>
@gzeoneth gzeoneth merged commit 8653940 into develop Dec 11, 2024
11 checks passed
@gzeoneth gzeoneth deleted the bold-merge branch December 11, 2024 11:21
@gzeoneth gzeoneth restored the bold-merge branch December 11, 2024 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants