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 1155 tokens bridge integration #1332

Merged
merged 17 commits into from
Apr 22, 2023

Conversation

Stefan-Ethernal
Copy link
Collaborator

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

Description

This PR integrates predicate contracts for bridging ERC 1155 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

Additional comments

PR is dependent upon 0xPolygon/edge-contracts#204.

@Stefan-Ethernal Stefan-Ethernal force-pushed the EVM-539-erc-1155-integration branch 2 times, most recently from 09f0c86 to 432028a Compare March 24, 2023 10:23
@Stefan-Ethernal Stefan-Ethernal added the feature New update to Polygon Edge label Mar 24, 2023
@Stefan-Ethernal Stefan-Ethernal self-assigned this Mar 24, 2023
@Stefan-Ethernal Stefan-Ethernal force-pushed the EVM-539-erc-1155-integration branch 5 times, most recently from 16b143a to fe1e933 Compare March 25, 2023 05:22
@Stefan-Ethernal Stefan-Ethernal force-pushed the EVM-539-erc-1155-integration branch 2 times, most recently from f1a5fef to 906325c Compare March 29, 2023 10:42
@Stefan-Ethernal Stefan-Ethernal force-pushed the EVM-539-erc-1155-integration branch 2 times, most recently from 70b4d48 to 01dc081 Compare March 29, 2023 12:45
@Stefan-Ethernal Stefan-Ethernal added the breaking change Functionality that contains breaking changes label Mar 31, 2023
@Stefan-Ethernal Stefan-Ethernal marked this pull request as ready for review March 31, 2023 15:11
@Stefan-Ethernal
Copy link
Collaborator Author

Stefan-Ethernal commented Apr 4, 2023

I'm wondering if it'd be possible to merge all commands for ERC-721 and ERC-1155?

We could probably do something, although the most problematic part would be exposing extra flags to the commands (e.g. exposing amounts flag for ERC-721 or token ids for ERC-20, though we could validate it). Not sure if is it possible to register a flag "dynamically/conditionally", namely only after we tested the value of some other flag.

However, maybe do it as a separate PR, when all these are in place? WDYT?

Base automatically changed from EVM-537-deploy-contracts to develop April 4, 2023 11:26
@Stefan-Ethernal Stefan-Ethernal merged commit b2b7c15 into develop Apr 22, 2023
@Stefan-Ethernal Stefan-Ethernal deleted the EVM-539-erc-1155-integration branch April 22, 2023 20:27
@github-actions github-actions bot locked and limited conversation to collaborators Apr 22, 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.

None yet

5 participants