Code

A small formatting fix.#2064

Code

Merged

eip-automerger merged 45 commits intoethereum:masterethereum/EIPs:masterfrom AC0DEM0NK3Y:masterAC0DEM0NK3Y/EIPs:masterCopy head branch name to clipboardMay 23, 2019

+1-1

Commits

Commits on May 3, 2019

• EDT-3069 Adding more clarity in transfer rules and other things, altered accept/reject logic to one mentioned in github discussion thread and compatibility section mentioning 1155+721 hybrid, plus …

  Show description for 49fbbde
  AC0DEM0NK3Y

  committed
  49fbbde

• Merge branch 'master' of https://github.com/ethereum/EIPs

  AC0DEM0NK3Y

  committed
  5a0fba2

Commits on May 4, 2019

• EDT-3069 id substitution example was not lowercase.

  AC0DEM0NK3Y

  committed
  73a3365

• Merge branch 'master' of https://github.com/ethereum/EIPs

  Show description for 0557c37
  AC0DEM0NK3Y

  committed
  0557c37

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.

  AC0DEM0NK3Y

  committed
  ed9f0d1

• EDT-3069 Some formatting changes to make it easier to digest/

  AC0DEM0NK3Y

  committed
  e331f58

• EDT-3069 More formatting.

  AC0DEM0NK3Y

  committed
  3e2a176

• Merge branch 'master' of https://github.com/ethereum/EIPs

  AC0DEM0NK3Y

  committed
  c9db596

• EDT-3069 Move impl specific functions rules to the rules section.

  AC0DEM0NK3Y

  committed
  3ba6d4f

• EDT-3069 Better wording on impl specific api rules.

  AC0DEM0NK3Y

  committed
  b3f5675

• Merge branch 'master' of https://github.com/ethereum/EIPs

  Show description for 774c0ae
  AC0DEM0NK3Y

  committed
  774c0ae

• EDT-3069 Added in rules for TransferSingle and TransferBatch events section and numbered the scenarios to be easily identifiable.

  AC0DEM0NK3Y

  committed
  f745443

Commits on May 8, 2019

• EDT-3069 EOA explanation.

  AC0DEM0NK3Y

  committed
  1f3a415

Commits on May 9, 2019

• EDT-3069 Updated text after feedback.

  AC0DEM0NK3Y

  committed
  54a4fa1

• EDT-3069 Another update.

  AC0DEM0NK3Y

  committed
  2f16e0f

• 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.

  AC0DEM0NK3Y

  committed
  cdc350b

• EDT-3069 Remove confusion on hook return vals and args.

  AC0DEM0NK3Y

  committed
  5083d1e

• Merge branch 'master' of https://github.com/ethereum/EIPs

  Show description for 5869a76
  AC0DEM0NK3Y

  committed
  5869a76

• EDT-3069 Drop the "DRAFT" text from linked standards, so when we go final and subsequently they do our text is not out of date. Users can see the current status of those other standards on the land…

  Show description for cbc7264
  AC0DEM0NK3Y

  committed
  cbc7264

• Merge branch 'master' of https://github.com/ethereum/EIPs

  AC0DEM0NK3Y

  committed
  d5446f9

• EDT-3069 Added safe and batch transferFrom rules to also be explicit there.

  AC0DEM0NK3Y

  committed
  c62f69b

• EDT-3069 Another small change to match the rules.

  AC0DEM0NK3Y

  committed
  dd6b5d7

Commits on May 10, 2019

• Changes to wording to clarify transfer rules.

  JamesTherien

  committed
  4f36207

• Clarification for the _data parameter

  JamesTherien

  committed
  b6f8829

• Clarify rules of breaking down into multiple onReceived callbacks

  JamesTherien

  committed
  67a42bc

• Merge pull request #1 from JamesTherien/master

  Show description for 8f0c356
  AC0DEM0NK3Y

  authored
  8f0c356

• EDT-3069 Alter the rejection logic back to normal for regular 115 operation, add in "isERC1155TokenReceiver" function and rules around hybrid standard implementations around it. Also made use of ``…

  Show description for 48cce31
  AC0DEM0NK3Y

  committed
  48cce31

• Merge branch 'master' of https://github.com/ethereum/EIPs

  Show description for f11b5c2
  AC0DEM0NK3Y

  committed
  f11b5c2

Commits on May 11, 2019

• EDT-3069 Small inconsistency and remove the ==<hex value> part from return text in case anyone is silly enough to copy-paste that and end up always returning true.

  AC0DEM0NK3Y

  committed
  cd86485

• Merge branch 'master' of https://github.com/ethereum/EIPs

  Show description for 206594c
  AC0DEM0NK3Y

  committed
  206594c

• EDT-3069 Add in ERC-165 interface identifier info for the ERC1155TokenReceiver interface.

  AC0DEM0NK3Y

  committed
  d7b07bd

Commits on May 13, 2019

• EDT-3069 Very minor change to text, remove odd grammar.

  AC0DEM0NK3Y

  committed
  97fa9de

• Merge branch 'master' of https://github.com/ethereum/EIPs

  Show description for 4f0378e
  AC0DEM0NK3Y

  committed
  4f0378e

• EDT-3069 Consistency change on the isERC1155TokenReceiver gas requirement.

  AC0DEM0NK3Y

  committed
  15a67ab

Commits on May 18, 2019

• EDT-3069 Added wighawag as an author, alter isERC1155Receiver interface to view instead of pure (to cover fallback versions) but leave recommended impl as pure, be clearer about having to pass the …

  Show description for 65052c6
  AC0DEM0NK3Y

  committed
  65052c6

• EDT-3069 Minor grammar and consistency changes on use of "for example" for example.

  AC0DEM0NK3Y

  committed
  8cb2756

• EDT-3069 Change the recommended isERC1155TokenReceiver function to use view mutability to match the interface as implementers will have to also if they include it. Rather surprisingly according to …

  Show description for a560f91
  AC0DEM0NK3Y

  committed
  a560f91

• Merge branch 'master' of https://github.com/ethereum/EIPs

  Show description for 2eedafb
  AC0DEM0NK3Y

  committed
  2eedafb

Commits on May 21, 2019

• EDT-3069 Small alteration to text by request.

  AC0DEM0NK3Y

  committed
  cc3e971

Commits on May 22, 2019

• EDT-3069 Minor text consistency change.

  AC0DEM0NK3Y

  committed
  c2a0f11

• EDT-3069 Fixed typo.

  AC0DEM0NK3Y

  committed
  4eaf2c7

• Merge branch 'master' of https://github.com/ethereum/EIPs

  Show description for fb0e643
  AC0DEM0NK3Y

  committed
  fb0e643

• EDT-3069 Spelling.

  AC0DEM0NK3Y

  committed
  cc3a9d9

• EDT-3069 Minor formatting change.

  AC0DEM0NK3Y

  committed
  caa8d27

• Merge branch 'master' of https://github.com/ethereum/EIPs

  Show description for d8b0d2f
  AC0DEM0NK3Y

  committed
  d8b0d2f