Skip to content
This repository has been archived by the owner on Jul 9, 2021. It is now read-only.

[WIP] ERC1155 Asset Proxy #1632

Closed
wants to merge 28 commits into from
Closed

[WIP] ERC1155 Asset Proxy #1632

wants to merge 28 commits into from

Conversation

hysz
Copy link
Contributor

@hysz hysz commented Feb 21, 2019

Description

Testing instructions

Types of changes

Checklist:

  • Prefix PR title with [WIP] if necessary.
  • Add tests to cover changes as needed.
  • Update documentation as needed.
  • Add new entries to the relevant CHANGELOG.jsons.

@hysz hysz force-pushed the feature/contracts/erc1155ProxyReloaded branch from 13b695f to 5dec76e Compare February 26, 2019 01:51
hysz added 26 commits February 26, 2019 17:20
@hysz
ERC1155 proxy implementation (untested)
7b0aca7
@hysz
Duplicated package: ERC721 -> ERC1155
b582cd2
@hysz
Solidity ERC1155 contracts compile (untested)
886174c
@hysz
Added generated-wrappers and generated-artifacts to .gitignore for er…
d9d099c 
…c1155
@hysz
moving towards getting erc1155 contracts cmpiled
0b79405
@hysz
Replaced hacky erc1155 impl with mock impl recommended by EIP1155
4344ed7
@hysz
Working batchTransferFrom for fungible erc-1155 token
6f84093
@hysz
Partially implemented ERC1155 test wrapper, which deploys proxies & m…
cba6e64 
…ints fungible tokens.
@hysz
should set allowances for erc1155
496dd6a
@hysz
Encodes erc1155 asset data for first token in deployed test contract
c3b75e1
@hysz
Fixed bug in erc1155 proxy where it was not getting destination contr…
ecbf2f9 
…act address correctly
@hysz
working test for erc1155!
402a329
@hysz
Fixed bug in erc1155 proxy where it was off by a few bytes calculatin…
f76efb0 
…g the tokenValuesOffset
@hysz
adding tests for ERC1155 asset proxy
666858b
@hysz
NFT support in erc1155 wrapper
b01c680
@hysz
merge
ed11577
@hysz
Fixed bug in ERC1155 reference implementation - balanceOfBatch
40be077
@hysz
erc1155 receiver tests
2a7ffbe
@hysz
Minimizing
66477f1
@hysz
more simplification for erc1155
c06df0f
@hysz
Moved Address into utils and made SafeMath a library
ce4113a
@hysz
Split erc1155 into mintable
e67537a
@hysz
Trying to get erc1155 tests working, but there seems to be an issue w…
00430b4 
…ith reverting chain state
@hysz
Use SafeMath in ERC1155
2a00352
@hysz
batchTxFromTests
87e5292
@hysz
safeTransferFrom tests for erc1155
95437ed
@hysz hysz force-pushed the feature/contracts/erc1155ProxyReloaded branch from 5dec76e to f0528b5 Compare February 27, 2019 17:53
@hysz
Copy link
Contributor Author

hysz commented Feb 28, 2019

Superseded by #1661.

@hysz hysz closed this Feb 28, 2019
@hysz hysz deleted the feature/contracts/erc1155ProxyReloaded branch March 16, 2019 04:35
This was referenced Aug 2, 2022
Closed
Closed
@adamlaska adamlaska mentioned this pull request Aug 3, 2022
Closed
@snyk-bot snyk-bot mentioned this pull request Aug 20, 2022
Closed
@snyk-bot snyk-bot mentioned this pull request Sep 24, 2022
Open
@adamlaska adamlaska mentioned this pull request Mar 10, 2023
Open
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@fabioberger fabioberger Awaiting requested review from fabioberger

@LogvinovLeon LogvinovLeon Awaiting requested review from LogvinovLeon

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

Successfully merging this pull request may close these issues.
1 participant
@hysz