From 7fb0936fdf6ae7c1cafbdc4c5072fb60053db9bc Mon Sep 17 00:00:00 2001 From: Henrique Nogara Date: Mon, 2 Dec 2024 15:48:04 -0300 Subject: [PATCH] Add disable_fee feature flag; Remove old polymesh-extension (#34) --- Cargo.lock | 95 +++++++++++---------------- Cargo.toml | 4 +- runtime/common/src/lib.rs | 9 ++- runtime/common/src/runtime.rs | 5 +- runtime/develop/Cargo.toml | 4 +- runtime/develop/src/runtime.rs | 2 +- runtime/production/Cargo.toml | 3 +- runtime/production/src/runtime.rs | 2 +- runtime/tests/Cargo.toml | 4 +- runtime/tests/src/test_runtime/mod.rs | 2 +- 10 files changed, 55 insertions(+), 75 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 550bcf1..600e3f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2871,7 +2871,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite 0.2.13", - "socket2 0.5.5", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -4368,7 +4368,7 @@ dependencies = [ [[package]] name = "node-rpc" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-support", "frame-system", @@ -4394,7 +4394,7 @@ dependencies = [ [[package]] name = "node-rpc-runtime-api" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-support", "frame-system", @@ -4593,7 +4593,7 @@ dependencies = [ [[package]] name = "pallet-asset" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "arrayvec 0.7.4", "frame-benchmarking", @@ -4685,7 +4685,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -4725,7 +4725,7 @@ dependencies = [ [[package]] name = "pallet-base" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-support", "frame-system", @@ -4745,7 +4745,7 @@ dependencies = [ [[package]] name = "pallet-committee" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -4770,7 +4770,7 @@ dependencies = [ [[package]] name = "pallet-compliance-manager" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "either", "frame-benchmarking", @@ -4880,7 +4880,7 @@ dependencies = [ [[package]] name = "pallet-corporate-actions" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -4949,7 +4949,7 @@ dependencies = [ [[package]] name = "pallet-external-agents" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -4995,7 +4995,7 @@ dependencies = [ [[package]] name = "pallet-group" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5019,7 +5019,7 @@ dependencies = [ [[package]] name = "pallet-group-rpc" version = "2.0.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-support", "frame-system", @@ -5040,7 +5040,7 @@ dependencies = [ [[package]] name = "pallet-group-rpc-runtime-api" version = "2.0.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "parity-scale-codec", "polymesh-common-utilities", @@ -5053,7 +5053,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "either", "frame-benchmarking", @@ -5135,7 +5135,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5158,7 +5158,7 @@ dependencies = [ [[package]] name = "pallet-nft" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5197,7 +5197,7 @@ dependencies = [ [[package]] name = "pallet-permissions" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5214,7 +5214,7 @@ dependencies = [ [[package]] name = "pallet-pips" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5249,7 +5249,7 @@ dependencies = [ [[package]] name = "pallet-portfolio" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5289,7 +5289,7 @@ dependencies = [ [[package]] name = "pallet-protocol-fee" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5309,7 +5309,7 @@ dependencies = [ [[package]] name = "pallet-protocol-fee-rpc" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-support", "frame-system", @@ -5330,7 +5330,7 @@ dependencies = [ [[package]] name = "pallet-protocol-fee-rpc-runtime-api" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "parity-scale-codec", "polymesh-common-utilities", @@ -5342,7 +5342,7 @@ dependencies = [ [[package]] name = "pallet-relayer" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5397,7 +5397,7 @@ dependencies = [ [[package]] name = "pallet-settlement" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5433,7 +5433,7 @@ dependencies = [ [[package]] name = "pallet-statistics" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5459,7 +5459,7 @@ dependencies = [ [[package]] name = "pallet-sto" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5493,7 +5493,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-support", "frame-system", @@ -5508,7 +5508,7 @@ dependencies = [ [[package]] name = "pallet-test-utils" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5545,7 +5545,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-support", "frame-system", @@ -5564,7 +5564,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5589,7 +5589,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5928,7 +5928,7 @@ dependencies = [ [[package]] name = "polymesh-build-tool" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "substrate-wasm-builder", ] @@ -5936,7 +5936,7 @@ dependencies = [ [[package]] name = "polymesh-common-utilities" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5960,7 +5960,7 @@ dependencies = [ [[package]] name = "polymesh-contracts" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-benchmarking", "frame-support", @@ -5983,23 +5983,6 @@ dependencies = [ "wasm-instrument 0.3.0", ] -[[package]] -name = "polymesh-extensions" -version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" -dependencies = [ - "frame-support", - "frame-system", - "pallet-permissions", - "pallet-transaction-payment", - "parity-scale-codec", - "polymesh-common-utilities", - "polymesh-primitives", - "scale-info", - "sp-runtime", - "sp-std", -] - [[package]] name = "polymesh-host-functions" version = "0.1.0" @@ -6021,7 +6004,7 @@ dependencies = [ [[package]] name = "polymesh-primitives" version = "5.0.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "chrono", "either", @@ -6050,7 +6033,7 @@ dependencies = [ [[package]] name = "polymesh-primitives-derive" version = "0.1.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "proc-macro2", "quote", @@ -6108,7 +6091,6 @@ dependencies = [ "parity-scale-codec", "polymesh-common-utilities", "polymesh-contracts", - "polymesh-extensions", "polymesh-host-functions", "polymesh-primitives", "polymesh-private-runtime-develop", @@ -6224,7 +6206,6 @@ dependencies = [ "polymesh-build-tool", "polymesh-common-utilities", "polymesh-contracts", - "polymesh-extensions", "polymesh-primitives", "polymesh-runtime-common 1.0.0", "polymesh-weights", @@ -6301,7 +6282,6 @@ dependencies = [ "polymesh-build-tool", "polymesh-common-utilities", "polymesh-contracts", - "polymesh-extensions", "polymesh-primitives", "polymesh-runtime-common 1.0.0", "polymesh-weights", @@ -6379,7 +6359,6 @@ dependencies = [ "parity-scale-codec", "polymesh-common-utilities", "polymesh-contracts", - "polymesh-extensions", "polymesh-primitives", "polymesh-runtime-common 1.0.0", "polymesh-weights", @@ -6433,7 +6412,7 @@ dependencies = [ [[package]] name = "polymesh-runtime-common" version = "1.0.0" -source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#b6c926c9da1d907e01e3bb8887c2127fe97bed8c" +source = "git+https://github.com/PolymeshAssociation/Polymesh.git?branch=develop#1d9764a8507a4210c573baf5f5c23efa8f142a0f" dependencies = [ "frame-election-provider-support", "frame-support", diff --git a/Cargo.toml b/Cargo.toml index 2015077..a5b3d5a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -144,7 +144,7 @@ pallet-sto = { git = "https://github.com/PolymeshAssociation/Polymesh.git", bran pallet-settlement = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false } pallet-statistics = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false } pallet-test-utils = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false } -pallet-transaction-payment = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false } +pallet-transaction-payment = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false, features = ["disable_fees"]} pallet-treasury = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false } pallet-utility = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false } pallet-sudo = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false } @@ -155,7 +155,6 @@ polymesh-common-utilities = { git = "https://github.com/PolymeshAssociation/Poly polymesh-runtime-common = { path = "runtime/common/", default-features = false } polymesh-primitives = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false } polymesh-weights = { path = "pallets/weights/", default-features = false } -polymesh-extensions = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false } # RPC node-rpc = { git = "https://github.com/PolymeshAssociation/Polymesh.git", branch = "develop", default-features = false } @@ -256,7 +255,6 @@ polymesh-common-utilities = { workspace = true, default-features = false } polymesh-runtime-common = { workspace = true, default-features = false } polymesh-primitives = { workspace = true, default-features = false } polymesh-weights = { workspace = true, default-features = false } -polymesh-extensions = { workspace = true, default-features = false } # PoA validator-set = { workspace = true, default-features = false } diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 4b23044..da8a118 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -28,7 +28,7 @@ pub use sp_runtime::{Perbill, Permill}; pub use frame_support::{ dispatch::{DispatchClass, GetDispatchInfo, Weight}, parameter_types, - traits::Currency, + traits::{Currency, Get}, weights::{ constants::{ WEIGHT_REF_TIME_PER_MICROS, WEIGHT_REF_TIME_PER_MILLIS, WEIGHT_REF_TIME_PER_NANOS, @@ -139,6 +139,7 @@ parameter_types! { /// Converts Weight to Fee pub struct WeightToFee; + impl WeightToFeePolynomial for WeightToFee { type Balance = Balance; /// We want a 0.03 POLYX fee per ExtrinsicBaseWeight. @@ -158,6 +159,12 @@ impl WeightToFeePolynomial for WeightToFee { } } +impl Get>> for WeightToFee { + fn get() -> Vec> { + Self::polynomial().to_vec() + } +} + use pallet_group_rpc_runtime_api::Member; use polymesh_common_utilities::traits::group::InactiveMember; use sp_std::{convert::From, prelude::*}; diff --git a/runtime/common/src/runtime.rs b/runtime/common/src/runtime.rs index 97ee6ef..967c11f 100644 --- a/runtime/common/src/runtime.rs +++ b/runtime/common/src/runtime.rs @@ -174,6 +174,7 @@ macro_rules! misc_pallet_impls { type GovernanceCommittee = PolymeshCommittee; type CddProviders = CddServiceProviders; type Identity = Identity; + type WeightToFeeConst = polymesh_runtime_common::WeightToFee; } impl polymesh_common_utilities::traits::CommonConfig for Runtime { @@ -547,7 +548,7 @@ macro_rules! misc_pallet_impls { frame_system::CheckGenesis::new(), frame_system::CheckEra::from(generic::Era::mortal(period, current_block)), frame_system::CheckNonce::from(nonce), - polymesh_extensions::CheckWeight::new(), + frame_system::CheckWeight::new(), pallet_transaction_payment::ChargeTransactionPayment::from(tip), pallet_permissions::StoreCallMetadata::new(), ); @@ -623,7 +624,7 @@ macro_rules! runtime_apis { frame_system::CheckGenesis, frame_system::CheckEra, frame_system::CheckNonce, - polymesh_extensions::CheckWeight, + frame_system::CheckWeight, pallet_transaction_payment::ChargeTransactionPayment, pallet_permissions::StoreCallMetadata, ); diff --git a/runtime/develop/Cargo.toml b/runtime/develop/Cargo.toml index 8f5c534..26d3b35 100644 --- a/runtime/develop/Cargo.toml +++ b/runtime/develop/Cargo.toml @@ -11,7 +11,6 @@ polymesh-common-utilities = { workspace = true, default-features = false } polymesh-runtime-common = { workspace = true, default-features = false } polymesh-primitives = { workspace = true, default-features = false } polymesh-weights = { workspace = true, default-features = false } -polymesh-extensions = { workspace = true, default-features = false } # Our pallets pallet-asset = { workspace = true, default-features = false } @@ -35,7 +34,7 @@ pallet-sto = { workspace = true, default-features = false } pallet-settlement = { workspace = true, default-features = false } pallet-statistics = { workspace = true, default-features = false } pallet-test-utils = { workspace = true, default-features = false } -pallet-transaction-payment = { workspace = true, default-features = false } +pallet-transaction-payment = { workspace = true, default-features = false, features = ["disable_fees"] } pallet-treasury = { workspace = true, default-features = false } pallet-utility = { workspace = true, default-features = false } pallet-sudo = { workspace = true, default-features = false } @@ -183,7 +182,6 @@ std = [ "sp-transaction-pool/std", "sp-version/std", "polymesh-contracts/std", - "polymesh-extensions/std", ] runtime-benchmarks = [ "getrandom/js", diff --git a/runtime/develop/src/runtime.rs b/runtime/develop/src/runtime.rs index a99b440..006c4a7 100644 --- a/runtime/develop/src/runtime.rs +++ b/runtime/develop/src/runtime.rs @@ -394,7 +394,7 @@ construct_runtime!( Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, // TransactionPayment: Genesis config dependencies: Balance. - TransactionPayment: pallet_transaction_payment::{Pallet, Event, Storage}, + TransactionPayment: pallet_transaction_payment::{Pallet, Call, Event, Storage}, // Identity: Genesis config deps: Timestamp. Identity: pallet_identity::{Pallet, Call, Storage, Event, Config}, diff --git a/runtime/production/Cargo.toml b/runtime/production/Cargo.toml index 3ef689d..74feaaa 100644 --- a/runtime/production/Cargo.toml +++ b/runtime/production/Cargo.toml @@ -8,7 +8,6 @@ build = "build.rs" [dependencies] # Common polymesh-common-utilities = { workspace = true, default-features = false } -polymesh-extensions = { workspace = true, default-features = false } polymesh-primitives = { workspace = true, default-features = false } polymesh-runtime-common = { workspace = true, default-features = false} polymesh-weights = { workspace = true, default-features = false } @@ -36,7 +35,7 @@ pallet-settlement = { workspace = true, default-features = false } pallet-statistics = { workspace = true, default-features = false } pallet-sto = { workspace = true, default-features = false } pallet-sudo = { workspace = true, default-features = false } -pallet-transaction-payment = { workspace = true, default-features = false } +pallet-transaction-payment = { workspace = true, default-features = false, features = ["disable_fees"] } pallet-treasury = { workspace = true, default-features = false } pallet-utility = { workspace = true, default-features = false } polymesh-contracts = { workspace = true, default-features = false } diff --git a/runtime/production/src/runtime.rs b/runtime/production/src/runtime.rs index 6de2c5d..f605cd2 100644 --- a/runtime/production/src/runtime.rs +++ b/runtime/production/src/runtime.rs @@ -308,7 +308,7 @@ construct_runtime!( Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, // TransactionPayment: Genesis config dependencies: Balance. - TransactionPayment: pallet_transaction_payment::{Pallet, Event, Storage}, + TransactionPayment: pallet_transaction_payment::{Pallet, Call, Event, Storage}, // Identity: Genesis config deps: Timestamp. Identity: pallet_identity::{Pallet, Call, Storage, Event, Config}, diff --git a/runtime/tests/Cargo.toml b/runtime/tests/Cargo.toml index 89a6ee6..842bbf9 100644 --- a/runtime/tests/Cargo.toml +++ b/runtime/tests/Cargo.toml @@ -10,7 +10,6 @@ polymesh-common-utilities = { workspace = true, default-features = false } polymesh-runtime-common = { workspace = true, default-features = false } polymesh-primitives = { workspace = true, default-features = false } polymesh-weights = { workspace = true, default-features = false } -polymesh-extensions = { workspace = true, default-features = false } # Our pallets pallet-asset = { workspace = true, default-features = false } @@ -33,7 +32,7 @@ pallet-sto = { workspace = true, default-features = false } pallet-settlement = { workspace = true, default-features = false } pallet-statistics = { workspace = true, default-features = false } pallet-test-utils = { workspace = true, default-features = false } -pallet-transaction-payment = { workspace = true, default-features = false } +pallet-transaction-payment = { workspace = true, default-features = false, features = ["disable_fees"] } pallet-treasury = { workspace = true, default-features = false } pallet-utility = { workspace = true, default-features = false } pallet-sudo = { workspace = true, default-features = false } @@ -171,7 +170,6 @@ std = [ "sp-transaction-pool/std", "sp-version/std", "polymesh-contracts/std", - "polymesh-extensions/std", ] runtime-benchmarks = [ diff --git a/runtime/tests/src/test_runtime/mod.rs b/runtime/tests/src/test_runtime/mod.rs index 5ddaa9f..e9513a6 100644 --- a/runtime/tests/src/test_runtime/mod.rs +++ b/runtime/tests/src/test_runtime/mod.rs @@ -146,7 +146,7 @@ frame_support::construct_runtime!( Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2, Indices: pallet_indices::{Pallet, Call, Storage, Config, Event} = 3, Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 5, - TransactionPayment: pallet_transaction_payment::{Pallet, Event, Storage} = 6, + TransactionPayment: pallet_transaction_payment::{Pallet, Call, Event, Storage} = 6, Identity: pallet_identity::{Pallet, Call, Storage, Event, Config} = 7, CddServiceProviders: pallet_group::::{Pallet, Call, Storage, Event, Config} = 8, PolymeshCommittee: pallet_committee::::{Pallet, Call, Storage, Origin, Event, Config} = 9,