Merge pull request #283 from galacticcouncil/feat/nft

refactor: NFT

.github/workflows/workflow.yml

@@ -299,12 +299,19 @@ jobs:
           name: basilisk_runtime.compact.compressed.wasm
           path: scripts/upgrade-runtime
       - uses: dawidd6/action-download-artifact@v2
-        name: Download basilisk binary from master
+        name: Download basilisk binary from master (legacy)
         with:
           workflow: tests.yml
           branch: master
           name: basilisk
           path: target/release
+      - uses: dawidd6/action-download-artifact@v2
+        name: Download basilisk binary from master
+        with:
+          workflow: workflow.yml
+          branch: master
+          name: basilisk
+          path: target/release
       - uses: robinraju/release-downloader@v1
         name: Download relay chain binary
         with:
@@ -361,4 +368,4 @@ jobs:
             ${{ env.VERSION_UPDATE }}
       - name: Evaluate result
         if: contains(env.VERSION_UPDATE, 'have not been updated')
-        run: exit 1
+        run: exit 1

Cargo.toml

@@ -67,6 +67,7 @@ pallet-transaction-payment = { git = "https://github.com/paritytech//substrate",
 pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" }
 pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" }
 pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" }
+pallet-uniques = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" }
 pallet-utility = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" }
 pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" }
 remote-externalities = { git = "https://github.com/paritytech//substrate", rev = "4aeb95f7f38fcd519e2628f32f79044a8fef99d5" }
@@ -200,4 +201,4 @@ pallet-price-oracle = { git = "https://github.com/galacticcouncil//warehouse", b
 pallet-relaychain-info = { git = "https://github.com/galacticcouncil//warehouse", branch = "polkadot-v0.9.16"}
 pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil//warehouse", branch = "polkadot-v0.9.16"}
 pallet-faucet= { git = "https://github.com/galacticcouncil//warehouse", branch = "polkadot-v0.9.16"}
-hydradx-traits = { git = "https://github.com/galacticcouncil//warehouse", branch = "polkadot-v0.9.16"}
+hydradx-traits = { git = "https://github.com/galacticcouncil//warehouse", branch = "polkadot-v0.9.16"}

integration-tests/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "runtime-integration-tests"
-version = "0.2.5"
+version = "0.2.6"
 authors = ["GalacticCouncil"]
 edition = "2021"
 homepage = "https://github.com/galacticcouncil/Basilisk-node"
@@ -43,7 +43,6 @@ pallet-authorship = { git = "https://github.com/paritytech/substrate", branch =
 
 # ORML dependencies
 orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "63b32194e7b9aff6a6350d2d4434525de4eec7c1", default-features = false }
-orml-nft = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "63b32194e7b9aff6a6350d2d4434525de4eec7c1", default-features = false }
 orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "63b32194e7b9aff6a6350d2d4434525de4eec7c1", default-features = false }
 orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "63b32194e7b9aff6a6350d2d4434525de4eec7c1", default-features = false }
 orml-vesting = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "63b32194e7b9aff6a6350d2d4434525de4eec7c1", default-features = false }
@@ -139,7 +138,6 @@ std = [
     "xcm-builder/std",
     "xcm-executor/std",
     "pallet-xcm/std",
-    "orml-nft/std",
     "parachain-info/std",
     "pallet-xyk/std",
     "pallet-duster/std",

node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "basilisk"
-version = "5.3.0"
+version = "5.3.1"
 description = "Basilisk node"
 authors = ["GalacticCouncil"]
 edition = "2021"

node/src/chain_spec.rs

@@ -20,7 +20,7 @@
 
 use basilisk_runtime::{
 	AccountId, AssetRegistryConfig, AuraId, Balance, BalancesConfig, CollatorSelectionConfig, CouncilConfig,
-	DusterConfig, ElectionsConfig, GenesisConfig, MultiTransactionPaymentConfig, OrmlNftConfig, ParachainInfoConfig,
+	DusterConfig, ElectionsConfig, GenesisConfig, MultiTransactionPaymentConfig, ParachainInfoConfig,
 	SessionConfig, Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig, TokensConfig, VestingConfig,
 	NATIVE_EXISTENTIAL_DEPOSIT, UNITS, WASM_BINARY,
 };
@@ -663,9 +663,6 @@ fn parachain_genesis(
 			],
 			phantom: Default::default(),
 		},
-		orml_nft: OrmlNftConfig {
-			tokens: Default::default(),
-		},
 		vesting: VestingConfig { vesting: vec![] },
 		parachain_info: ParachainInfoConfig { parachain_id },
 		aura_ext: Default::default(),
@@ -774,9 +771,6 @@ fn testnet_parachain_genesis(
 			phantom: Default::default(),
 		},
 		vesting: VestingConfig { vesting: vesting_list },
-		orml_nft: OrmlNftConfig {
-			tokens: Default::default(),
-		},
 		parachain_info: ParachainInfoConfig { parachain_id },
 		aura_ext: Default::default(),
 		duster: DusterConfig {

node/src/testing_chain_spec.rs

@@ -29,7 +29,7 @@ use sp_core::{crypto::UncheckedInto, sr25519, Pair, Public};
 use sp_runtime::traits::{IdentifyAccount, Verify};
 use testing_basilisk_runtime::{
 	AccountId, AssetRegistryConfig, AuraId, Balance, BalancesConfig, CollatorSelectionConfig, CouncilConfig,
-	DusterConfig, ElectionsConfig, FaucetConfig, GenesisConfig, MultiTransactionPaymentConfig, OrmlNftConfig,
+	DusterConfig, ElectionsConfig, FaucetConfig, GenesisConfig, MultiTransactionPaymentConfig,
 	ParachainInfoConfig, SessionConfig, Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig, TokensConfig,
 	VestingConfig, NATIVE_EXISTENTIAL_DEPOSIT, UNITS, WASM_BINARY,
 };
@@ -475,9 +475,6 @@ fn testnet_parachain_genesis(
 			phantom: Default::default(),
 		},
 		vesting: VestingConfig { vesting: vesting_list },
-		orml_nft: OrmlNftConfig {
-			tokens: Default::default(),
-		},
 		parachain_info: ParachainInfoConfig { parachain_id },
 		aura_ext: Default::default(),
 		duster: DusterConfig {

pallets/nft/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pallet-nft"
-version = "2.1.4"
+version = "2.2.0"
 description = "Simple NFT pallet for creating tokens"
 authors = ["GalacticCoucil"]
 edition = "2021"
@@ -17,11 +17,11 @@ scale-info = { version = "1.0", default-features = false, features = ["derive"]
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false, optional = true }
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false }
 frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false }
-orml-nft = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "63b32194e7b9aff6a6350d2d4434525de4eec7c1", default-features = false }
 orml-utilities = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "63b32194e7b9aff6a6350d2d4434525de4eec7c1", default-features = false }
 serde = { version = "1.0.111", optional = true, features = ["derive"] }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false }
 sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false }
+pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.16", default-features = false }
 
 # local dependency
 primitives = { default-features = false, path = "../../primitives" }
@@ -41,8 +41,9 @@ std = [
     "frame-system/std",
     "sp-std/std",
     "sp-runtime/std",
-    "orml-nft/std",
+    "pallet-uniques/std",
     "scale-info/std",
+
 ]
 runtime-benchmarks = [
     "frame-benchmarking",