refactor: NFT

Cargo.toml

@@ -11,6 +11,7 @@ members = [
   'pallets/duster',
   'pallets/xyk',
   'pallets/exchange',
+  'pallets/uniques',
   'pallets/asset-registry',
   'integration-tests',
 ]
@@ -190,4 +191,4 @@ cumulus-primitives-parachain-inherent = { git = "/~https://github.com/paritytech//
 cumulus-primitives-timestamp = { git = "/~https://github.com/paritytech//cumulus", rev = "935bac869a72baef17e46d2ae1abc8c0c650cef5" }
 cumulus-primitives-utility = { git = "/~https://github.com/paritytech//cumulus", rev = "935bac869a72baef17e46d2ae1abc8c0c650cef5" }
 cumulus-test-relay-sproof-builder = { git = "/~https://github.com/paritytech//cumulus", rev = "935bac869a72baef17e46d2ae1abc8c0c650cef5" }
-parachain-info  = { git = "/~https://github.com/paritytech//cumulus", rev = "935bac869a72baef17e46d2ae1abc8c0c650cef5" }
+parachain-info  = { git = "/~https://github.com/paritytech//cumulus", rev = "935bac869a72baef17e46d2ae1abc8c0c650cef5" }

README.md

@@ -137,29 +137,6 @@ Then open settings screen -> developer and paste
       },
       "LookupSource":"AccountId",
       "Price":"Balance",
-      "ClassId":"u64",
-      "TokenId":"u64",
-      "ClassData":{
-        "is_pool":"bool"
-      },
-      "TokenData":{
-        "locked":"bool"
-      },
-      "ClassInfo":{
-        "metadata":"Vec<u8>",
-        "total_issuance":"TokenId",
-        "owner":"AccountId",
-        "data":"ClassData"
-      },
-      "TokenInfo":{
-        "metadata":"Vec<u8>",
-        "owner":"AccountId",
-        "data":"TokenData"
-      },
-      "ClassInfoOf":"ClassInfo",
-      "TokenInfoOf":"TokenInfo",
-      "ClassIdOf":"ClassId",
-      "TokenIdOf":"TokenId",
       "OrderedSet":"Vec<AssetId>",
       "VestingSchedule":{
         "start":"BlockNumber",
@@ -204,6 +181,32 @@ Then open settings screen -> developer and paste
         "symbol":"Vec<u8>",
         "decimals":"u8"
       },
+      "ClassId":"u32",
+      "InstanceId":"u32",
+      "NftClassIdOf":"u32",
+      "NftTokenIdOf":"u32",
+      "ClassType":{
+        "_enum":[
+          "Marketplace",
+          "PoolShare"
+        ]
+      },
+      "TokenInfo":{
+        "price":"Option<Balance>",
+        "offer":"Option<(AccountId,Balance,BlockNumber)>"
+      },
+      "TokenInfoOf":"TokenInfo",
+      "ClassInfo":{
+        "class_type":"ClassType",
+        "metadata":"Vec<u8>"
+      },
+      "ClassInfoOf":"ClassInfo",
+      "InstanceInfo":{
+        "author":"AccountId",
+        "royalty":"u8",
+        "metadata":"Vec<u8>"
+      },
+      "InstanceInfoOf":"InstanceInfo",
       "AssetInstance": "AssetInstanceV1",
       "MultiLocation": "MultiLocationV1",
       "AssetNativeLocation": "MultiLocation",

integration-tests/Cargo.toml

@@ -44,7 +44,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 = "ee37b76a7a8cf159e6c41851942758746318bb84", default-features = false }
-orml-nft = { git = "/~https://github.com/open-web3-stack/open-runtime-module-library", rev = "ee37b76a7a8cf159e6c41851942758746318bb84", default-features = false }
 orml-tokens = { git = "/~https://github.com/open-web3-stack/open-runtime-module-library", rev = "ee37b76a7a8cf159e6c41851942758746318bb84", default-features = false }
 orml-traits = { git = "/~https://github.com/open-web3-stack/open-runtime-module-library", rev = "ee37b76a7a8cf159e6c41851942758746318bb84", default-features = false }
 orml-vesting = { git = "/~https://github.com/open-web3-stack/open-runtime-module-library", rev = "ee37b76a7a8cf159e6c41851942758746318bb84", default-features = false }
@@ -140,7 +139,6 @@ std = [
     "xcm-builder/std",
     "xcm-executor/std",
     "pallet-xcm/std",
-    "orml-nft/std",
     "parachain-info/std",
     "pallet-xyk/std",
     "pallet-duster/std",

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,
 };
@@ -569,9 +569,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(),
@@ -675,9 +672,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,
 };
@@ -404,9 +404,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

@@ -17,10 +17,11 @@ scale-info = { version = "1.0", default-features = false, features = ["derive"]
 frame-benchmarking = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false, optional = true }
 frame-support = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }
 frame-system = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }
-orml-nft = { git = "/~https://github.com/open-web3-stack/open-runtime-module-library", rev = "ee37b76a7a8cf159e6c41851942758746318bb84", default-features = false }
 orml-utilities = { git = "/~https://github.com/open-web3-stack/open-runtime-module-library", rev = "ee37b76a7a8cf159e6c41851942758746318bb84", default-features = false }
+pallet-uniques = { path = "../uniques", default-features = false }
 serde = { version = "1.0.111", optional = true, features = ["derive"] }
 sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }
+sp-arithmetic = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }
 sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", default-features = false }
 
 # local dependency
@@ -41,8 +42,9 @@ std = [
     "frame-system/std",
     "sp-std/std",
     "sp-runtime/std",
-    "orml-nft/std",
+    "pallet-uniques/std",
     "scale-info/std",
+
 ]
 runtime-benchmarks = [
     "frame-benchmarking",