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

Sync upstream 20240315 #22

Merged
merged 92 commits into from
Mar 15, 2024
Merged

Sync upstream 20240315 #22

merged 92 commits into from
Mar 15, 2024

Conversation

ImJeremyHe
Copy link
Member

No description provided.

gvladika and others added 30 commits August 22, 2023 13:23
@gvladika
Add support for deploying fee token based chains
a624b24
@gvladika
Add missing import
109b7f9
@gvladika
Service renamed
3c780e3
@gvladika
Add missing command
faf4fff
@gvladika
Merge branch 'master' into fee-token-support
7993b65
@gvladika
Refactor how native token is provided.
4411666 
iAlso don't deploy token bridge in fee token mode
@tsahee
simple: initial
4e1117e
@gvladika
Create native token on L2
d188a02
@gvladika
Deploy L3 with fee token
782280f
@gvladika
Merge branch 'master' into fee-token-support
3620a5c
@gvladika
Merge branch 'master' into fee-token-support
6742898
@gvladika
Provide maxDataSize
2f8969b
@gvladika
Use different deployers to have consistent addresses
82a072d
@ganeshvanahalli
initialize required config fields wrt current nitro
aee6cef
@ganeshvanahalli @gvladika
initialize required config fields wrt current nitro
9f2bd4b
@tsahee
Merge pull request #14 from OffchainLabs/update-config-fields
1f27c10 
initialize required config fields wrt current nitro
@gvladika
Merge branch 'master' into fee-token-support
0bd1ef2
@gvladika
Rename fee token flag, exit script if L3 node is not being deployed
f6306a5
@gvladika
Don't use eval
1e2a56d
@gvladika
Rename test accounts
11ed8e9
@gvladika
Update L3 config so that finalization of L2 delayed msgs is not required
11170fe
@gvladika
Remove leftover
d4e2340
@gvladika
Fix BigNUmber comparison
51ebfd5
@gvladika
Mint fee tokens to funnel account to use for retryable fees
3a7b2ce
@gvladika
Mint tokens to initial receiver only
fe900a5
@gvladika
Update Dockerfile to use token bridge repo instead of SDK
7b9566d
@gvladika
Add option to deploy L2-L3 token bridge
5d69cf9
@gvladika
Deploy L1-L2 token bridge using token bridge creator
e173aee
@gvladika
Provide rollup owner
e7e95b0
@tsahee
Merge pull request #6 from OffchainLabs/fee-token-support
bb3f094 
Add support for running erc20 rollup which uses custom fee token
gzeoneth and others added 26 commits January 30, 2024 23:49
@gzeoneth
chore: use main
849ab12
@gzeoneth
chore: import tokenbridge
dd89f5c
@gzeoneth
feat: bridge token from l1 if token brdige exists
e18889f
@godzillaba
registers l1 to l2 weth gateway
723ebf4
@godzillaba
registers l2 to l3 weth gateway with overridden l2 weth
a59e1b7
@godzillaba
rename l1 to parent
5593b89
@godzillaba
Merge branch 'bridgable-fee-token' into ha/l1-fee-token-and-register-…
72c9b30 
…weth
@godzillaba
add sdk-data volume to sequencer
8108a6f
@gzeoneth
chore: switch back to ocl repo
7a5fefe
@gzeoneth
chore: remove default
8b9950b
@gzeoneth
chore: use bridgeable arg
f1d090b
@gzeoneth
chore: clean up path
16202b8
@gzeoneth
chore: rename to tokenbridge-data
947e1e5
@gzeoneth
fix: nonce race
0fa46c6
@gzeoneth
docs: list named account for troubleshooting
2dab4fd
@gzeoneth
chore: also localNetwork.json
a1e1cbb
@tsahee
Merge pull request #31 from OffchainLabs/ha/l1-fee-token-and-register…
05587bc 
…-weth

feat: bridgeable fee token and weth gw
@ImJeremyHe
Merge branch 'release' of github.com:OffchainLabs/nitro-testnode into…
3ee7422 
… jh/sync
@tsahee @ImJeremyHe
accounts documentation
2d372a7
@gzeoneth @ImJeremyHe
perf: remove chrome
e8846e1
@gzeoneth @ImJeremyHe
chore: switch token-bridge-contracts main
bda0e84
@gzeoneth @ImJeremyHe
perf: use slim image
896f519
@PlasmaPower @ImJeremyHe
Add beacon client URL
5425c66
@PlasmaPower @ImJeremyHe
Disable blob reader for now
3e0ccb8
@ImJeremyHe
Fix the testnode
50c9a90
@ImJeremyHe
Merge branch 'integration' into jh/sync
3b906de
@CLAassistant
Copy link

CLAassistant commented Mar 15, 2024 •
edited
Loading

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
0 out of 7 committers have signed the CLA.

❌ tsahee
❌ ganeshvanahalli
❌ gzeoneth
❌ gvladika
❌ spsjvc
❌ PlasmaPower
❌ godzillaba
You have signed the CLA already but the status is still pending? Let us recheck it.

@ImJeremyHe ImJeremyHe merged commit 3fd5f4b into integration Mar 15, 2024
1 check was pending
@sveitser sveitser deleted the jh/sync branch March 15, 2024 14:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sveitser sveitser sveitser approved these changes

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

Successfully merging this pull request may close these issues.
10 participants
@ImJeremyHe @CLAassistant @sveitser @gvladika @tsahee @ganeshvanahalli @gzeoneth @godzillaba @spsjvc @PlasmaPower