-
Notifications
You must be signed in to change notification settings - Fork 5.3k
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
A small formatting fix. #2064
A small formatting fix. #2064
Commits on May 3, 2019
-
EDT-3069 Adding more clarity in transfer rules and other things, alte…
…red accept/reject logic to one mentioned in github discussion thread and compatibility section mentioning 1155+721 hybrid, plus we are now at Solidity 0.5.8 and my email should match github.
Configuration menu - View commit details
-
Copy full SHA for 49fbbde - Browse repository at this point
Copy the full SHA 49fbbdeView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5a0fba2 - Browse repository at this point
Copy the full SHA 5a0fba2View commit details
Commits on May 4, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 73a3365 - Browse repository at this point
Copy the full SHA 73a3365View commit details -
Merge branch 'master' of https://github.com/ethereum/EIPs
# Conflicts: # EIPS/eip-1155.md
Configuration menu - View commit details
-
Copy full SHA for 0557c37 - Browse repository at this point
Copy the full SHA 0557c37View commit details
Commits on May 7, 2019
-
EDT-3069 Updated the "Safe Transfer Rules" section to match feedback …
…given in discussion thread. This introduces specific scenarios and rules to match.
Configuration menu - View commit details
-
Copy full SHA for ed9f0d1 - Browse repository at this point
Copy the full SHA ed9f0d1View commit details -
Configuration menu - View commit details
-
Copy full SHA for e331f58 - Browse repository at this point
Copy the full SHA e331f58View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3e2a176 - Browse repository at this point
Copy the full SHA 3e2a176View commit details -
Configuration menu - View commit details
-
Copy full SHA for c9db596 - Browse repository at this point
Copy the full SHA c9db596View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3ba6d4f - Browse repository at this point
Copy the full SHA 3ba6d4fView commit details -
Configuration menu - View commit details
-
Copy full SHA for b3f5675 - Browse repository at this point
Copy the full SHA b3f5675View commit details -
Merge branch 'master' of https://github.com/ethereum/EIPs
# Conflicts: # EIPS/eip-1155.md
Configuration menu - View commit details
-
Copy full SHA for 774c0ae - Browse repository at this point
Copy the full SHA 774c0aeView commit details -
EDT-3069 Added in rules for TransferSingle and TransferBatch events s…
…ection and numbered the scenarios to be easily identifiable.
Configuration menu - View commit details
-
Copy full SHA for f745443 - Browse repository at this point
Copy the full SHA f745443View commit details
Commits on May 8, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 1f3a415 - Browse repository at this point
Copy the full SHA 1f3a415View commit details
Commits on May 9, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 54a4fa1 - Browse repository at this point
Copy the full SHA 54a4fa1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2f16e0f - Browse repository at this point
Copy the full SHA 2f16e0fView commit details -
EDT- Minor wording changes, be consistent in how we name ERC numbers …
…in text and make sure 1155 json schema title matches the standard section.
Configuration menu - View commit details
-
Copy full SHA for cdc350b - Browse repository at this point
Copy the full SHA cdc350bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5083d1e - Browse repository at this point
Copy the full SHA 5083d1eView commit details -
Merge branch 'master' of https://github.com/ethereum/EIPs
# Conflicts: # EIPS/eip-1155.md
Configuration menu - View commit details
-
Copy full SHA for 5869a76 - Browse repository at this point
Copy the full SHA 5869a76View commit details -
EDT-3069 Drop the "DRAFT" text from linked standards, so when we go f…
…inal and subsequently they do our text is not out of date. Users can see the current status of those other standards on the landing page for them.
Configuration menu - View commit details
-
Copy full SHA for cbc7264 - Browse repository at this point
Copy the full SHA cbc7264View commit details -
Configuration menu - View commit details
-
Copy full SHA for d5446f9 - Browse repository at this point
Copy the full SHA d5446f9View commit details -
Configuration menu - View commit details
-
Copy full SHA for c62f69b - Browse repository at this point
Copy the full SHA c62f69bView commit details -
Configuration menu - View commit details
-
Copy full SHA for dd6b5d7 - Browse repository at this point
Copy the full SHA dd6b5d7View commit details
Commits on May 10, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 4f36207 - Browse repository at this point
Copy the full SHA 4f36207View commit details -
Configuration menu - View commit details
-
Copy full SHA for b6f8829 - Browse repository at this point
Copy the full SHA b6f8829View commit details -
Configuration menu - View commit details
-
Copy full SHA for 67a42bc - Browse repository at this point
Copy the full SHA 67a42bcView commit details -
Merge pull request #1 from JamesTherien/master
Pull James' edits in, some wording changes and clarifications.
Configuration menu - View commit details
-
Copy full SHA for 8f0c356 - Browse repository at this point
Copy the full SHA 8f0c356View commit details -
EDT-3069 Alter the rejection logic back to normal for regular 115 ope…
…ration, add in "isERC1155TokenReceiver" function and rules around hybrid standard implementations around it. Also made use of `` on types consistent.
Configuration menu - View commit details
-
Copy full SHA for 48cce31 - Browse repository at this point
Copy the full SHA 48cce31View commit details -
Merge branch 'master' of https://github.com/ethereum/EIPs
# Conflicts: # EIPS/eip-1155.md
Configuration menu - View commit details
-
Copy full SHA for f11b5c2 - Browse repository at this point
Copy the full SHA f11b5c2View commit details
Commits on May 11, 2019
-
EDT-3069 Small inconsistency and remove the ==<hex value> part from r…
…eturn text in case anyone is silly enough to copy-paste that and end up always returning true.
Configuration menu - View commit details
-
Copy full SHA for cd86485 - Browse repository at this point
Copy the full SHA cd86485View commit details -
Merge branch 'master' of https://github.com/ethereum/EIPs
# Conflicts: # EIPS/eip-1155.md
Configuration menu - View commit details
-
Copy full SHA for 206594c - Browse repository at this point
Copy the full SHA 206594cView commit details -
EDT-3069 Add in ERC-165 interface identifier info for the ERC1155Toke…
…nReceiver interface.
Configuration menu - View commit details
-
Copy full SHA for d7b07bd - Browse repository at this point
Copy the full SHA d7b07bdView commit details
Commits on May 13, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 97fa9de - Browse repository at this point
Copy the full SHA 97fa9deView commit details -
Merge branch 'master' of https://github.com/ethereum/EIPs
# Conflicts: # EIPS/eip-1155.md
Configuration menu - View commit details
-
Copy full SHA for 4f0378e - Browse repository at this point
Copy the full SHA 4f0378eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 15a67ab - Browse repository at this point
Copy the full SHA 15a67abView commit details
Commits on May 18, 2019
-
EDT-3069 Added wighawag as an author, alter isERC1155Receiver interfa…
…ce to view instead of pure (to cover fallback versions) but leave recommended impl as pure, be clearer about having to pass the _data arg to the hooks unaltered, make it so all events have to be emitted before any hooks are called so order is preserved.
Configuration menu - View commit details
-
Copy full SHA for 65052c6 - Browse repository at this point
Copy the full SHA 65052c6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8cb2756 - Browse repository at this point
Copy the full SHA 8cb2756View commit details -
EDT-3069 Change the recommended isERC1155TokenReceiver function to us…
…e view mutability to match the interface as implementers will have to also if they include it. Rather surprisingly according to remix the "view" version costs 282 gas vs 305 for the "pure" version too.
Configuration menu - View commit details
-
Copy full SHA for a560f91 - Browse repository at this point
Copy the full SHA a560f91View commit details -
Merge branch 'master' of https://github.com/ethereum/EIPs
# Conflicts: # EIPS/eip-1155.md
Configuration menu - View commit details
-
Copy full SHA for 2eedafb - Browse repository at this point
Copy the full SHA 2eedafbView commit details
Commits on May 21, 2019
-
Configuration menu - View commit details
-
Copy full SHA for cc3e971 - Browse repository at this point
Copy the full SHA cc3e971View commit details
Commits on May 22, 2019
-
Configuration menu - View commit details
-
Copy full SHA for c2a0f11 - Browse repository at this point
Copy the full SHA c2a0f11View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4eaf2c7 - Browse repository at this point
Copy the full SHA 4eaf2c7View commit details -
Merge branch 'master' of https://github.com/ethereum/EIPs
# Conflicts: # EIPS/eip-1155.md
Configuration menu - View commit details
-
Copy full SHA for fb0e643 - Browse repository at this point
Copy the full SHA fb0e643View commit details -
Configuration menu - View commit details
-
Copy full SHA for cc3a9d9 - Browse repository at this point
Copy the full SHA cc3a9d9View commit details -
Configuration menu - View commit details
-
Copy full SHA for caa8d27 - Browse repository at this point
Copy the full SHA caa8d27View commit details -
Merge branch 'master' of https://github.com/ethereum/EIPs
# Conflicts: # EIPS/eip-1155.md
Configuration menu - View commit details
-
Copy full SHA for d8b0d2f - Browse repository at this point
Copy the full SHA d8b0d2fView commit details