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

Added upgrade action for the bold upgrade #340

Merged
merged 73 commits into from
Aug 21, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
734a103
Added upgrade action for the bold upgrade
yahgwai Jun 26, 2023
24fe294
Update contracts/src/rollup/BOLDUpgradeAction.sol
yahgwai Jul 6, 2023
52277b5
Added the event for the preimage lookup
yahgwai Jul 6, 2023
c93641d
Update contracts/src/rollup/BOLDUpgradeAction.sol
yahgwai Jul 6, 2023
8e0b23f
Added todo for updating the rollup proxy expected address after nitro…
yahgwai Jul 6, 2023
3997102
Merge branch 'migration' of https://github.com/OffchainLabs/challenge…
yahgwai Jul 6, 2023
b690643
feat: use create2 to deploy RollupProxy
gzeoneth Jul 7, 2023
1738c5b
fix: contract changes in go
gzeoneth Jul 7, 2023
b5d3eff
Merge remote-tracking branch 'origin/main' into port-pr-5
gzeoneth Jul 7, 2023
ffe6b22
fix: abigen
gzeoneth Jul 7, 2023
b93ef47
Merge from main
yahgwai Jul 25, 2023
bc996e3
Added prepare and populate scripts
yahgwai Jul 25, 2023
9dbe480
Merge branch 'main' into migration
yahgwai Jul 25, 2023
8acd4d4
Merge branch 'migration' into migration-2
yahgwai Jul 25, 2023
57969d2
Migration scripts and tests
yahgwai Jul 26, 2023
3fa8a2d
Prepare local node
yahgwai Jul 27, 2023
af0444b
Updated .env location
yahgwai Jul 27, 2023
f5cbf24
Add compile
yahgwai Jul 27, 2023
0bca024
Added prepare bold script to ci
yahgwai Jul 27, 2023
bd92432
Updated populate script
yahgwai Jul 27, 2023
17b1aaf
Added bold upgrade test script
yahgwai Jul 27, 2023
8f1f36c
Added bold upgrade local execution to scripts
yahgwai Jul 27, 2023
6d48ec8
Added bold execution to ci
yahgwai Jul 27, 2023
bef036a
Added more logging to the local prepare script
yahgwai Jul 27, 2023
2896b9d
Include already deployed contracts
yahgwai Jul 27, 2023
57d1cc2
Completed local execute flow
yahgwai Jul 28, 2023
5f2b35b
Removed some logging
yahgwai Jul 28, 2023
2a411e5
Updated verify script
yahgwai Jul 28, 2023
c773492
Added verify script to ci
yahgwai Jul 28, 2023
9c62907
Added missing yarn command
yahgwai Jul 31, 2023
95c8eaf
Merge branch 'main' into migration
yahgwai Jul 31, 2023
6d566ba
Merged from migration branch
yahgwai Jul 31, 2023
d32967e
Removed tests and deleted .env
yahgwai Jul 31, 2023
129e299
Added config validation
yahgwai Jul 31, 2023
808e10f
Removed local deployed contracts
yahgwai Jul 31, 2023
ad46536
Set local dummy l1timelock
yahgwai Jul 31, 2023
7034a42
Updated local config
yahgwai Jul 31, 2023
3bb97e8
Should use string args in config
yahgwai Jul 31, 2023
c20639d
feat: setChallengeManager
gzeoneth Aug 2, 2023
6651a0f
test: setChallengeManager
gzeoneth Aug 2, 2023
b0d1831
Merge branch 'main' into port-pr-5
gzeoneth Aug 2, 2023
e31064b
chore: nitro-contracts/pull/3
gzeoneth Aug 2, 2023
725f796
chore: nitro-contracts/pull/9
gzeoneth Aug 2, 2023
883ab8d
chore: nitro-contracts/pull/12
gzeoneth Aug 2, 2023
db5b4ed
chore: nitro-contracts/pull/4
gzeoneth Aug 2, 2023
6f53624
chore: nitro-contracts/pull/8
gzeoneth Aug 2, 2023
1421fd7
chore: nitro-contracts/pull/6 and 26
gzeoneth Aug 2, 2023
e1c6b40
chore: remove unused import
gzeoneth Aug 2, 2023
8aa8b82
chore: nitro-contracts/pull/21
gzeoneth Aug 2, 2023
dc3dc3a
chore: nitro-contracts/pull/27
gzeoneth Aug 2, 2023
d802640
chore: nitro-contracts/pull/28
gzeoneth Aug 2, 2023
5b5ed8e
chore: nitro-contracts/pull/30
gzeoneth Aug 2, 2023
46c909c
chore: nitro-contracts/pull/37 and 39
gzeoneth Aug 2, 2023
34636b5
chore: nitro-contracts/pull/47
gzeoneth Aug 2, 2023
34658ff
Renamed to old rollup
yahgwai Aug 2, 2023
0ff77c1
Updates from CR
yahgwai Aug 2, 2023
a3ff8b7
Test updates
yahgwai Aug 2, 2023
fc81e12
Merge branch 'main' into port-old-pr
yahgwai Aug 2, 2023
962d09a
Migration scripts and ci (#378)
yahgwai Aug 2, 2023
a1e155a
Merge branch 'main' into migration
yahgwai Aug 2, 2023
31bad1e
Check inbox count isnt 0 before returning
yahgwai Aug 2, 2023
32687a8
Merge from main
yahgwai Aug 2, 2023
1353e62
Merge from migration
yahgwai Aug 2, 2023
0ffaeae
Set local validators
yahgwai Aug 2, 2023
bfce9a5
Added ownership transfer to bold upgrade
yahgwai Aug 2, 2023
713f2e4
Merge branch 'main' into port-old-pr
yahgwai Aug 2, 2023
c78b49c
Merge branch 'port-old-pr' into migration
yahgwai Aug 2, 2023
89776b2
Updated rollup_stack test
yahgwai Aug 2, 2023
95bcc98
Added genesis states to config
yahgwai Aug 4, 2023
fe1661a
Merge form main
yahgwai Aug 4, 2023
5438ba5
Merge conflict
yahgwai Aug 4, 2023
1570090
mod tidy
yahgwai Aug 4, 2023
0ba65b7
Merge from main
yahgwai Aug 21, 2023
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
Prev Previous commit
Next Next commit
Prepare local node
  • Loading branch information
yahgwai committed Jul 27, 2023
commit 3fa8a2d2d8ef98f51926f20efe211d83fded2d04
31 changes: 31 additions & 0 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,3 +153,34 @@ jobs:
- name: Run tests
run: forge test

bold-upgrade:
name: BOLD upgrade test
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./contracts
steps:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: OffchainLabs/actions/run-nitro-test-node@main

- name: Setup node/yarn
uses: actions/setup-node@v3
with:
node-version: 16
cache: 'yarn'
cache-dependency-path: '**/yarn.lock'

- name: Install packages
run: yarn

- name: Copy .env
run: |
cp ./scrips/.env-sample ./.env

- name: Prepare local node
run: yarn script:local-prepare



4 changes: 4 additions & 0 deletions contracts/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
L1_RPC_URL="http://localhost:8545"
L1_PRIV_KEY="cb5790da63720727af975f42c79f69918580209889225fa7128c92402a6d3a65"
CONFIG_LOCATION=
DEPLOYED_CONTRACTS_LOCATION=
4 changes: 4 additions & 0 deletions contracts/.env-sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
L1_RPC_URL="http://localhost:8545"
L1_PRIV_KEY="cb5790da63720727af975f42c79f69918580209889225fa7128c92402a6d3a65"
CONFIG_LOCATION=
DEPLOYED_CONTRACTS_LOCATION=
4 changes: 3 additions & 1 deletion contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@
"build:0.7": "INTERFACE_TESTER_SOLC_VERSION=0.7.0 yarn run build",
"test:compatibility": "yarn run build:0.6 && yarn run build:0.7",
"test:storage": "./test/storage/test.bash",
"postinstall": "patch-package"
"postinstall": "patch-package",
"script:local-prepare": "ts-node ./scripts/testLocalPrepareTestNode.ts"
},
"dependencies": {
"@openzeppelin/contracts": "4.7.3",
"@openzeppelin/contracts-upgradeable": "4.7.3",
"dotenv": "^16.3.1",
"hardhat": "^2.6.6"
},
"private": false,
Expand Down
4 changes: 0 additions & 4 deletions contracts/scripts/.env-sample

This file was deleted.

Loading