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

NFT Lock Mechanism #76

Merged
merged 21 commits into from
May 19, 2022
Merged

NFT Lock Mechanism #76

merged 21 commits into from
May 19, 2022

Commits on Mar 1, 2022

  1. Add the Uniques pallet temporarily for dev purposes

    @HashWarlock
    HashWarlock committed Mar 1, 2022
    Configuration menu
    Copy the full SHA
    935ba04 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2022

  1. Create the dependency injection trait Locker and default check_should… 

    …_lock function to false
    @HashWarlock
    HashWarlock committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    644475b View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2022

  1. Implement Locker trait in RMRK core pallet and add lock logic to down… 

    …stream RMRK market pallet whenever a list, unlist, and do_buy are executed
    @HashWarlock
    HashWarlock committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    8a2cb9c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/nft-lock-logic

    @HashWarlock
    HashWarlock authored Mar 11, 2022
    Configuration menu
    Copy the full SHA
    cc03548 View commit details
    Browse the repository at this point in the history

  3. Fix merge errors and update cargo.toml file dependencies

    @HashWarlock
    HashWarlock committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    ba1f9dd View commit details
    Browse the repository at this point in the history

  4. Add check_should_lock function to do_equip and check for both collect… 

    …ion id and nft id of item and equipper. Cargo fmt
    @HashWarlock
    HashWarlock committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    6fc947a View commit details
    Browse the repository at this point in the history

  5. Add Locker trait to mock for equip pallet

    @HashWarlock
    HashWarlock committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    f208429 View commit details
    Browse the repository at this point in the history

  6. Add a test to directly call Uniques do_transfer function

    @HashWarlock
    HashWarlock committed Mar 11, 2022
    Configuration menu
    Copy the full SHA
    bf8279f View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2022

  1. Temporarily use substrate branch with Uniques locker trait implementa… 

    …tion that branches off stable build polkadot-v0.19.17. Made small changes Cargo.toml files
    @HashWarlock
    HashWarlock committed Mar 13, 2022
    Configuration menu
    Copy the full SHA
    28f7890 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2022

  1. Updates to change impl function of Locker to is_locked and correct so… 

    …me documentation
    @HashWarlock
    HashWarlock committed Mar 14, 2022
    Configuration menu
    Copy the full SHA
    dfe3ca1 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2022

  1. Updated functions to use Locker trait from frame_support::traits

    @HashWarlock
    HashWarlock committed Mar 16, 2022
    Configuration menu
    Copy the full SHA
    ad3f45f View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2022

  1. Merge branch 'main' into feat/nft-lock-logic

    @HashWarlock
    HashWarlock authored Mar 17, 2022
    Configuration menu
    Copy the full SHA
    59e4e0c View commit details
    Browse the repository at this point in the history

  2. Update files using wrong Locker trait

    @HashWarlock
    HashWarlock committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    d312c69 View commit details
    Browse the repository at this point in the history

  3. Update Cargo file

    @HashWarlock
    HashWarlock committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    62a5e94 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2022

  1. Merge branch 'main' into feat/nft-lock-logic

    @HashWarlock
    HashWarlock authored Mar 18, 2022
    Configuration menu
    Copy the full SHA
    3d0aac2 View commit details
    Browse the repository at this point in the history

  2. Update to functions and run cargo fmt for formatting

    @HashWarlock
    HashWarlock committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    2238e68 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2022

  1. Moved Locker trait to tokens trait folder

    @HashWarlock
    HashWarlock committed Mar 23, 2022
    Configuration menu
    Copy the full SHA
    01de754 View commit details
    Browse the repository at this point in the history

  2. Update Cargo with latest

    @HashWarlock
    HashWarlock committed Mar 23, 2022
    Configuration menu
    Copy the full SHA
    fc73928 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2022

  1. Update base before updating cargo

    @HashWarlock
    HashWarlock committed May 5, 2022
    Configuration menu
    Copy the full SHA
    668b178 View commit details
    Browse the repository at this point in the history

  2. Merge to update branch

    @HashWarlock
    HashWarlock authored May 5, 2022
    Configuration menu
    Copy the full SHA
    053d87b View commit details
    Browse the repository at this point in the history

Commits on May 18, 2022

  1. Update to polkadot-v0.9.22 along with code dependencies and tests fro… 

    …m uniques changes.
    @HashWarlock
    HashWarlock committed May 18, 2022
    Configuration menu
    Copy the full SHA
    f5155fc View commit details
    Browse the repository at this point in the history