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

Jump to bottom

feat: bold #193

Open
wants to merge 77 commits into
base: develop
Choose a base branch
from
Open

feat: bold #193

wants to merge 77 commits into from

Conversation

gzeoneth
Copy link
Member

@gzeoneth gzeoneth commented Jun 18, 2024 •
edited
Loading

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

@gzeoneth @PlasmaPower
@yahgwai @shotaronowhere @godzillaba
feat: bold 6b42a38f
a17ec6e 
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
github-advanced-security[bot]
github-advanced-security bot found potential problems Jun 18, 2024
View reviewed changes
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/libraries/EdgeChallengeManagerLib.sol Fixed Show fixed Hide fixed
src/challengeV2/EdgeChallengeManager.sol Fixed Show fixed Hide fixed
src/assertionStakingPool/AssertionStakingPool.sol Fixed Show fixed Hide fixed
gzeoneth and others added 27 commits June 18, 2024 17:33
@gzeoneth
ci: disable solhint
a7ea070
@gzeoneth
chore: test lint fix
0c55a90
@gzeoneth
test: workaround validaotor wallet test
ab43f2c
@gzeoneth
chore: restore removed files
7c950ae
@gzeoneth
test: fix and improve
4e9c334
@gzeoneth
Merge branch 'develop' into bold-merge
c9c1b32
@gzeoneth
test: disable delay buffer in 4844 test
f7bd97c
@gzeoneth
Merge branch 'bold-merge' of github.com:OffchainLabs/nitro-contracts …
733e5d3 
…into bold-merge
@gzeoneth
test: fix
19b4163
@gzeoneth
chore: update slither db
e900ee7
@gzeoneth
chore: update 4b and storage
9f68098
@gzeoneth
rename: BridgeContracts
8269b1a
@gzeoneth
Revert "rename: BridgeContracts"
3095b6b 
This reverts commit 8269b1a.
@gzeoneth
fix: deployment scripts
6ba61b6
@gzeoneth
chore: cleanup hardhat config
971c621
@gzeoneth
chore: rename bold upgrade common
084f36d
@gzeoneth
chore: remove old files
8eb176c
@gzeoneth
chore: small fix
472ce65
@gzeoneth @yahgwai @godzillaba
chore: bold pr663
7364af8 
Co-authored-by: Chris Buckland <[email protected]>
Co-authored-by: Henry <[email protected]>
@gzeoneth
fix: env sample name
146a3ef
@gzeoneth
temp: use a default l1 rpc
b35884e
@gzeoneth
fix: search a smaller range with getLogs
640e545
@gzeoneth
chore: make testUpgrade executable
8e4ef6a
@gzeoneth
chore: rename l1Timelock to excessStakeReceiver
fda3a87
@gzeoneth
feat: sepolia config
ec06528
@gzeoneth
feat: verify bold upgrade deployment
762a523
@gzeoneth
feat: use v2 as patched old rollup logic
b5046a2
@gzeoneth gzeoneth marked this pull request as draft July 9, 2024 08:13
@gzeoneth gzeoneth marked this pull request as ready for review July 18, 2024 05:28
@gzeoneth gzeoneth mentioned this pull request Jul 30, 2024
Closed
gzeoneth and others added 9 commits August 15, 2024 18:26
@gzeoneth
feat: also migrate anyTrustFastConfirmer if existed (#233)
67bf109 
* feat: also migrate anyTrustFastConfirmer if existed

* fix: use IRollupAdmin

* fix: IRollupAdmin.setAnyTrustFastConfirmer

* docs: comment on try anyTrustFastConfirmer

* fix: remove anyTrustFastConfirmer in upgrade settings

* fix: remove anyTrustFastConfirmer in Settings struct

* test: disable fast confirmer check

* test: empty anyTrustFastConfirmer
@gzeoneth
Merge remote-tracking branch 'origin/develop' into bold-merge
165134b
@gzeoneth
Merge branch 'develop' into bold-merge
ad23b04
@godzillaba @gzeoneth
feat: bold configs (#223)
5deee6d 
* configs

* note

* note

* feat: safer hoursToBlocks util

* delay buffer

* chore: update configs

* fix: circular import

* chore: param update

* chore: remove debug

* fix: restore validators

* fix: typo

* fix: remove unused error

* chore: fix slither

* comment

---------

Co-authored-by: gzeon <[email protected]>
Co-authored-by: gzeon <[email protected]>
@gzeoneth
fix: formating and enable checks in ci (#208)
9466f1c 
* chore: forge fmt

* chore: remove prettier in solhint

* chore: turn off var-name-mixedcase

* fix: state-visibility

* chore: ignore avoid-low-level-calls

* chore: solhint ignore

* chore: prettierignore update

* chore: update yarn format script

* chore: yarn format

* ci: enable format and lint

* chore: foundry default format config

* chore: remove sol config in prettier

* chore: set line_length back to 100

* chore: multiline_func_header params_first

* chore: update slither db

* ci: enable lint

* chore: yarn format

* chore: update slither db

* fix: format

* fix: format foundryup
@gzeoneth
Merge remote-tracking branch 'origin/develop' into bold-merge
06a7aeb
@gzeoneth
fix: orbit ts (#235)
6f4b1d4 
* fix: orbit ts

* fix: format
@gzeoneth
Merge branch 'develop' into bold-merge
c945d21
@gzeoneth
format: yarn format on c945d21
70d3670
gzeoneth and others added 11 commits September 3, 2024 23:37
@gzeoneth
fix: unused import and visibility (#236)
e299af5 
* fix: lint issues

* fix: slither db
@godzillaba
Merge branch 'develop' into bold-merge
f8959b6
@yahgwai @gzeoneth
Bold merge merkle comments (#244)
419a050 
* Merkle tree lib comment updates

* Comment updates

* Updated comments on the merkle tree accumulator lib

* Added comments to the merkle tree lib verify prefix proof

* Formatting

* format: yarn format

* fix: typo

* chore: fix slither

---------

Co-authored-by: gzeon <[email protected]>
Co-authored-by: gzeon <[email protected]>
@gzeoneth
v3.0.0-alpha.0
109a8a3
@gzeoneth
fix: eip 7702 (#259)
a9a222f 
* fix: eip 7702

* docs: fix comment

* fix: additional checks

* fix: also check in GasRefundEnabled

* docs: explain tofork no code size check

* refactor: CallerChecker

* chore: remove unused error import

* test: fix oog

* test: fix NotTopLevel

* chore: remove unused solhint disable

* chore: update slither db

* chore: rename isCalldataSameAsTx

* docs: update natspec

* chore: rename to CalldataChecker

* test: fix typo

* chore: rename isCallerCodelessOrigin

* docs: improve comments

* ci: whitelist npm audit

* test: codeless origin
@gzeoneth
Merge remote-tracking branch 'origin/develop' into bold-merge
a14355b
@gzeoneth
fix: format
acb2fd2
@gzeoneth
fix: nova validators list
951326d
@gzeoneth
refactor: bold interfaces (#262)
c5d4be6 
* 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
@gzeoneth
chore: bold deploy script improvements (#263)
fdd5b15 
* 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
@gzeoneth
refactor: simplify BOLDUpgradeAction (#266)
59d3cbd 
* 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yahgwai yahgwai yahgwai left review comments

@godzillaba godzillaba Awaiting requested review from godzillaba

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
s
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@gzeoneth @yahgwai @godzillaba