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: UniversalSwapAndBridge deployments #731

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

feat: UniversalSwapAndBridge deployments #731

wants to merge 18 commits into from

Conversation

dohaki
Copy link
Contributor

@dohaki dohaki commented Nov 8, 2024

  • Adds missing 1inchUniversalSwapAndBridge deployments
  • Refines UniswapV3UniversalSwapAndBridge deploy script to use SwapRouter02 addresses
  • Add UniswapV3UniversalSwapAndBridge deployment where supported

Note: The only missing UniswapV3UniversalSwapAndBridge deployment is on zkSync due to a compilation error I am encountering. Will be pushed as a fast-follow

Closes ACX-3278

@linear Linear
Copy link

linear bot commented Nov 8, 2024

ACX-3278 Deploy `UniversalSwapAndBridge`per DEX/Aggregator per chain

@dohaki dohaki requested review from nicholaspai, bmzig and pxrl November 8, 2024 08:40
@pxrl pxrl mentioned this pull request Nov 13, 2024
Draft
pxrl
pxrl reviewed Nov 13, 2024
View reviewed changes
Copy link
Contributor

@pxrl pxrl left a comment

Choose a reason for hiding this comment

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

@dohaki Are we missing an update to deployments/deployments.json here?

@dohaki
Copy link
Contributor Author

dohaki commented Nov 14, 2024

@dohaki Are we missing an update to deployments/deployments.json here?

Yea true! But I will keep this PR open for now bc we need to redeploy anyways

bmzig added 11 commits November 18, 2024 10:35
@bmzig
feat: handle EIP-2612 and EIP-3009 in SwapAndBridge.sol
c96222f 
Signed-off-by: bennett <[email protected]>
@bmzig
define EIP-3009 types explicitly
7bdf27a 
Signed-off-by: bennett <[email protected]>
@bmzig
add deposit functions
f60db2f 
Signed-off-by: bennett <[email protected]>
@bmzig
factor out token transfers
5f7ee7b 
Signed-off-by: bennett <[email protected]>
@bmzig
remove _pullTokens
7d67ab5 
Signed-off-by: bennett <[email protected]>
@bmzig
fix incorrect error argument names
3322c1f 
Signed-off-by: bennett <[email protected]>
@bmzig
remove unnecessary checks
1726195 
Signed-off-by: bennett <[email protected]>
@bmzig
support ETH swaps
7df0c66 
Signed-off-by: bennett <[email protected]>
@bmzig
update comment
1fe4e6c 
Signed-off-by: bennett <[email protected]>
@bmzig
conditional permit
6f9370f 
Signed-off-by: bennett <[email protected]>
@bmzig
Revert "chore: add UniversalSwapAndBridge deployments"
a274e37 
This reverts commit 6bdbfd3.
@bmzig bmzig changed the base branch from master to bz/swapAndBridgeUpdate November 19, 2024 19:23
Base automatically changed from bz/swapAndBridgeUpdate to master November 21, 2024 14:43
@bmzig
Copy link
Contributor

bmzig commented Nov 22, 2024

All the contracts are deterministically deployed to 0x8EB5FF2e23FD7789e59989aDe055A398800E394e, except for zksync, which has no deterministic deployment, and is deployed to https://explorer.zksync.io/address/0x213f3F9E607c29AAeA88a91085ceb43c29222c17#contract.

@bmzig bmzig requested a review from pxrl November 22, 2024 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bmzig bmzig bmzig approved these changes

@nicholaspai nicholaspai Awaiting requested review from nicholaspai

@pxrl pxrl Awaiting requested review from pxrl

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

Successfully merging this pull request may close these issues.
3 participants
@dohaki @bmzig @pxrl