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.

Sign up for GitHub

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

Jump to bottom

ERC-1155 Example #800

Merged
merged 78 commits into from
Jul 8, 2021
Merged

ERC-1155 Example #800

merged 78 commits into from
Jul 8, 2021

Commits on Jun 1, 2021

  1. Add basic contract skeleton

    @HCastano
    HCastano committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    a71ab50 View commit details
    Browse the repository at this point in the history

  2. Add dummy ERC-1155 trait implementations

    @HCastano
    HCastano committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    8c5ab59 View commit details
    Browse the repository at this point in the history

  3. Implement balance_of method

    @HCastano
    HCastano committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    38d6fde View commit details
    Browse the repository at this point in the history

  4. First attempt at balance_of_batch implementation 

    I'm not sure if the output format is correct, need to read the docs
more closely
    @HCastano
    HCastano committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    12b8c1c View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2021

  1. Implement simple token transfer

    @HCastano
    HCastano committed Jun 2, 2021
    Configuration menu
    Copy the full SHA
    82adb2f View commit details
    Browse the repository at this point in the history

  2. Flatten balances BTreeMap

    @HCastano
    HCastano committed Jun 2, 2021
    Configuration menu
    Copy the full SHA
    344cef7 View commit details
    Browse the repository at this point in the history

  3. Clean up account usage in tests

    @HCastano
    HCastano committed Jun 2, 2021
    Configuration menu
    Copy the full SHA
    c5d4ff8 View commit details
    Browse the repository at this point in the history

  4. Implement approval mechanism

    @HCastano
    HCastano committed Jun 2, 2021
    Configuration menu
    Copy the full SHA
    10b5072 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2021

  1. Fix bug when sending tokens to an account with zero balance

    @HCastano
    HCastano committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    f8b73e0 View commit details
    Browse the repository at this point in the history

  2. Check approvals before sending tokens

    @HCastano
    HCastano committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    d2280f9 View commit details
    Browse the repository at this point in the history

  3. Suppress warnings

    @HCastano
    HCastano committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    9d4d649 View commit details
    Browse the repository at this point in the history

  4. Appease Clippy

    @HCastano
    HCastano committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    293b2cf View commit details
    Browse the repository at this point in the history

  5. Add crude support for token transfers to smart contracts

    @HCastano
    HCastano committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    df723e5 View commit details
    Browse the repository at this point in the history

  6. Simplify check for smart contract-ness

    @HCastano
    HCastano committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    040bcde View commit details
    Browse the repository at this point in the history

  7. Handle receiving tokens as a smart contract

    @HCastano
    HCastano committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    9d073d4 View commit details
    Browse the repository at this point in the history

  8. Implement safe_transfer_from method

    @HCastano
    HCastano committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    68f99f9 View commit details
    Browse the repository at this point in the history

  9. Only do approval and recipient checks during in batch transfers

    @HCastano
    HCastano committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    25e5b91 View commit details
    Browse the repository at this point in the history

  10. I was wrong about the compiler's cleverness...

    @HCastano
    HCastano committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    8640f19 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2021

  1. Add documentation about interface

    @HCastano
    HCastano committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    ded172c View commit details
    Browse the repository at this point in the history

  2. Make better use of some imports

    @HCastano
    HCastano committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    404e218 View commit details
    Browse the repository at this point in the history

  3. Disallow owners from approving themselves for token tranfers

    @HCastano
    HCastano committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    02e55b3 View commit details
    Browse the repository at this point in the history

  4. Allow creating and minting tokens

    @HCastano
    HCastano committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    bbe0369 View commit details
    Browse the repository at this point in the history

  5. Derive default for storage struct

    @HCastano
    HCastano committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    adb3889 View commit details
    Browse the repository at this point in the history

  6. Add note on on-chain panic

    @HCastano
    HCastano committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    e31103b View commit details
    Browse the repository at this point in the history

  7. Remove with_balances constructor 

    It wasn't ERC-1155 compliant (no transfer events emitted) and it
also leaked the internal structure of how balances were tracked.
    @HCastano
    HCastano committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    ae9df2d View commit details
    Browse the repository at this point in the history

  8. RustFmt with Nightly 

    Not sure I like some of the decisions though...
    @HCastano
    HCastano committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    94f8ec8 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2021

  1. Tag on_received messages with selectors

    @HCastano
    HCastano committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    9611c0a View commit details
    Browse the repository at this point in the history

  2. Add missing event

    @HCastano
    HCastano committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    ecf7c61 View commit details
    Browse the repository at this point in the history

  3. Index topics in events

    @HCastano
    HCastano committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    5e43bd6 View commit details
    Browse the repository at this point in the history

  4. Remove note on BTreeSet usage 

    Can't figure out how to get tests to compile with it.
    @HCastano
    HCastano committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    383ddaf View commit details
    Browse the repository at this point in the history

  5. Stop panicking on cross-contract call error 

    However, this is only because I have no feedback on why this call
is actually failing. This behaviour should be added back.
    @HCastano
    HCastano committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    a025c74 View commit details
    Browse the repository at this point in the history

  6. Nightly RustFmt

    @HCastano
    HCastano committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    7a9da11 View commit details
    Browse the repository at this point in the history

  7. Fix RustDoc links

    @HCastano
    HCastano committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    cbb66a8 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2021

  1. Merge branch 'master' into hc-erc-1155-example

    @HCastano
    HCastano committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    51272c6 View commit details
    Browse the repository at this point in the history

  2. Remove inline questions

    @HCastano
    HCastano committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    0a4dbd7 View commit details
    Browse the repository at this point in the history

  3. Remove unused data argument from create/mint

    @HCastano
    HCastano committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    d5d68ac View commit details
    Browse the repository at this point in the history

  4. Rename magic value contants

    @HCastano
    HCastano committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    0280226 View commit details
    Browse the repository at this point in the history

  5. Remove data argument from mint/create tests

    @HCastano
    HCastano committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    673a494 View commit details
    Browse the repository at this point in the history

  6. Use entry API when decreasing account balance

    @HCastano
    HCastano committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    db1c709 View commit details
    Browse the repository at this point in the history

  7. Extract approvals pairs into struct 

    This is better in terms of type safety and ease of use
    @HCastano
    HCastano committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    e95ddc0 View commit details
    Browse the repository at this point in the history

  8. Improve some of the panic messages

    @HCastano
    HCastano committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    a6fd7ce View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2021

  1. Cache calls to self.env().caller()

    @HCastano
    HCastano committed Jun 10, 2021
    Configuration menu
    Copy the full SHA
    58431b4 View commit details
    Browse the repository at this point in the history

  2. Allow TransferSingle events to contain Optional addresses 

    This slightly deviates from the spec which says we should use the `0x00`
address during certain operations, but this is more idiomatic Rust.
    @HCastano
    HCastano committed Jun 10, 2021
    Configuration menu
    Copy the full SHA
    748825a View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2021

  1. Add logging around calls to onERC1155Received

    @HCastano
    HCastano committed Jun 11, 2021
    Configuration menu
    Copy the full SHA
    f07f2cf View commit details
    Browse the repository at this point in the history

  2. Improve debug message when receiving cross-contract results

    @HCastano
    HCastano committed Jun 11, 2021
    Configuration menu
    Copy the full SHA
    57794c5 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2021

  1. Move warning lints to specific lines of code

    @HCastano
    HCastano committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    03dffb5 View commit details
    Browse the repository at this point in the history

  2. Format code

    @HCastano
    HCastano committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    3e79672 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2021

  1. Remove backticks from URLs 

    Co-authored-by: Michael Müller <michi@parity.io>
    @HCastano @cmichi
    HCastano and cmichi committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    439cbf7 View commit details
    Browse the repository at this point in the history

  2. Fix comment wording/typo

    @HCastano
    HCastano committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    871ec7c View commit details
    Browse the repository at this point in the history

  3. Add expected panic messages to tests

    @HCastano
    HCastano committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    c7115d0 View commit details
    Browse the repository at this point in the history

  4. Move imports related to x-contract calls closer to use site

    @HCastano
    HCastano committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    44dace6 View commit details
    Browse the repository at this point in the history

  5. Change selector bytes to hex for the humans

    @HCastano
    HCastano committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    097152e View commit details
    Browse the repository at this point in the history

  6. Remove incorrect comment about off-chain environment testing

    @HCastano
    HCastano committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    8085acd View commit details
    Browse the repository at this point in the history

  7. Add documentation for TokenId 

    This will make sure that it doesn't show up as `u128` in
the generated docs.
    @HCastano
    HCastano committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    cfc53b9 View commit details
    Browse the repository at this point in the history

  8. Nightly RustFmt

    @HCastano
    HCastano committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    6b817a0 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2021

  1. Uppercase selector bytes

    @HCastano
    HCastano committed Jun 18, 2021
    Configuration menu
    Copy the full SHA
    780f8be View commit details
    Browse the repository at this point in the history

  2. Don't repeat erc_1155 in Erc1155TokenReceiver methods

    @HCastano
    HCastano committed Jun 18, 2021
    Configuration menu
    Copy the full SHA
    da9bce7 View commit details
    Browse the repository at this point in the history

  3. Nightly RustFmt

    @HCastano
    HCastano committed Jun 18, 2021
    Configuration menu
    Copy the full SHA
    a84df8d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into hc-erc-1155-example

    @HCastano
    HCastano committed Jun 18, 2021
    Configuration menu
    Copy the full SHA
    5bdfbc9 View commit details
    Browse the repository at this point in the history

  5. Appease the spellchecker

    @HCastano
    HCastano committed Jun 18, 2021
    Configuration menu
    Copy the full SHA
    c66ec48 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2021

  1. Use Environment typedef

    @HCastano
    HCastano committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    094a549 View commit details
    Browse the repository at this point in the history

  2. Allow tests to run in stable and experimental off-chain envs

    @HCastano
    HCastano committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    412d20f View commit details
    Browse the repository at this point in the history

  3. Add explanation as to why we don't accept tokens

    @HCastano
    HCastano committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    312ec42 View commit details
    Browse the repository at this point in the history

  4. Return Result when minting tokens

    @HCastano
    HCastano committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    b8a0b1b View commit details
    Browse the repository at this point in the history

  5. Allow (most) errors to be handled gracefully by caller

    @HCastano
    HCastano committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    d6ca820 View commit details
    Browse the repository at this point in the history

  6. Nightly RustFmt

    @HCastano
    HCastano committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    e0e3192 View commit details
    Browse the repository at this point in the history

  7. Add shorthand zero-address to allowed spelling list

    @HCastano
    HCastano committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    fe7e8ba View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2021

  1. Run tests with --features ink-experimental-engine in CI

    @HCastano
    HCastano committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    1f9cdcf View commit details
    Browse the repository at this point in the history

  2. Perform batch balance checks before trying to transfer tokens

    @HCastano
    HCastano committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    0b4b1a2 View commit details
    Browse the repository at this point in the history

  3. Move smart contract transfer checks to their own helper function

    @HCastano
    HCastano committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    c47a37b View commit details
    Browse the repository at this point in the history

  4. Appease Clippy

    @HCastano
    HCastano committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    8a20cfd View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2021

  1. Make ensure macro definition more explicit 

    Co-authored-by: Robin Freyler <robin.freyler@gmail.com>
    @HCastano @Robbepop
    HCastano and Robbepop committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    9cfa92f View commit details
    Browse the repository at this point in the history

  2. Iterate over values instead of references 

    Co-authored-by: Robin Freyler <robin.freyler@gmail.com>
    @HCastano @Robbepop
    HCastano and Robbepop committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    f61184a View commit details
    Browse the repository at this point in the history

  3. Iterate over references again

    @HCastano
    HCastano committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    1d72c26 View commit details
    Browse the repository at this point in the history

  4. Return a value from on_batch_received

    @HCastano
    HCastano committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    9bfaa57 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2021

  1. Merge branch 'master' into hc-erc-1155-example

    @HCastano
    HCastano committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    314c4c7 View commit details
    Browse the repository at this point in the history

  2. Don't collect into intermediate Vec

    @HCastano
    HCastano committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    32a6375 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2021

  1. Wrap 0x00 in code blocks 

    This way the spellchecker will ignore it and we
can avoid adding it to our dictionary.
    @HCastano
    HCastano committed Jul 5, 2021
    Configuration menu
    Copy the full SHA
    2bc2490 View commit details
    Browse the repository at this point in the history