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

Token bridge factory #36

Merged
merged 194 commits into from
Oct 9, 2023
Merged

Token bridge factory #36

merged 194 commits into from
Oct 9, 2023

Conversation

gvladika
Copy link
Contributor

@gvladika gvladika commented Jul 5, 2023

Adds 3 ways of deploying token bridge:

  • iteratively contract by contract using script
    • tokenBridgeDeployer.ts
  • 3 TX deployment using on-chain factories
    • L1TokenBridgeCreator.sol's createTokenBridge
    • L2TokenBridgeFactory.sol's constructor
    • L1TokenBridgeCreator.sol's initTokenBridge
    • automated in script tokenBridgeDeployerViaFactories.ts
  • single TX "atomic" deployment using creator and retryables
    • L1AtomicTokenBridgeCreator.sol's createTokenBridge does all the work using retryable calls to L2AtomicTokenBridgeFactory
    • automated in script atomicTokenBridgeDeployer.ts

There is also a verifier script tokenBridgeDeploymentTest.ts that checks everything is properly deployed and initialized

  • yarn run test:tokenbridge:deployment

All scripts are targeting local deployment but can easily adapted for testnet/mainnet.

Example flow:

cd nitro/nitro-testnode
./test-node.bash --init --dev --no-tokenbridge

cd token-bridge-contracts
yarn run deploy:tokenbridge:atomic
yarn run test:tokenbridge:deployment

gvladika added 30 commits April 3, 2023 13:03
@gvladika
Add foundry config
32d00e7
@gvladika
forge install: forge-std
694f54a 
v1.5.2
@gvladika
Add 1st Foundry testcase
80b5713
@gvladika
Add eth/erc20 inbox mock
20d53a9
@gvladika
Implement token deposit for ERC20-based rollup, include Foundry test …
265aa2e 
…case
@gvladika
Add missing param
98cbd9f
@gvladika
Run tests as Github actions
cccd156
@gvladika
Remove circleci config
33e395c
@gvladika
Put workflow file in the right place
72e3626
@gvladika
Reconfigure CI triggers
d5f916e
@gvladika
Check DepositInitiated is correctly emitted
792483c
@gvladika
Add more event checks
92a6810
@gvladika
Use IL1ArbitrumGateway interface where possible
8354537
@gvladika
Test outboundTransferCustomRefund
bbdbda1
@gvladika
Test finalizeInboundTransfer
2c1a092
@gvladika
Make L1OrbitERC20GatewayTest inherit from L1ERC20GatewayTest to avoid…
26d4cc8 
… code duplication
@gvladika
Test failure conditions of outboundTransferCustomRefund
9fb72cd
@gvladika
Dummy commit to trigger CI
b9a819c
@gvladika
Add tests for L1NotContract
f94013b
@gvladika
Another one
82361a5
@gvladika
Add missing steps
b928f79
@gvladika
Merge branch 'erc20-based-bridge' into erc20-based-bridge-2
025ee91
@gvladika
Reuse buildRouterEncodedData function in test to avoid test duplication
5281ee4
@gvladika
Test getOutboundCalldata
54cb935
@gvladika
Test supportsInterface
0f3f56e
@gvladika
test encodeWithdrawal
fb97ab5
@gvladika
Test reverts in initializer
ef122bf
@gvladika
Encode native token fee to the end of the user encoded message
ae2517e
@gvladika
Merge branch 'erc20-based-bridge' into erc20-based-bridge-2
60f0340
@gvladika
Test calculateL2TokenAddress
8182569
yahgwai
yahgwai reviewed Aug 28, 2023
View reviewed changes
contracts/tokenbridge/arbitrum/L2AtomicTokenBridgeFactory.sol Outdated Show resolved Hide resolved
contracts/tokenbridge/arbitrum/L2AtomicTokenBridgeFactory.sol Outdated Show resolved Hide resolved
contracts/tokenbridge/arbitrum/L2AtomicTokenBridgeFactory.sol Outdated Show resolved Hide resolved
contracts/tokenbridge/ethereum/L1AtomicTokenBridgeCreator.sol Outdated Show resolved Hide resolved
contracts/tokenbridge/ethereum/L1AtomicTokenBridgeCreator.sol Outdated Show resolved Hide resolved
contracts/tokenbridge/ethereum/L1AtomicTokenBridgeCreator.sol Show resolved Hide resolved
contracts/tokenbridge/ethereum/L1AtomicTokenBridgeCreator.sol Show resolved Hide resolved
contracts/tokenbridge/ethereum/L1AtomicTokenBridgeCreator.sol Outdated Show resolved Hide resolved
contracts/tokenbridge/ethereum/L1AtomicTokenBridgeCreator.sol Outdated Show resolved Hide resolved
@gvladika
Revert with custom error if deployment already exists
9d8cc95
@gvladika
Extract proxy deployments to _deploySeedProxy
e773cc2
@gvladika
Add function descriptions
b157eb9
@gvladika
Extract L2 proxy address calculation
a93fef9
@gvladika
Merge branch 'token-bridge-factory' into erc20-based-bridge
2ebf605
@gvladika
Merge branch 'erc20-based-bridge' into fee-token-deployer
2d77950
@gvladika
Merge branch 'fee-token-deployer' into use-executor
1525d26
@gvladika
Update smart contracts and script to reflect latest rollup ownership …
2ecec9a 
…design

Rollup and rollup proxy admin are owned by L1 upgrade executor, on which the
rollupOwner has EXECUTOR role. When creating token bridge for rollup, now
rollupOwner has to be provided as well. L1 creator will check that rollupOwner
has EXECUTOR role on the upgrade executor (which is fetched via .owner()).
Aliased L1 upgrade executor and rollup owner are then made executors on L2
upgrade executor.
@gvladika gvladika requested a review from yahgwai September 1, 2023 06:38
yahgwai
yahgwai approved these changes Sep 6, 2023
View reviewed changes
Copy link
Contributor

@yahgwai yahgwai left a comment

Choose a reason for hiding this comment

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

Just had one more request for comments on the computeAddress func, apart from that it lgtm

gvladika and others added 16 commits September 7, 2023 09:35
@gvladika
Add docs for computeAddress function
8aca119
@gvladika
Merge branch 'token-bridge-factory' into erc20-based-bridge
07234a0
@gvladika
Merge pull request #38 from OffchainLabs/use-executor
09c9715 
Add UpgradeExecutor to token bridge creation flow
@gvladika
Add docs for computeAddress function
1f2121f
@gvladika
Verify retyrable sender was not frontrun
6cb2060
@gvladika
Use chainId in salt for L2 contracts.
7606ab6
@gvladika
Merge pull request #41 from OffchainLabs/use-chain-id
ee8c5aa 
Derive token bridge addresses on child chain from chain ID
@gvladika
Merge branch 'erc20-based-bridge' into fee-token-deployer
b408bcf
@gvladika
Merge pull request #37 from OffchainLabs/fee-token-deployer
ce11f80 
Add support to do single-TX deployment of token bridge for fee token based Orbit chains
@gvladika
Verify all contracts after deployment
9503d3c
@tsite
setGateways() in OrbitGatewayRouter should not be payable
e580b98 
This function uses the fee paying token instead of ETH for fees
@gvladika
Require there is ether sent in erc20 token bridge
82c5375
@gvladika
Make forceRegisterTokenToL2 in L1OrbitCustomGateway non payable
044d8d2
@gvladika
Merge pull request #44 from OffchainLabs/audit-updates
04aa5e6 
Make sure ether is not sent in ERC20 token bridge
@gvladika
Merge pull request #43 from tsite/erc20-based-bridge
95b2c40 
setGateways() in OrbitGatewayRouter should not be payable
@gvladika
Merge pull request #34 from OffchainLabs/erc20-based-bridge
c68b22b 
Add support for Orbit token bridge
@gvladika gvladika merged commit cf0be18 into solidity-0.8 Oct 9, 2023
4 of 5 checks passed
@gzeoneth gzeoneth mentioned this pull request Oct 11, 2023
Merged
@gzeoneth gzeoneth deleted the token-bridge-factory branch July 8, 2024 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yahgwai yahgwai yahgwai approved these changes

@hkalodner hkalodner Awaiting requested review from hkalodner

@GreatSoshiant GreatSoshiant Awaiting requested review from GreatSoshiant

@gzeoneth gzeoneth Awaiting requested review from gzeoneth

Assignees
No one assigned
Labels
cla-signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@gvladika @yahgwai @gzeoneth @tsite