diff --git a/Cargo.lock b/Cargo.lock index 95f8d63f..bd22f41e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3006,7 +3006,6 @@ dependencies = [ "frame-try-runtime", "hex-literal", "log", - "pallet-afloat", "pallet-alliance", "pallet-asset-tx-payment", "pallet-assets", @@ -3024,6 +3023,7 @@ dependencies = [ "pallet-democracy", "pallet-elections-phragmen", "pallet-fruniques", + "pallet-gated-marketplace", "pallet-gilt", "pallet-identity", "pallet-im-online", @@ -3090,7 +3090,6 @@ dependencies = [ "frame-system-rpc-runtime-api", "hex-literal", "log", - "pallet-afloat", "pallet-assets", "pallet-aura", "pallet-balances", @@ -3099,6 +3098,7 @@ dependencies = [ "pallet-collective", "pallet-confidential-docs", "pallet-fruniques", + "pallet-gated-marketplace", "pallet-grandpa", "pallet-identity", "pallet-indices", @@ -5111,27 +5111,6 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "pallet-afloat" -version = "4.0.0-dev" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "log", - "pallet-balances", - "pallet-fruniques", - "pallet-rbac", - "pallet-timestamp", - "pallet-uniques", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-io", - "sp-runtime", -] - [[package]] name = "pallet-alliance" version = "4.0.0-dev" @@ -5553,6 +5532,27 @@ dependencies = [ "sp-runtime", ] +[[package]] +name = "pallet-gated-marketplace" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "pallet-fruniques", + "pallet-rbac", + "pallet-timestamp", + "pallet-uniques", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core", + "sp-io", + "sp-runtime", +] + [[package]] name = "pallet-gilt" version = "4.0.0-dev" diff --git a/Cargo.toml b/Cargo.toml index 15d0320b..4d0da7a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ members = [ 'pallets/confidential-docs', 'pallets/rbac', 'pallets/fruniques', - 'pallets/afloat', + 'pallets/gated-marketplace', 'parachain-runtime', 'runtime', ] diff --git a/pallets/afloat/Cargo.toml b/pallets/gated-marketplace/Cargo.toml similarity index 98% rename from pallets/afloat/Cargo.toml rename to pallets/gated-marketplace/Cargo.toml index abb19346..e24f5b8f 100644 --- a/pallets/afloat/Cargo.toml +++ b/pallets/gated-marketplace/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "pallet-afloat" +name = "pallet-gated-marketplace" version = "4.0.0-dev" description = "Pallet to create marketplaces" authors = ["Hashed for ProxyType { ), ProxyType::Marketplaces => matches!( c, - Call::Afloat(..) + Call::GatedMarketplace(..) ), } } @@ -991,7 +991,7 @@ parameter_types! { pub const MaxOffersPerMarket: u32 = 100; } -impl pallet_afloat::Config for Runtime { +impl pallet_gated_marketplace::Config for Runtime { type Event = Event; type MaxAuthsPerMarket = MaxAuthsPerMarket; type MaxRolesPerAuth = MaxRolesPerAuth; @@ -1090,7 +1090,7 @@ construct_runtime!( BitcoinVaults: pallet_bitcoin_vaults::{Pallet, Call, Storage, Event, ValidateUnsigned} = 151, Uniques: pallet_uniques::{Pallet, Call, Storage, Event} = 152, Fruniques: pallet_fruniques::{Pallet, Call, Storage, Event} = 153, - Afloat: pallet_afloat::{Pallet, Call, Storage, Event} = 154, + GatedMarketplace: pallet_gated_marketplace::{Pallet, Call, Storage, Event} = 154, RBAC: pallet_rbac::{Pallet, Call, Storage, Event} = 155, ConfidentialDocs: pallet_confidential_docs::{Pallet, Call, Storage, Event} = 156, } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index bd896554..de16629b 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -64,7 +64,7 @@ hex-literal = { version = "0.3.4", optional = true } pallet-template = { default-features = false, path = "../pallets/template" } pallet-fruniques = { version = "0.1.0-dev", default-features = false, path = "../pallets/fruniques" } pallet-bitcoin-vaults = { default-features = false, path = "../pallets/bitcoin-vaults" } -pallet-afloat = { default-features = false, path = "../pallets/afloat" } +pallet-gated-marketplace= { default-features = false, path = "../pallets/gated-marketplace" } pallet-rbac = { default-features = false, path = "../pallets/rbac" } pallet-confidential-docs = { default-features = false, path = "../pallets/confidential-docs" } pallet-proxy-financial = { default-features = false, path = "../pallets/proxy-financial" } @@ -104,7 +104,7 @@ std = [ "pallet-uniques/std", "pallet-node-authorization/std", "pallet-bitcoin-vaults/std", - "pallet-afloat/std", + "pallet-gated-marketplace/std", "pallet-rbac/std", "pallet-confidential-docs/std", "pallet-proxy-financial/std", diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 8bdf27f4..332fa6b2 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -106,7 +106,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // `spec_version`, and `authoring_version` are the same between Wasm and native. // This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use // the compatible custom types. - spec_version: 123, + spec_version: 124, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -622,7 +622,7 @@ parameter_types! { pub const MaxMarketsPerItem: u32 = 10; pub const MaxOffersPerMarket: u32 = 100; } -impl pallet_afloat::Config for Runtime { +impl pallet_gated_marketplace::Config for Runtime { type Event = Event; type MaxAuthsPerMarket = MaxAuthsPerMarket; type MaxRolesPerAuth = MaxRolesPerAuth; @@ -799,7 +799,7 @@ construct_runtime!( Bounties: pallet_bounties, Uniques: pallet_uniques, Fruniques: pallet_fruniques, - Afloat: pallet_afloat, + GatedMarketplace: pallet_gated_marketplace, Assets: pallet_assets, BitcoinVaults: pallet_bitcoin_vaults, RBAC: pallet_rbac,