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

BridgePool Factory #280

Merged
merged 97 commits into from
Nov 11, 2022
Merged

BridgePool Factory #280

merged 97 commits into from
Nov 11, 2022

Conversation

gusjavaz
Copy link
Contributor

BridgePool contracts for deploying instances

Gustavo Vázquez Amado and others added 30 commits July 5, 2022 15:19
Fixed tests for new BridgePool architecture
c1a868a
Merge branch 'main' of https://github.com/alicenet/alicenet into brid…
59d4011 
…ge-pool
Added multiple version management
d9284f2
Fixed BPFactory tests
e1c388d
Fixed SWAP error
5292843
Added control for unexistent implementation versions
3893476
Fixed BridgePool DespositNotifier tests
e61f612
Fixed lint warnings
6b73a65
Merge branch 'main' of https://github.com/alicenet/alicenet into brid…
9c7d009 
…ge-pool
Added more controls to BridgePoolFactory
98ba772
@z-j-lin
renamed bridge factory
7fdf98c
@z-j-lin
fixed bridge router
45adfa4
Added support for ERC721 bridging
957d244 
Added correspondent tests
Set initializers to onlyBridgePoolFactory
Rename to BridgePool implementations LocalERC20BridgePool y LocalERC721BridgePool
Remove target token from bridge deployment functions
Add BP factory tests
@z-j-lin
Merge remote-tracking branch 'gustavo/bridge-pool' into bridge-pool
13eda0b
@z-j-lin
updated payAndDeposit
13dc8e0
@z-j-lin
added static bridge pool address calculation to deterministic address
de80dc5
@z-j-lin
updated btoken and immutable auth
f3ec8f1
@z-j-lin
update calldata for routeDeposit
454c2fe
@gusjavaz
Moved deposit function to BToken contract
603c7f0
@gusjavaz
Fixed all tests according to new design (deposit in BToken)
c5f79e7
@gusjavaz
Fixed tests for ERC20
61d65e9
@gusjavaz
Fixed one failing ERC20 test
6193f5e
@gusjavaz
Fixed lint errors
f8db4e9
Clean up and refactoring
37907b2
Clean up and refactoring
f804a66
Clean up and refactoring
2da1220
Clean up code for PR
2361da4
Merge branch 'main' into bridge-pool
b801806
Add merged files
d18df69
Added two new tests
2eb891e
Cr0wn-Gh0ul
Cr0wn-Gh0ul requested changes Oct 14, 2022
View reviewed changes
Copy link
Contributor

@Cr0wn-Gh0ul Cr0wn-Gh0ul left a comment

Choose a reason for hiding this comment

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

It appears there may have been some mix up commits in this PR.

bridge/contracts/libraries/factory/BridgePoolFactoryBase.sol Outdated Show resolved Hide resolved
bridge/contracts/utils/BridgePoolAddressUtil.sol Show resolved Hide resolved
@Cr0wn-Gh0ul Cr0wn-Gh0ul marked this pull request as draft October 14, 2022 14:47
@z-j-lin z-j-lin marked this pull request as ready for review November 8, 2022 16:11
@z-j-lin z-j-lin linked an issue Nov 8, 2022 that may be closed by this pull request
Bridge Pool Deployment Via Factory #424
Closed
Cr0wn-Gh0ul
Cr0wn-Gh0ul requested changes Nov 8, 2022
View reviewed changes
Copy link
Contributor

@Cr0wn-Gh0ul Cr0wn-Gh0ul left a comment

Choose a reason for hiding this comment

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

See comments and suggestions.

bridge/contracts/libraries/factory/BridgePoolFactoryBase.sol Show resolved Hide resolved
bridge/contracts/BridgePoolFactory.sol Outdated Show resolved Hide resolved
bridge/contracts/utils/BridgePoolAddressUtil.sol Outdated Show resolved Hide resolved
bridge/docs/MP-268:BridgePoolDeployment.puml Outdated Show resolved Hide resolved
ghost
ghost approved these changes Nov 10, 2022
View reviewed changes
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Re-approved for go-reviewers

Cr0wn-Gh0ul
Cr0wn-Gh0ul approved these changes Nov 11, 2022
View reviewed changes
Copy link
Contributor

@Cr0wn-Gh0ul Cr0wn-Gh0ul left a comment

Choose a reason for hiding this comment

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

LGTM

@Cr0wn-Gh0ul Cr0wn-Gh0ul merged commit 24d95f4 into alicenet:main Nov 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@z-j-lin z-j-lin z-j-lin left review comments

@Cr0wn-Gh0ul Cr0wn-Gh0ul Cr0wn-Gh0ul approved these changes

Assignees
No one assigned
Labels
go Pull requests that update Go code javascript Pull requests that update Javascript code solidity
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Bridge Pool Deployment Via Factory
3 participants
@gusjavaz @Cr0wn-Gh0ul @z-j-lin