difftreelog
fix(rmrk) move rmrk specific types to rmrk-traits
in: master
19 files changed
Cargo.lockdiffbeforeafterboth6338 "pallet-nonfungible",6338 "pallet-nonfungible",6339 "pallet-structure",6339 "pallet-structure",6340 "parity-scale-codec 3.1.2",6340 "parity-scale-codec 3.1.2",6341 "rmrk-traits",6341 "scale-info",6342 "scale-info",6342 "sp-core",6343 "sp-core",6343 "sp-runtime",6344 "sp-runtime",6357 "pallet-nonfungible",6358 "pallet-nonfungible",6358 "pallet-rmrk-core",6359 "pallet-rmrk-core",6359 "parity-scale-codec 3.1.2",6360 "parity-scale-codec 3.1.2",6361 "rmrk-traits",6360 "scale-info",6362 "scale-info",6361 "sp-core",6363 "sp-core",6362 "sp-runtime",6364 "sp-runtime",8999version = "0.0.1"9001version = "0.0.1"9000dependencies = [9002dependencies = [9001 "parity-scale-codec 2.3.1",9003 "parity-scale-codec 2.3.1",9004 "rmrk-traits",9002 "serde",9005 "serde",9003 "sp-api",9006 "sp-api",9004 "sp-core",9007 "sp-core",9005 "sp-runtime",9008 "sp-runtime",9006 "sp-std",9009 "sp-std",9007 "up-data-structs",9008]9010]90119012[[package]]9013name = "rmrk-traits"9014version = "0.1.0"9015dependencies = [9016 "parity-scale-codec 3.1.2",9017 "scale-info",9018 "serde",9019]900990209010[[package]]9021[[package]]9011name = "rocksdb"9022name = "rocksdb"12723 "frame-system",12734 "frame-system",12724 "pallet-evm",12735 "pallet-evm",12725 "parity-scale-codec 3.1.2",12736 "parity-scale-codec 3.1.2",12737 "rmrk-traits",12726 "scale-info",12738 "scale-info",12727 "serde",12739 "serde",12728 "sp-core",12740 "sp-core",pallets/proxy-rmrk-core/Cargo.tomldiffbeforeafterboth22up-data-structs = { default-features = false, path = '../../primitives/data-structs' }22up-data-structs = { default-features = false, path = '../../primitives/data-structs' }23pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.22" }23pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.22" }24frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }24frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }25rmrk-traits = { default-features = false, path = "../../primitives/rmrk-traits" }25scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }26scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }26derivative = { version = "2.2.0", features = ["use_core"] }27derivative = { version = "2.2.0", features = ["use_core"] }272833 "sp-runtime/std",34 "sp-runtime/std",34 "sp-std/std",35 "sp-std/std",35 "up-data-structs/std",36 "up-data-structs/std",37 "rmrk-traits/std",36 "pallet-common/std",38 "pallet-common/std",37 "pallet-nonfungible/std",39 "pallet-nonfungible/std",38 "pallet-structure/std",40 "pallet-structure/std",pallets/proxy-rmrk-core/src/lib.rsdiffbeforeafterboth289 let sender = T::CrossAccountId::from_sub(sender);289 let sender = T::CrossAccountId::from_sub(sender);290 let cross_owner = T::CrossAccountId::from_sub(owner.clone());290 let cross_owner = T::CrossAccountId::from_sub(owner.clone());291291292 let royalty_info = royalty_amount.map(|amount| rmrk::RoyaltyInfo {292 let royalty_info = royalty_amount.map(|amount| rmrk_traits::RoyaltyInfo {293 recipient: recipient.unwrap_or_else(|| owner.clone()),293 recipient: recipient.unwrap_or_else(|| owner.clone()),294 amount,294 amount,295 });295 });pallets/proxy-rmrk-equip/Cargo.tomldiffbeforeafterboth21up-data-structs = { default-features = false, path = '../../primitives/data-structs' }21up-data-structs = { default-features = false, path = '../../primitives/data-structs' }22pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.22" }22pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.22" }23frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }23frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }24rmrk-traits = { default-features = false, path = "../../primitives/rmrk-traits" }24scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }25scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }25pallet-rmrk-core = { default-features = false, path = "../proxy-rmrk-core" }26pallet-rmrk-core = { default-features = false, path = "../proxy-rmrk-core" }262732 "sp-runtime/std",33 "sp-runtime/std",33 "sp-std/std",34 "sp-std/std",34 "up-data-structs/std",35 "up-data-structs/std",36 "rmrk-traits/std",35 "pallet-common/std",37 "pallet-common/std",36 "pallet-nonfungible/std",38 "pallet-nonfungible/std",37 "pallet-rmrk-core/std",39 "pallet-rmrk-core/std",primitives/data-structs/Cargo.tomldiffbeforeafterboth26derivative = { version = "2.2.0", features = ["use_core"] }26derivative = { version = "2.2.0", features = ["use_core"] }27struct-versioning = { path = "../../crates/struct-versioning" }27struct-versioning = { path = "../../crates/struct-versioning" }28pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.22" }28pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.22" }29rmrk-traits = { default-features = false, path = "../rmrk-traits" }293030[features]31[features]31default = ["std"]32default = ["std"]39 "sp-core/std",40 "sp-core/std",40 "sp-std/std",41 "sp-std/std",41 "pallet-evm/std",42 "pallet-evm/std",43 "rmrk-traits/std",42]44]43serde1 = ["serde/alloc"]45serde1 = ["serde/alloc"]44limit-testing = []46limit-testing = []primitives/data-structs/src/lib.rsdiffbeforeafterboth36use derivative::Derivative;36use derivative::Derivative;37use scale_info::TypeInfo;37use scale_info::TypeInfo;3839pub mod rmrk;403841// RMRK39// RMRK42use rmrk::{40use rmrk_traits::{43 CollectionInfo, NftInfo, ResourceInfo, PropertyInfo, BaseInfo, PartType, Theme, ThemeProperty,41 CollectionInfo, NftInfo, ResourceInfo, PropertyInfo, BaseInfo, PartType, Theme, ThemeProperty,44 ResourceTypes, BasicResource, ComposableResource, SlotResource,42 ResourceTypes, BasicResource, ComposableResource, SlotResource,45};43};46pub use rmrk::{44pub use rmrk_traits::{47 primitives::{45 primitives::{48 CollectionId as RmrkCollectionId, NftId as RmrkNftId, BaseId as RmrkBaseId,46 CollectionId as RmrkCollectionId, NftId as RmrkNftId, BaseId as RmrkBaseId,49 PartId as RmrkPartId, ResourceId as RmrkResourceId,47 PartId as RmrkPartId, ResourceId as RmrkResourceId,primitives/data-structs/src/rmrk.rsdiffbeforeafterbothno changes
primitives/rmrk-rpc/Cargo.tomldiffbeforeafterboth11sp-api = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.22' }11sp-api = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.22' }12sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.22' }12sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.22' }13serde = { version = "1.0.130", default-features = false, features = ["derive"] }13serde = { version = "1.0.130", default-features = false, features = ["derive"] }14up-data-structs = { default-features = false, path = '../data-structs' }14rmrk-traits = { default-features = false, path = "../rmrk-traits" }151516[features]16[features]17default = ["std"]17default = ["std"]22 "sp-api/std",22 "sp-api/std",23 "sp-runtime/std",23 "sp-runtime/std",24 "serde/std",24 "serde/std",25 "up-data-structs/std",25 "rmrk-traits/std",26]26]2727primitives/rmrk-rpc/src/lib.rsdiffbeforeafterboth3use sp_api::{Encode, Decode};3use sp_api::{Encode, Decode};4use sp_std::vec::Vec;4use sp_std::vec::Vec;5use sp_runtime::DispatchError;5use sp_runtime::DispatchError;6use up_data_structs::rmrk::{primitives::*, NftChild};6use rmrk_traits::{primitives::*, NftChild};778pub type Result<T> = core::result::Result<T, DispatchError>;8pub type Result<T> = core::result::Result<T, DispatchError>;99primitives/rmrk-traits/Cargo.tomldiffbeforeafterbothno changes
primitives/rmrk-traits/src/base.rsdiffbeforeafterbothno changes
primitives/rmrk-traits/src/collection.rsdiffbeforeafterbothno changes
primitives/rmrk-traits/src/lib.rsdiffbeforeafterbothno changes
primitives/rmrk-traits/src/nft.rsdiffbeforeafterbothno changes
primitives/rmrk-traits/src/part.rsdiffbeforeafterbothno changes
primitives/rmrk-traits/src/property.rsdiffbeforeafterbothno changes
primitives/rmrk-traits/src/resource.rsdiffbeforeafterbothno changes
primitives/rmrk-traits/src/serialize.rsdiffbeforeafterbothno changes
primitives/rmrk-traits/src/theme.rsdiffbeforeafterbothno changes