This repository has been archived by the owner on Jul 9, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 465
erc1155 minimal implementation #1657
Merged
hysz
merged 33 commits into
development
from
feature/contracts/erc1155MinimalImplementation
Mar 12, 2019
Merged
erc1155 minimal implementation #1657
hysz
merged 33 commits into
development
from
feature/contracts/erc1155MinimalImplementation
Mar 12, 2019
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hysz
changed the title
[WIP] erc1155 minimal implementation
erc1155 minimal implementation
Feb 27, 2019
hysz
force-pushed
the
feature/contracts/erc1155MinimalImplementation
branch
2 times, most recently
from
February 28, 2019 21:56
9824e53
to
d286556
Compare
hysz
force-pushed
the
feature/contracts/erc1155MinimalImplementation
branch
from
March 5, 2019 19:37
82cafd6
to
6fe5fed
Compare
dekz
approved these changes
Mar 5, 2019
|
||
// perform transfer | ||
if (isNonFungible(id)) { | ||
require(nfOwners[id] == from); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we require the value is 1 here?
require(
value == 1,
"AMOUNT_EQUAL_TO_ONE_REQUIRED"
);
nfOwners[id] = to; | ||
} else { | ||
balances[id][from] = safeSub(balances[id][from], value); | ||
balances[id][to] = safeAdd(value, balances[id][to]); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggested change
balances[id][to] = safeAdd(value, balances[id][to]); | |
balances[id][to] = safeAdd(balances[id][to], value); |
token: BigNumber, | ||
value: BigNumber, | ||
callbackData: string = '0x', | ||
delegatedSpender: string = '', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe set these to undefined/optional rather than empty string
hysz
force-pushed
the
feature/contracts/erc1155MinimalImplementation
branch
3 times, most recently
from
March 7, 2019 21:08
785f1c5
to
6fa806a
Compare
hysz
force-pushed
the
feature/contracts/erc1155MinimalImplementation
branch
from
March 7, 2019 22:38
272602e
to
9b5199e
Compare
…at once + more revert reasons
merklejerk
approved these changes
Mar 11, 2019
hysz
force-pushed
the
feature/contracts/erc1155MinimalImplementation
branch
from
March 12, 2019 01:25
9b5199e
to
9822792
Compare
abandeali1
approved these changes
Mar 12, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This was created for testing the ERC1155 proxy.
Testing instructions
Types of changes
Checklist:
[WIP]
if necessary.