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

Add support for ERC1155 Assets #453

Merged
merged 3 commits into from Oct 19, 2019

Conversation

@fabioberger
Copy link
Contributor

fabioberger commented Oct 17, 2019

Fixes: #449

Adds support for validating, storing, watching and sharing orders involving ERC1155 assets.

@fabioberger fabioberger requested a review from albrow Oct 17, 2019
@@ -7,7 +7,7 @@ jobs:
- image: circleci/golang:1.12.9-browsers
- image: 0xorg/ganache-cli:latest
environment:
VERSION: 4.3.0
VERSION: 4.3.3

This comment has been minimized.

Copy link
@fabioberger

fabioberger Oct 17, 2019

Author Contributor

The V2 & V3 Ganache snapshots did not have ERC1155 Mintable tokens deployed on them so I had to add it.

@albrow
albrow approved these changes Oct 18, 2019
Copy link
Member

albrow left a comment

Looks good! Just left one question.

zeroex/orderwatch/order_watcher.go Show resolved Hide resolved
Copy link
Member

albrow left a comment

Almost forgot. We need to also add erc1155Proxy to the ContractAddresses type in browser/ts/index.ts.

@fabioberger fabioberger force-pushed the development branch from 11e0fa4 to cdece2c Oct 18, 2019
@fabioberger fabioberger changed the base branch from development to 0xV3 Oct 18, 2019
@fabioberger fabioberger changed the base branch from 0xV3 to development Oct 18, 2019
@fabioberger fabioberger force-pushed the feauture/erc1155Support branch from 308d0aa to d3f282e Oct 18, 2019
@albrow
albrow approved these changes Oct 18, 2019
@fabioberger fabioberger merged commit 03ccf3b into development Oct 19, 2019
1 check passed
1 check passed
ci/circleci: build Your tests passed on CircleCI!
Details
@fabioberger fabioberger deleted the feauture/erc1155Support branch Oct 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.