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

just for viewing diffs #20

Open
wants to merge 497 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
497 commits
Select commit Hold shift + click to select a range
b75e7c7
Merge pull request #39 from OffchainLabs/optimize-func-merkle
rachel-bousfield Apr 15, 2024
dc6327c
feat: conditional osp
gzeoneth Apr 16, 2024
b6d60e6
feat: make getter public
gzeoneth Apr 16, 2024
bad6780
Update src/node-interface/NodeInterface.sol
Jason-W123 Apr 16, 2024
f05cd14
fix: interface
gzeoneth Apr 16, 2024
e5ba177
fix: set condOsp with postUpgradeInit
gzeoneth Apr 16, 2024
337f763
chore: remove event
gzeoneth Apr 16, 2024
9677456
docs: explain
gzeoneth Apr 16, 2024
e3725f7
address review comments
rachel-bousfield Apr 16, 2024
a2889ae
fix to all comments
Jason-W123 Apr 17, 2024
1e64e2a
remove '=' in pin
rachel-bousfield Apr 17, 2024
c51ab1d
Merge pull request #41 from OffchainLabs/cache-manager-feedback
rachel-bousfield Apr 18, 2024
e7ec425
add unsafe entrypoint situation
Jason-W123 Apr 19, 2024
4ab3943
Merge branch 'decimals-audit' into e2e-decimals
gvladika Apr 22, 2024
6c4da9d
Merge pull request #161 from OffchainLabs/testnode-deploy
gvladika Apr 23, 2024
08ad24a
Merge branch 'develop' into e2e-to-ci
gvladika Apr 23, 2024
4255d5a
Merge branch 'develop' into init-price
gvladika Apr 23, 2024
ce2e32b
reset to high level comment
Jason-W123 Apr 24, 2024
8c22b28
refactor: move machine hash logic to osp
gzeoneth Apr 24, 2024
4661583
chore: add OneStepProofEntry to test
gzeoneth Apr 24, 2024
9ad425e
Merge remote-tracking branch 'origin/develop' into stylus
gzeoneth Apr 24, 2024
ecb46c1
Merge branch 'refactor-machine-hash' into stylus
gzeoneth Apr 24, 2024
95c8e59
Merge branch 'stylus' into cond-osp
gzeoneth Apr 24, 2024
82e9425
fix: use machine hash from osp
gzeoneth Apr 24, 2024
988618b
Properly calculate and configure validator addresses
gvladika Apr 25, 2024
0ab2b78
Add unit test to test conditional OSP
gvladika Apr 25, 2024
2e8eeb9
Merge pull request #174 from OffchainLabs/validator-wallet-fix
godzillaba Apr 25, 2024
7867bae
Add check
gvladika Apr 26, 2024
6d86f7a
Merge pull request #175 from OffchainLabs/unit-cond-osp
gvladika Apr 26, 2024
026578e
Merge branch 'develop' into refactor-machine-hash
gvladika Apr 26, 2024
9e875b1
Merge branch 'develop' into e2e-to-ci
gvladika Apr 29, 2024
05f263d
Use defaults
gvladika Apr 29, 2024
07d8116
Merge branch 'e2e-to-ci' of github.com:OffchainLabs/nitro-contracts i…
gvladika Apr 29, 2024
d9593ea
Add missing refs
gvladika Apr 29, 2024
3323768
Skip check if local deployment
gvladika Apr 29, 2024
9de6819
Revert "Skip check if local deployment"
gvladika Apr 29, 2024
8b6aded
add wasm to module & new precompile methods
rachel-bousfield Apr 30, 2024
707e3d4
revert wasm hash
rachel-bousfield Apr 30, 2024
a51e769
add extra hash (more powerful than just wasm)
rachel-bousfield Apr 30, 2024
a9fd08d
Merge branch 'develop' into e2e-decimals
gvladika Apr 30, 2024
09ff1db
Remove debug
gvladika Apr 30, 2024
89f7655
Merge pull request #172 from OffchainLabs/refactor-machine-hash
gzeoneth Apr 30, 2024
2537361
Merge pull request #173 from OffchainLabs/cond-osp
gzeoneth Apr 30, 2024
2cc0c6c
Merge branch 'develop' into stylus
gzeoneth Apr 30, 2024
ce34e93
Merge branch 'stylus' into stylus-mainnet-constants
hkalodner May 3, 2024
6cc4dfd
Merge pull request #179 from OffchainLabs/stylus-mainnet-constants
gzeoneth May 6, 2024
3fad9a2
ci: use known working version of foundry
gzeoneth May 6, 2024
68e179a
ci: use known working version of foundry 2
gzeoneth May 6, 2024
d615424
Fix the nitro CI builds.
eljobe May 6, 2024
c36913f
chore: keep static remapping
gzeoneth May 6, 2024
df13ab5
Merge remote-tracking branch 'origin/develop' into fix-ci
gzeoneth May 6, 2024
b9e21f0
format: remappings
gzeoneth May 6, 2024
a00d2fa
Merge pull request #182 from OffchainLabs/fix-ci
gzeoneth May 6, 2024
8f3d93f
Revert "ci: use known working version of foundry 2"
gzeoneth May 6, 2024
16c4eb1
Revert "ci: use known working version of foundry"
gzeoneth May 6, 2024
3ce2251
Merge remote-tracking branch 'origin/develop' into stylus
gzeoneth May 6, 2024
77ee9de
Merge pull request #170 from OffchainLabs/stylus
gzeoneth May 6, 2024
13fb029
Merge branch 'develop' into e2e-to-ci
gvladika May 7, 2024
62a424f
Merge branch 'develop' into e2e-decimals
gvladika May 7, 2024
7a41cd5
MultiCallTest.sol: a non-standard contract for stylus compatibility t…
tsahee May 11, 2024
e4cfb2e
Merge branch 'develop' into e2e-to-ci
gvladika May 13, 2024
eebd303
Merge branch 'e2e-to-ci' of github.com:OffchainLabs/nitro-contracts i…
gvladika May 13, 2024
791a4dd
Bump SDK
gvladika May 13, 2024
0b0fa6a
Refactor withdrawal test
gvladika May 13, 2024
8a9df20
Use whole number
gvladika May 13, 2024
83dd079
Do amount scaling where necessary
gvladika May 13, 2024
5754b88
Scale amount conditionally
gvladika May 13, 2024
05b1c67
Yarn audit fix
gvladika May 13, 2024
d320be9
Update audit-ci.json
gvladika May 13, 2024
6d35410
feat: CacheManager qol
gzeoneth May 14, 2024
15a0e1b
docs: proper natspec tag
gzeoneth May 14, 2024
11409d8
perf: cache decay
gzeoneth May 14, 2024
d7ae068
docs: chunk explain
gzeoneth May 14, 2024
c14c60e
Make node version consistent
gvladika May 14, 2024
869a458
Bump node
gvladika May 14, 2024
c4322db
Bump hardhat
gvladika May 14, 2024
2562279
Merge pull request #165 from OffchainLabs/e2e-to-ci
gzeoneth May 14, 2024
c45c84d
refactor: get rid of while true
gzeoneth May 14, 2024
5b485d2
refactor: remove loop
gzeoneth May 14, 2024
a83fb1d
fix: i=0
gzeoneth May 14, 2024
e9c1917
test: mustCache
gzeoneth May 14, 2024
f4937b3
fix: reduced cache size
gzeoneth May 14, 2024
2ebb078
refactor: needToFree
gzeoneth May 14, 2024
cb4ce8c
test: better cache manager test
gzeoneth May 14, 2024
8b29b5e
chore: remove log
gzeoneth May 14, 2024
86bf6e5
fix: lint
gzeoneth May 14, 2024
53adafa
fix: review comments
gzeoneth May 14, 2024
244303e
fix: review comments 2
gzeoneth May 14, 2024
c1cf003
fix: loop length
gzeoneth May 14, 2024
c4bd9a5
doc: fix comment
gzeoneth May 14, 2024
2af5173
Merge branch 'develop' into cache-manager-qol
gzeoneth May 14, 2024
ad27a47
Merge pull request #185 from OffchainLabs/cache-manager-qol
gzeoneth May 14, 2024
144acb1
Merge branch 'develop' into g-handle-decimals
gvladika May 15, 2024
a537889
Bump Slither action
gvladika May 15, 2024
3c2ef62
Workaround for Slither bug
gvladika May 15, 2024
bf5cabe
Update slither db
gvladika May 15, 2024
013809a
Update slither db
gvladika May 15, 2024
e43f6c2
Use 0.3.1
gvladika May 15, 2024
2d7ce34
Update slither db
gvladika May 15, 2024
8d506e0
Merge branch 'g-handle-decimals' into decimals-audit
gvladika May 15, 2024
0770fe0
Merge branch 'decimals-audit' of github.com:OffchainLabs/nitro-contra…
gvladika May 15, 2024
7dd3257
Merge branch 'decimals-audit' into e2e-decimals
gvladika May 15, 2024
be976e9
Add 6 decimals chain to CI
gvladika May 15, 2024
2ea34de
DOn't bump hardhat yet
gvladika May 16, 2024
e0a9c88
Merge branch 'develop' into e2e-withdraw
gvladika May 16, 2024
29a2d20
Don't handle audit-ci in this PR
gvladika May 16, 2024
ad0b301
Merge branch 'e2e-withdraw' of github.com:OffchainLabs/nitro-contract…
gvladika May 16, 2024
64a19cd
Merge branch 'develop' into stylus_recursive_test
gzeoneth May 22, 2024
4e153cc
Merge pull request #184 from OffchainLabs/stylus_recursive_test
gzeoneth May 22, 2024
b9da273
feat: anytrust fast confirmation
gzeoneth May 22, 2024
81eb06a
docs: fastConfirmNextNode
gzeoneth May 22, 2024
4445cd5
Merge branch 'develop' into bump-slither
gzeoneth May 24, 2024
00f94f7
Merge pull request #186 from OffchainLabs/bump-slither
gzeoneth May 24, 2024
b0126f5
Merge pull request #102 from OffchainLabs/decimals-audit
gzeoneth May 24, 2024
f93a327
test: improve outbox tests
gzeoneth Jun 4, 2024
086b1ca
Merge pull request #188 from OffchainLabs/fix-outbox-test
gzeoneth Jun 6, 2024
d7aa313
Fix link to license
joshuacolvin0 Jun 10, 2024
2d95abf
Add initializer for cache manager
yahgwai Jun 14, 2024
7f6f430
Forge fmt
yahgwai Jun 14, 2024
1e37427
Scale fee amount in rollupo creation script
gvladika Jun 14, 2024
483153f
src/
yahgwai Jun 14, 2024
334b760
Added slither exceptions for cachemanager
yahgwai Jun 14, 2024
0f4d8f3
Do scaling only when fee token is used
gvladika Jun 14, 2024
432f8af
Deploy and set cache manager
gvladika Jun 14, 2024
aebd20f
Deploy on child chain
gvladika Jun 14, 2024
6cc9bbf
Use existing deployer key
gvladika Jun 14, 2024
7abde68
Put CacheManager deployment into separate script
gvladika Jun 17, 2024
8676636
Add yarn action to deploy cache manager in testnode
gvladika Jun 17, 2024
a6e8efa
Merge pull request #192 from OffchainLabs/deploy-cache-manager
gvladika Jun 18, 2024
bce4e72
Merge branch 'develop' into fast-conf-port
gzeoneth Jun 20, 2024
f1bb9a5
Specify address when caching Stylus program
PlasmaPower Jun 21, 2024
cc53496
Add back in cacheCodehash as deprecated
PlasmaPower Jun 21, 2024
ccd2c2b
chore: update storage and 4bytes
gzeoneth Jun 24, 2024
40caf7c
Merge branch 'develop' into cache-program-address
gzeoneth Jun 25, 2024
37bb571
fix: merge conflicts
gzeoneth Jun 25, 2024
1a868ce
feat: getMinBid(address)
gzeoneth Jun 25, 2024
739495e
ci: contract size check
gzeoneth Jun 27, 2024
6716681
fix: workaround contract size issue
gzeoneth Jun 27, 2024
24e76a1
test: prebold fast confirmer
gzeoneth Jul 1, 2024
e17f2ac
docs: anyTrustFastConfirmer need to be validator
gzeoneth Jul 1, 2024
b1a870d
docs: reminder to remove old fast confirmer
gzeoneth Jul 1, 2024
d876e2a
test: add deadline test
gzeoneth Jul 1, 2024
7142dd8
fix: lint
gzeoneth Jul 1, 2024
2ca8da4
Merge branch 'develop' into e2e-withdraw
gzeoneth Jul 1, 2024
b8fd7cd
Merge pull request #194 from OffchainLabs/cache-program-address
gzeoneth Jul 1, 2024
1c0b9c7
Merge branch 'develop' into proxy-cache-manager
gzeoneth Jul 1, 2024
cf0f18f
test: add CacheManager to upgradibility checks
gzeoneth Jul 1, 2024
45f7d4f
chore: push CacheManager storage and 4bytes
gzeoneth Jul 1, 2024
6ec09ad
chore: ignore slither
gzeoneth Jul 1, 2024
8017f6d
Merge branch 'develop' into hotfix-comment-for-excessFeeRefundAddress
gzeoneth Jul 1, 2024
b34e450
Merge branch 'develop' into init-price
gzeoneth Jul 1, 2024
04f247e
Merge branch 'develop' into license-link
gzeoneth Jul 1, 2024
d021be2
Merge pull request #191 from OffchainLabs/proxy-cache-manager
gzeoneth Jul 1, 2024
ab25450
Merge branch 'develop' into license-link
gzeoneth Jul 1, 2024
7106b13
Merge pull request #190 from OffchainLabs/license-link
gzeoneth Jul 1, 2024
18f950e
Merge branch 'develop' into hotfix-comment-for-excessFeeRefundAddress
gzeoneth Jul 1, 2024
cfd5cb8
Merge pull request #167 from OffchainLabs/hotfix-comment-for-excessFe…
gzeoneth Jul 1, 2024
4acde7d
Merge branch 'develop' into e2e-withdraw
gzeoneth Jul 1, 2024
a1f57bf
Merge pull request #183 from OffchainLabs/e2e-withdraw
gzeoneth Jul 1, 2024
06e6d6b
Merge branch 'develop' into init-price
gzeoneth Jul 1, 2024
41a265d
Merge branch 'develop' into g-handle-decimals
gzeoneth Jul 1, 2024
fc6603c
Merge branch 'develop' into factory-deployer-helper
gzeoneth Jul 1, 2024
16095ce
Merge pull request #105 from OffchainLabs/factory-deployer-helper
gzeoneth Jul 1, 2024
6111b41
fix: use safeApprove
ControlCplusControlV Jul 1, 2024
e25b9f6
test: fix similar to #188 with scoping
gzeoneth Jul 1, 2024
1256a71
Merge branch 'develop' into g-handle-decimals
gzeoneth Jul 1, 2024
a7fb67a
Merge branch 'develop' into init-price
gzeoneth Jul 2, 2024
0aaab5d
Deploy CacheManger as upgradeable
gvladika Jul 2, 2024
0929b6f
Use type to init
gvladika Jul 2, 2024
d07819f
Slither update
gvladika Jul 3, 2024
b46af65
Remove unused
gvladika Jul 3, 2024
09d10b3
Merge pull request #200 from OffchainLabs/fix-cache-manager
gzeoneth Jul 3, 2024
870566d
Merge branch 'develop' into g-handle-decimals
gzeoneth Jul 3, 2024
34751a7
Merge branch 'g-handle-decimals' into e2e-decimals
gzeoneth Jul 3, 2024
f4bf96e
Merge pull request #201 from OffchainLabs/e2e-decimals
gvladika Jul 3, 2024
2e90a05
Merge pull request #100 from OffchainLabs/g-handle-decimals
gzeoneth Jul 3, 2024
de1852c
Merge branch 'develop' into init-price
gzeoneth Jul 3, 2024
7aae8fa
Merge pull request #117 from OffchainLabs/init-price
gzeoneth Jul 3, 2024
5cf93d2
Merge branch 'develop' into fast-conf-port
gzeoneth Jul 3, 2024
bddac4b
Merge pull request #187 from OffchainLabs/fast-conf-port
gzeoneth Jul 3, 2024
cf19dad
chore: review and ignore slither issues
gzeoneth Jul 3, 2024
35d1571
chore: bump packages
gzeoneth Jul 3, 2024
677e1bf
chore: ignore npm audit issues
gzeoneth Jul 3, 2024
0a1df6c
chore: drop nodejs 16 support
gzeoneth Jul 3, 2024
b59d546
chore: revert prettier bump
gzeoneth Jul 3, 2024
42ac427
fix: unused import
gzeoneth Jul 3, 2024
1a47665
ci: use node18 testnode ref
gzeoneth Jul 4, 2024
5686d68
fix: use 127.0.0.1 instead
gzeoneth Jul 4, 2024
39bd03d
Merge pull request #203 from OffchainLabs/chore-slither-db
gzeoneth Jul 4, 2024
1ac59aa
ci: use sha instead of head ref to support push and pull
gzeoneth Jul 4, 2024
0ed27f0
ci: branch expression
gzeoneth Jul 4, 2024
61204dd
Merge pull request #205 from OffchainLabs/ci-use-sha
gzeoneth Jul 4, 2024
1251afe
merge in upstream
epociask Jul 8, 2024
40ffbee
fix compilation bugs
epociask Jul 8, 2024
95162e1
use in-house runner
epociask Jul 8, 2024
9595d1c
Merge branch 'develop' of github.com:Layr-Labs/nitro-contracts-privat…
epociask Jul 8, 2024
37383c2
update rollupCreation script
epociask Jul 9, 2024
e8eb3f3
update console log in deploymentUtils
epociask Jul 9, 2024
344fc29
update wiring for setting rollup manager
epociask Jul 9, 2024
3ced162
update rollup mgmt contract and deployment logic
epociask Jul 9, 2024
acc6f31
fix stack too deep compilation bug
epociask Jul 9, 2024
ad6ad21
updated tests
epociask Jul 9, 2024
beb4d3d
Remove version overrides
gvladika Jul 10, 2024
840c189
v2.0.0 (#207)
gzeoneth Jul 10, 2024
8ae533a
Merge branch 'develop' into ci-versioning
gzeoneth Jul 10, 2024
910e12d
Merge pull request #210 from OffchainLabs/ci-versioning
gzeoneth Jul 10, 2024
faa763f
add length encoding to eigenda proof verification
epociask Jul 16, 2024
69399a2
Merge pull request #202 from OffchainLabs/develop
gzeoneth Jul 17, 2024
0e3ecb9
fix: add gas refunding to eigenda batch sequencing
epociask Jul 17, 2024
eaa0aef
incorporate bowen xue's osp fixes
epociask Jul 18, 2024
739eea5
feat: check node hash in fast confirmation
gzeoneth Jul 19, 2024
a2fd025
test: node hash check
gzeoneth Jul 19, 2024
e6b3a93
chore: update slither db
gzeoneth Jul 19, 2024
406d524
chore: update 4bytes
gzeoneth Jul 19, 2024
520fb9e
fix: lint
gzeoneth Jul 20, 2024
6d59d87
fix: solhint
gzeoneth Jul 20, 2024
8de80d0
fix: contract sizer strict
gzeoneth Jul 24, 2024
f712443
refactor: move whenNotPaused to internal function
gzeoneth Jul 24, 2024
f7894d3
chore: squeeze codesize
gzeoneth Jul 24, 2024
4671e0a
contract updates
0x0aa0 Aug 7, 2024
0acd80e
fix outbox test
0x0aa0 Aug 7, 2024
e01b6ee
fix yarn audit
0x0aa0 Aug 7, 2024
25af320
fix ci
0x0aa0 Aug 7, 2024
460b817
fix ci
0x0aa0 Aug 7, 2024
13f4041
revert
0x0aa0 Aug 7, 2024
aaa523b
moving changes here
Aug 13, 2024
b2df8e0
Merge pull request #17 from Layr-Labs/arch/contract-updates-v3.0.3
0x0aa0 Aug 13, 2024
5d3f620
fixing commitment hash calculation
Aug 13, 2024
8bb3919
adding keccak fix and comments
Aug 13, 2024
1e19130
changing name as it was shadowing
Aug 13, 2024
71e4491
adding leaf contents check
Aug 14, 2024
5965f44
fix: Include length in preimage hash generation
epociask Aug 14, 2024
adba288
adding alpha-z comment
Aug 15, 2024
1f0f64b
removing unwanted variable
Aug 15, 2024
a30d358
removing unwanted comments
Aug 15, 2024
de9b114
removing more comments
Aug 15, 2024
cd08265
fix: Include length in preimage hash generation - refactors & change …
epociask Aug 17, 2024
de5ee38
fix: forge tests
epociask Aug 18, 2024
82b24ff
fix: update deploy artifacts
epociask Aug 18, 2024
6aed7ed
fix: update hash calculation
epociask Aug 19, 2024
455cc85
chore: Update kzg-bn254 test
epociask Aug 20, 2024
7fc4651
chore: Update runners
epociask Aug 20, 2024
0f3933c
chore: Run formatter
epociask Aug 20, 2024
6093c86
Merge branch 'new-osp-fixes-v3.0.3' of github.com:Layr-Labs/nitro-con…
epociask Aug 20, 2024
c881d21
chore: fmt
epociask Aug 20, 2024
03636d4
chore: fix hardhat tests
epociask Aug 20, 2024
90dbdcf
chore: ignore compatibility test in CI
epociask Aug 20, 2024
9904075
Merge pull request #19 from Layr-Labs/epociask--length-fixes-v3.0.3
epociask Aug 21, 2024
b74b3f0
Merge pull request #18 from Layr-Labs/new-osp-fixes-v3.0.3
epociask Aug 22, 2024
2b94514
Merge branch 'v3.1.2' of github.com:Layr-Labs/nitro-contracts into ei…
epociask Sep 4, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/audit-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16, 18, 20]
node-version: [18, 20]
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
109 changes: 102 additions & 7 deletions .github/workflows/contract-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ jobs:
- name: Setup node/yarn
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
cache: 'yarn'
cache-dependency-path: '**/yarn.lock'

- name: Install packages
run: yarn

- name: Build
run: forge test --fork-url https://rpc.holesky.ethpandaops.io/
# - name: Build
# run: forge test --fork-url https://rpc.holesky.ethpandaops.io/
tests:
name: Contract tests
runs-on: ubuntu-8
runs-on: ubuntu-latest
defaults:
run:
shell: bash
Expand Down Expand Up @@ -79,12 +79,15 @@ jobs:
- name: Run tests
run: yarn hardhat --network hardhat test test/contract/*.spec.ts

- name: Interface compatibility
run: yarn run test:compatibility
# - name: Interface compatibility
# run: yarn run test:compatibility

- name: Forge build
run: forge build

- name: Test size
run: yarn contract:size

- name: Test Storage Layouts
run: yarn run test:storage

Expand Down Expand Up @@ -123,7 +126,7 @@ jobs:
- name: Setup nodejs
uses: actions/setup-node@v2
with:
node-version: '18'
node-version: 18
cache: 'yarn'
cache-dependency-path: '**/yarn.lock'

Expand All @@ -135,3 +138,95 @@ jobs:

- name: Test 4844
run: yarn test:4844
test-e2e:
name: Test e2e
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: recursive

- uses: OffchainLabs/actions/run-nitro-test-node@main
with:
l3-node: true
no-token-bridge: true
no-l3-token-bridge: true
nitro-contracts-branch: '${{ github.event.pull_request.head.sha || github.sha }}'

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

- name: Install packages
run: yarn

- name: Compile contracts
run: yarn build

- name: Run e2e tests
run: yarn test:e2e
test-e2e-custom-fee-token:
name: Test e2e custom fee token
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: recursive

- uses: OffchainLabs/actions/run-nitro-test-node@main
with:
l3-node: true
args: --l3-fee-token
no-token-bridge: true
no-l3-token-bridge: true
nitro-contracts-branch: '${{ github.event.pull_request.head.sha || github.sha }}'

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

- name: Install packages
run: yarn

- name: Compile contracts
run: yarn build

- name: Run e2e tests
run: yarn test:e2e
test-e2e-fee-token-6-decimals:
name: Test e2e fee token with 6 decimals
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: recursive

- uses: OffchainLabs/actions/run-nitro-test-node@main
with:
l3-node: true
args: --l3-fee-token --l3-fee-token-decimals 6
no-token-bridge: true
no-l3-token-bridge: true
nitro-contracts-branch: '${{ github.event.pull_request.head.sha || github.sha }}'

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

- name: Install packages
run: yarn

- name: Compile contracts
run: yarn build

- name: Run e2e tests
run: yarn test:e2e
3 changes: 2 additions & 1 deletion .github/workflows/slither.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ jobs:
- uses: actions/checkout@v4

- name: Run Slither
uses: crytic/slither-action@v0.3.1
uses: crytic/slither-action@v0.4.0
id: slither
with:
sarif: results.sarif
fail-on: medium
slither-args: --skip-assembly

- name: Upload SARIF file
if: always()
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ src/lib/abi/**
.nyc_output
out/**
lib/**
src/mocks/MultiCallTest.sol
116 changes: 0 additions & 116 deletions LICENSE.md

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ yarn build

## License

Nitro is currently licensed under a [Business Source License](./LICENSE), similar to our friends at Uniswap and Aave, with an "Additional Use Grant" to ensure that everyone can have full comfort using and running nodes on all public Arbitrum chains.
Nitro is currently licensed under a [Business Source License](./LICENSE.md), similar to our friends at Uniswap and Aave, with an "Additional Use Grant" to ensure that everyone can have full comfort using and running nodes on all public Arbitrum chains.

The Additional Use Grant also permits the deployment of the Nitro software, in a permissionless fashion and without cost, as a new blockchain provided that the chain settles to either Arbitrum One or Arbitrum Nova.

Expand Down
10 changes: 9 additions & 1 deletion audit-ci.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@
// Exposure of sensitive information in follow-redirects
"GHSA-74fj-2j2h-c42q",
// Open Zeppelin: Base64 encoding may read from potentially dirty memory
"GHSA-9vx6-7xxf-x967"
"GHSA-9vx6-7xxf-x967",
// semver vulnerable to Regular Expression Denial of Service
"GHSA-c2qf-rxjj-qqgw",
// follow-redirects' Proxy-Authorization header kept across hosts
"GHSA-cxjh-pqwp-8mfp",
// Prototype Pollution in async
"GHSA-fwr7-v2mv-hh25",
// ws affected by a DoS when handling a request with many HTTP headers
"GHSA-3h5v-q93c-6h6q"
]
}
10 changes: 10 additions & 0 deletions deploy/L2BlobVerifierStubCreator.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module.exports = async hre => {
const { deployments, getNamedAccounts, ethers } = hre
const { deploy } = deployments
const { deployer } = await getNamedAccounts()

await deploy('EigenDABlobVerifierL2', { from: deployer, args: [] })
}

module.exports.tags = ['EigenDABlobVerifierL2']
module.exports.dependencies = []
8 changes: 5 additions & 3 deletions deploy/SequencerInbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ module.exports = async hre => {

const EigenDARollupUtils = await ethers.getContract('EigenDARollupUtils')



await deploy('SequencerInbox', { from: deployer, args: [117964], libraries: { EigenDARollupUtils: EigenDARollupUtils.address } })
await deploy('SequencerInbox', {
from: deployer,
args: [117964],
libraries: { EigenDARollupUtils: EigenDARollupUtils.address },
})
}

module.exports.tags = ['SequencerInbox']
Expand Down
12 changes: 11 additions & 1 deletion foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,25 @@ optimizer = true
optimizer_runs = 100
via_ir = false
solc_version = '0.8.12'
remappings = ['ds-test/=lib/forge-std/lib/ds-test/src/',
'forge-std/=lib/forge-std/src/',
'@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/',
'@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/',
'eigenda/contracts/=lib/eigenda/contracts/src',
'eigenlayer-middleware/=lib/eigenda/contracts/lib/eigenlayer-middleware/src/',
'eigenlayer-core/=lib/eigenda/contracts/lib/eigenlayer-middleware/lib/eigenlayer-contracts/src/'
]
fs_permissions = [{ access = "read", path = "./"}]

[profile.yul]
src = 'yul'
out = 'out/yul'
libs = ['node_modules', 'lib']
cache_path = 'forge-cache/yul'
remappings = []
auto_detect_remappings = false

[fmt]
number_underscore = 'thousands'
line_length = 100
# See more config options https://github.com/foundry-rs/foundry/tree/master/config
# See more config options https://github.com/foundry-rs/foundry/tree/master/config
Loading
Loading