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

ERC 721 tokens bridge integration #1348

Merged
merged 10 commits into from
Apr 23, 2023
Merged

Conversation

Stefan-Ethernal
Copy link
Collaborator

@Stefan-Ethernal Stefan-Ethernal commented Mar 31, 2023

Description

This PR integrates predicate contracts for bridging ERC 721 tokens from a root to a child chain (and vice versa).

Changes include

  • Bugfix (non-breaking change that solves an issue)
  • Hotfix (change that solves an urgent issue, and requires immediate attention)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (change that is not backwards-compatible and/or changes current functionality)

Breaking changes

PR deploys a set of ERC 1155 bridge contracts to the genesis.

Checklist

  • I have assigned this PR to myself
  • I have added at least 1 reviewer
  • I have added the relevant labels
  • I have updated the official documentation
  • I have added sufficient documentation in code

Testing

  • I have tested this code with the official test suite
  • I have tested this code manually

Manual tests

Please complete this section if you ran manual tests for this functionality, otherwise delete it

Documentation update

Please link the documentation update PR in this section if it's present, otherwise delete it

Additional comments

Please post additional comments in this section if you have them, otherwise delete it

@Stefan-Ethernal Stefan-Ethernal force-pushed the EVM-538-erc-721-integration branch 2 times, most recently from 087d09d to 75dc621 Compare March 31, 2023 09:55
@Stefan-Ethernal Stefan-Ethernal self-assigned this Mar 31, 2023
@Stefan-Ethernal Stefan-Ethernal added feature New update to Polygon Edge breaking change Functionality that contains breaking changes labels Mar 31, 2023
@Stefan-Ethernal Stefan-Ethernal changed the title Integrate ERC 721 ERC 721 tokens bridge integration Mar 31, 2023
@Stefan-Ethernal Stefan-Ethernal requested a review from a team April 3, 2023 06:40
@Stefan-Ethernal
Copy link
Collaborator Author

Stefan-Ethernal commented Apr 3, 2023

TestE2E_Bridge_DepositAndWithdrawERC1155 fails at the moment, because we don't have 0xPolygon/edge-contracts#204 fixes merged yet.

@Stefan-Ethernal Stefan-Ethernal marked this pull request as ready for review April 3, 2023 07:10
Copy link
Collaborator

@goran-ethernal goran-ethernal left a comment

Choose a reason for hiding this comment

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

LGTM

Suggestion for some future PRs, since we have similar tests for Deposit/Withdraw workflow for different tokens, we can maybe extract some stuff to separate functions (or merge these tests into one - as @Stefan-Ethernal mentioned, this is already being done, through a PR that will be created in the near future). The same goes to the deposit/withdraw commands, maybe we can extract some parts of code to some helper functions. Seems doable to me. Might be worth analyzing it further, so we don't have much repeating code.

@Nemanja0x Nemanja0x self-requested a review April 4, 2023 07:29
Copy link
Contributor

@Nemanja0x Nemanja0x left a comment

Choose a reason for hiding this comment

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

Agree about constants with Victor

Base automatically changed from EVM-539-erc-1155-integration to develop April 22, 2023 20:27
@Stefan-Ethernal Stefan-Ethernal merged commit 989978d into develop Apr 23, 2023
@Stefan-Ethernal Stefan-Ethernal deleted the EVM-538-erc-721-integration branch April 23, 2023 14:28
@github-actions github-actions bot locked and limited conversation to collaborators Apr 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
breaking change Functionality that contains breaking changes feature New update to Polygon Edge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants