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

Pointers contracts: support for ERC1155 and CW1155 contracts #1755

Open
wants to merge 90 commits into
base: main
Choose a base branch
from
Open

Pointers contracts: support for ERC1155 and CW1155 contracts #1755

wants to merge 90 commits into from

Commits on May 24, 2024

  1. wip cw1155 pointer

    @dirtyshab
    dirtyshab committed May 24, 2024
    Configuration menu
    Copy the full SHA
    9eab721 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. cleanup todos

    @dirtyshab
    dirtyshab committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    33d8bfd View commit details
    Browse the repository at this point in the history

  2. sync events with current standard

    @dirtyshab
    dirtyshab committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    0061483 View commit details
    Browse the repository at this point in the history

  3. fix query BalanceOfBatch

    @dirtyshab
    dirtyshab committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    9f0d299 View commit details
    Browse the repository at this point in the history

  4. fix import

    @dirtyshab
    dirtyshab committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    45c654f View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2024

  1. Fix up cwerc1155 compiled files

    @dvli2007
    dvli2007 committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    0269627 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. Add 1155 requests into bindings

    @dvli2007
    dvli2007 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    4d706dd View commit details
    Browse the repository at this point in the history

  2. queries

    @mr-meat
    mr-meat committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    533bca6 View commit details
    Browse the repository at this point in the history

  3. follow same coding style

    @mr-meat
    mr-meat committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    792da46 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Add cwerc1155.wasm binary to /contracts

    @dvli2007
    dvli2007 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    6304c6d View commit details
    Browse the repository at this point in the history

  2. Add go code to support new pointer contract

    @dvli2007
    dvli2007 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    68df425 View commit details
    Browse the repository at this point in the history

  3. Fix typo

    @dvli2007
    dvli2007 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    3502209 View commit details
    Browse the repository at this point in the history

  4. Add updated protobuf files

    @dvli2007
    dvli2007 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    cca521c View commit details
    Browse the repository at this point in the history

  5. Fix up tests

    @dvli2007
    dvli2007 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    f7fa05d View commit details
    Browse the repository at this point in the history

  6. Merge pull request #5 from palletexchange/add-new-pointer 

    Add new pointer
    @dvli2007
    dvli2007 authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    2e6622e View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into cw1155

    @dvli2007
    dvli2007 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    aa22642 View commit details
    Browse the repository at this point in the history

  8. Deprecate pointer proposals

    @dvli2007
    dvli2007 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    ae6a095 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2024

  1. queries

    @mr-meat
    mr-meat committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    5082b6b View commit details
    Browse the repository at this point in the history

  2. follow same coding style

    @mr-meat
    mr-meat committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    cb2ba41 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. safetransfer functions, royalyinfo, set approval

    @mr-meat
    mr-meat committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    d260408 View commit details
    Browse the repository at this point in the history

  2. add in exe queries and royaltyinfo

    @mr-meat
    mr-meat committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    1e2ca09 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into cw1155

    @dvli2007
    dvli2007 committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    39978bb View commit details
    Browse the repository at this point in the history

  4. Merge branch 'cw1155' into davy/cw1155

    @dvli2007
    dvli2007 committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    a05cbac View commit details
    Browse the repository at this point in the history

  5. adding in transfer and approval tests

    @mr-meat
    mr-meat committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    1ee0e92 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. solc and abigen

    @mr-meat
    mr-meat committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    1d91ef5 View commit details
    Browse the repository at this point in the history

  2. clean up unused artifacts

    @mr-meat
    mr-meat committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    b117fb2 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Merge pull request #6 from palletexchange/erc1155 

    Erc1155
    @dvli2007
    dvli2007 authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    8b818a0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'cw1155' into davy/cw1155

    @dvli2007
    dvli2007 committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    ed38c98 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2024

  1. Add all go bindings

    @dvli2007
    dvli2007 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    68ed5a0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7 from palletexchange/davy/cw1155 

    Davy: CW1155
    @dvli2007
    dvli2007 authored Jun 30, 2024
    Configuration menu
    Copy the full SHA
    3989fc3 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. return unsupported for methods not supported in erc standard

    @dirtyshab
    dirtyshab committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    2cce20c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #9 from palletexchange/cw1155 

    update erc1155
    @scottirvine
    scottirvine authored Jul 1, 2024
    Configuration menu
    Copy the full SHA
    7b0668e View commit details
    Browse the repository at this point in the history

  3. fix query BalanceOfBatch response

    @dirtyshab
    dirtyshab committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    f5858a8 View commit details
    Browse the repository at this point in the history

  4. Add new test files

    @dvli2007
    dvli2007 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    5d0750c View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. fix Erc1155BalanceOfBatchResponse

    @dirtyshab
    dirtyshab committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    a00687b View commit details
    Browse the repository at this point in the history

  2. More testing

    @dvli2007
    dvli2007 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    18768c1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8 from palletexchange/cw1155-cleanup 

    cw1155 cleanup
    @dvli2007
    dvli2007 authored Jul 2, 2024
    Configuration menu
    Copy the full SHA
    b2b9a6c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #10 from palletexchange/davy/test-cw1155 

    Add new test files
    @dvli2007
    dvli2007 authored Jul 2, 2024
    Configuration menu
    Copy the full SHA
    ae52356 View commit details
    Browse the repository at this point in the history

  5. Update cwerc1155.wasm

    @dvli2007
    dvli2007 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    327d5fd View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. More tests

    @dvli2007
    dvli2007 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    6736609 View commit details
    Browse the repository at this point in the history

  2. return true/false instead of erroring in query IsApprovedForAll

    @dirtyshab
    dirtyshab committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    95fc243 View commit details
    Browse the repository at this point in the history

  3. use correct response for query BalanceOfBatch

    @dirtyshab
    dirtyshab committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    219a3ca View commit details
    Browse the repository at this point in the history

  4. pass optional token id field to evm query TotalSupply

    @dirtyshab
    dirtyshab committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    134252a View commit details
    Browse the repository at this point in the history

  5. remove todos

    @dirtyshab
    dirtyshab committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    0c429e9 View commit details
    Browse the repository at this point in the history

  6. remove AllTokenInfo query

    @dirtyshab
    dirtyshab committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    f2b67b3 View commit details
    Browse the repository at this point in the history

  7. Fix balances query struct

    @dvli2007
    dvli2007 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    bcfc760 View commit details
    Browse the repository at this point in the history

  8. Update and rebuild CW1155 pointer

    @dvli2007
    dvli2007 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    eaa110d View commit details
    Browse the repository at this point in the history

  9. Add new cw1155 wasms

    @dvli2007
    dvli2007 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    d9b54b3 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #12 from palletexchange/cw1155 

    Cw1155
    @scottirvine
    scottirvine authored Jul 3, 2024
    Configuration menu
    Copy the full SHA
    4ae3e4b View commit details
    Browse the repository at this point in the history

  11. merge

    @mr-meat
    mr-meat committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    d91e3cb View commit details
    Browse the repository at this point in the history

  12. Update cwerc1155.wasm

    @dvli2007
    dvli2007 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    846f7c2 View commit details
    Browse the repository at this point in the history

  13. Fix up ERC1155 pointer tests

    @dvli2007
    dvli2007 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    61e2c27 View commit details
    Browse the repository at this point in the history

  14. balanceOfBatch

    @mr-meat
    mr-meat committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    2c537ed View commit details
    Browse the repository at this point in the history

  15. adding in expect calls

    @mr-meat
    mr-meat committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    2c0c498 View commit details
    Browse the repository at this point in the history

  16. remove unused import

    @mr-meat
    mr-meat committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    7c8bc90 View commit details
    Browse the repository at this point in the history

  17. Round of updates to cw1155 contracts

    @dvli2007
    dvli2007 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    60cbbce View commit details
    Browse the repository at this point in the history

  18. Update cw1155 pointer tests

    @dvli2007
    dvli2007 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    487ac30 View commit details
    Browse the repository at this point in the history

  19. Fix: missing ERC1155TransferPayload

    @dvli2007
    dvli2007 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    8c1e7a4 View commit details
    Browse the repository at this point in the history

  20. removing unnecessary return

    @mr-meat
    mr-meat committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    0d7a6cb View commit details
    Browse the repository at this point in the history

  21. Update binary

    @dvli2007
    dvli2007 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    8949624 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'erc1155' into cw1155-localtest

    @dvli2007
    dvli2007 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    b964fd0 View commit details
    Browse the repository at this point in the history

  23. Fix balance of batch

    @dvli2007
    dvli2007 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    db6af24 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'erc1155' into cw1155-localtest

    @dvli2007
    dvli2007 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    b3ac9de View commit details
    Browse the repository at this point in the history

  25. Merge pull request #14 from palletexchange/cw1155-localtest 

    Cw1155 localtest
    @dvli2007
    dvli2007 authored Jul 3, 2024
    Configuration menu
    Copy the full SHA
    bcb3b3c View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. Merge branch 'main' into cw1155

    @dvli2007
    dvli2007 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    a5a1c51 View commit details
    Browse the repository at this point in the history

  2. add minor checks

    @dvli2007
    dvli2007 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    e372e13 View commit details
    Browse the repository at this point in the history

  3. Update integration test with latest main updates

    @dvli2007
    dvli2007 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    f129599 View commit details
    Browse the repository at this point in the history

  4. Fix up erc721-payload and erc1155-payload cli commands

    @dvli2007
    dvli2007 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    adc2519 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Merge branch 'main' into pointers/erc1155-cw1155

    @dvli2007
    dvli2007 authored Jul 9, 2024
    Configuration menu
    Copy the full SHA
    2e2d938 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. Lint code

    @dvli2007
    dvli2007 committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    7541497 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into pointers/erc1155-cw1155

    @dvli2007
    dvli2007 authored Jul 12, 2024
    Configuration menu
    Copy the full SHA
    a73a8a1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'pointers/erc1155-cw1155' of github.com:palletexchange/s… 

    …ei-chain into pointers/erc1155-cw1155
    @dvli2007
    dvli2007 committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    4f6aa54 View commit details
    Browse the repository at this point in the history

  4. Update integration test with new pointer contract code id

    @dvli2007
    dvli2007 committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    d39f380 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Merge branch 'main' into pointers/erc1155-cw1155

    @dvli2007
    dvli2007 committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    532a24d View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Map CW1155 events to EVM

    @dvli2007
    dvli2007 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    0fdfbe5 View commit details
    Browse the repository at this point in the history

  2. updates from cw1155 base

    @dirtyshab
    dirtyshab committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    86d0dd3 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. update cw1155 base

    @dirtyshab
    dirtyshab committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    1caea56 View commit details
    Browse the repository at this point in the history

  2. Test events emissions for cw1155 events

    @dvli2007
    dvli2007 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    fd8ef0f View commit details
    Browse the repository at this point in the history

  3. Update wasm build for cwerc1155

    @dvli2007
    dvli2007 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    649e610 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'update-base-cw1155' into pointers/erc1155-cw1155

    @dvli2007
    dvli2007 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    4229eeb View commit details
    Browse the repository at this point in the history

  5. Fix integration test 1

    @dvli2007
    dvli2007 committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    66bc71c View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. update cw1155 cargo, add optimize script to cargo

    @dirtyshab
    dirtyshab committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    6478b68 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'update-base-cw1155' into pointers/erc1155-cw1155

    @dvli2007
    dvli2007 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    89b349b View commit details
    Browse the repository at this point in the history

  3. Update wasm builds

    @dvli2007
    dvli2007 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    21f7765 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into pointers/erc1155-cw1155

    @dvli2007
    dvli2007 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    01322e9 View commit details
    Browse the repository at this point in the history

  5. Add migrations for 1155s

    @dvli2007
    dvli2007 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    dbdcbc0 View commit details
    Browse the repository at this point in the history

  6. Code quality

    @dvli2007
    dvli2007 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    2c0db74 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into pointers/erc1155-cw1155

    @dvli2007
    dvli2007 authored Jul 25, 2024
    Configuration menu
    Copy the full SHA
    b9389cb View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. Remove unnecessary lines

    @dvli2007
    dvli2007 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    c004c54 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into pointers/erc1155-cw1155

    @dvli2007
    dvli2007 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    e9ffdc3 View commit details
    Browse the repository at this point in the history