diff --git a/Cargo.lock b/Cargo.lock index 3198646..f42fe42 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3881,7 +3881,7 @@ dependencies = [ [[package]] name = "module-support" version = "3.0.0" -source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.2#ab5f134e81a4a1dff990b4898c67bc877ca3d932" +source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.4#4b4733da3db4ef1150db68b7dab5a142ea431fd9" dependencies = [ "frame-support", "frame-system", @@ -4229,7 +4229,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "3.0.0" -source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.2#ab5f134e81a4a1dff990b4898c67bc877ca3d932" +source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.4#4b4733da3db4ef1150db68b7dab5a142ea431fd9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4308,7 +4308,7 @@ dependencies = [ [[package]] name = "pallet-bridge" version = "3.0.0" -source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.2#ab5f134e81a4a1dff990b4898c67bc877ca3d932" +source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.4#4b4733da3db4ef1150db68b7dab5a142ea431fd9" dependencies = [ "frame-support", "frame-system", @@ -4602,7 +4602,7 @@ dependencies = [ [[package]] name = "pallet-names" version = "3.0.0" -source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.2#ab5f134e81a4a1dff990b4898c67bc877ca3d932" +source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.4#4b4733da3db4ef1150db68b7dab5a142ea431fd9" dependencies = [ "enumflags2 0.7.1", "frame-support", @@ -4617,11 +4617,12 @@ dependencies = [ [[package]] name = "pallet-nft" version = "3.0.0" -source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.2#ab5f134e81a4a1dff990b4898c67bc877ca3d932" +source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.4#4b4733da3db4ef1150db68b7dab5a142ea431fd9" dependencies = [ "frame-support", "frame-system", "module-support", + "orml-utilities", "pallet-names", "pallet-transaction-payment", "parity-scale-codec", @@ -4637,7 +4638,7 @@ dependencies = [ [[package]] name = "pallet-nft-blindbox" version = "3.0.0" -source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.2#ab5f134e81a4a1dff990b4898c67bc877ca3d932" +source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.4#4b4733da3db4ef1150db68b7dab5a142ea431fd9" dependencies = [ "frame-support", "frame-system", @@ -4659,7 +4660,7 @@ dependencies = [ [[package]] name = "pallet-nft-multi" version = "3.0.0" -source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.2#ab5f134e81a4a1dff990b4898c67bc877ca3d932" +source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.4#4b4733da3db4ef1150db68b7dab5a142ea431fd9" dependencies = [ "frame-support", "frame-system", @@ -4667,6 +4668,7 @@ dependencies = [ "orml-currencies", "orml-tokens", "orml-traits", + "orml-utilities", "pallet-names", "pallet-transaction-payment", "parity-scale-codec", @@ -4743,7 +4745,7 @@ dependencies = [ [[package]] name = "pallet-rewards" version = "3.0.0" -source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.2#ab5f134e81a4a1dff990b4898c67bc877ca3d932" +source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.4#4b4733da3db4ef1150db68b7dab5a142ea431fd9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4810,7 +4812,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "3.0.0" -source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.2#ab5f134e81a4a1dff990b4898c67bc877ca3d932" +source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.4#4b4733da3db4ef1150db68b7dab5a142ea431fd9" dependencies = [ "frame-support", "frame-system", @@ -4825,7 +4827,7 @@ dependencies = [ [[package]] name = "pallet-staking-rpc" version = "3.0.0" -source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.2#ab5f134e81a4a1dff990b4898c67bc877ca3d932" +source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.4#4b4733da3db4ef1150db68b7dab5a142ea431fd9" dependencies = [ "jsonrpc-core 15.1.0", "jsonrpc-core-client 15.1.0", @@ -4843,7 +4845,7 @@ dependencies = [ [[package]] name = "pallet-staking-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.2#ab5f134e81a4a1dff990b4898c67bc877ca3d932" +source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.4#4b4733da3db4ef1150db68b7dab5a142ea431fd9" dependencies = [ "frame-support", "parity-scale-codec", @@ -4969,7 +4971,7 @@ dependencies = [ [[package]] name = "pallet-validator-set" version = "3.0.0" -source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.2#ab5f134e81a4a1dff990b4898c67bc877ca3d932" +source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.4#4b4733da3db4ef1150db68b7dab5a142ea431fd9" dependencies = [ "frame-support", "frame-system", @@ -9043,7 +9045,7 @@ dependencies = [ [[package]] name = "uniarts-common" version = "3.0.0" -source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.2#ab5f134e81a4a1dff990b4898c67bc877ca3d932" +source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.4#4b4733da3db4ef1150db68b7dab5a142ea431fd9" dependencies = [ "frame-support", "frame-system", @@ -9059,7 +9061,7 @@ dependencies = [ [[package]] name = "uniarts-primitives" version = "3.0.0" -source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.2#ab5f134e81a4a1dff990b4898c67bc877ca3d932" +source = "git+https://github.com/uni-arts-chain/uni-arts-common.git?tag=v3.0.4#4b4733da3db4ef1150db68b7dab5a142ea431fd9" dependencies = [ "parity-scale-codec", "serde", diff --git a/bin/cli/Cargo.toml b/bin/cli/Cargo.toml index 5249960..9afe118 100644 --- a/bin/cli/Cargo.toml +++ b/bin/cli/Cargo.toml @@ -13,7 +13,7 @@ log = { version = "0.4.11" } # uniarts uniarts-service = { path = "../service", default-features = false } -uniarts-primitives = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2" } +uniarts-primitives = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4" } # substratem sp-core = { version = "3.0.0", optional = true } diff --git a/bin/rpc/Cargo.toml b/bin/rpc/Cargo.toml index 9473550..b2705f4 100644 --- a/bin/rpc/Cargo.toml +++ b/bin/rpc/Cargo.toml @@ -13,13 +13,13 @@ jsonrpc-pubsub = "15.0.0" futures = "0.3.4" # uniarts -uniarts-primitives = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2" } +uniarts-primitives = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4" } # rpc substrate-frame-rpc-system = { version = "3.0.0" } pallet-transaction-payment-rpc = { version = "3.0.0" } -pallet-staking-rpc = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2" } +pallet-staking-rpc = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4" } pallet-contracts-rpc = { version = "3.0.0" } # substrate client diff --git a/bin/service/Cargo.toml b/bin/service/Cargo.toml index 9ed9ccf..16073cf 100644 --- a/bin/service/Cargo.toml +++ b/bin/service/Cargo.toml @@ -17,7 +17,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features = pangu-runtime = { path = "../../runtime/pangu" } fuxi-runtime = { path = "../../runtime/fuxi" } uniarts-rpc = { path = "../rpc" } -uniarts-primitives = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2" } +uniarts-primitives = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4" } # substrate client sc-cli = { version = "0.9.0", features = ["wasmtime"] } @@ -58,7 +58,7 @@ frame-benchmarking-cli = { version = "3.0.0" } substrate-frame-rpc-system = { version = "3.0.0" } substrate-prometheus-endpoint = { version = "0.9.0" } pallet-transaction-payment-rpc = { version = "3.0.0" } -pallet-staking-rpc = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2" } +pallet-staking-rpc = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4" } pallet-contracts-rpc = { version = "3.0.0" } pallet-contracts = { version = "3.0.0" } diff --git a/primitives/chain/Cargo.toml b/primitives/chain/Cargo.toml index f546b70..a37985d 100644 --- a/primitives/chain/Cargo.toml +++ b/primitives/chain/Cargo.toml @@ -13,7 +13,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features = sp-core = { version = "3.0.0", default-features = false } sp-runtime = { version = "3.0.0", default-features = false } sp-std = { version = "3.0.0", default-features = false } -uniarts-primitives = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2" , default-features = false } +uniarts-primitives = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4" , default-features = false } pallet-evm = { version = "3.0.0-dev", default-features = false, path = "../../pallets/evm" } diff --git a/runtime/fuxi/Cargo.toml b/runtime/fuxi/Cargo.toml index c840d5b..c5e3822 100644 --- a/runtime/fuxi/Cargo.toml +++ b/runtime/fuxi/Cargo.toml @@ -67,20 +67,20 @@ orml-traits = { default-features = false, version = '0.4.0' } # Used for RPCs pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", default-features = false } -pallet-staking-rpc-runtime-api = { version = "3.0.0", default-features = false, git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2" } +pallet-staking-rpc-runtime-api = { version = "3.0.0", default-features = false, git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4" } # Uni-Arts configs -uniarts-common = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2", default-features = false } -pallet-names = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2", default-features = false } -pallet-nft-multi = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2", default-features = false } -pallet-nft-blindbox = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2", default-features = false } -pallet-rewards = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2", default-features = false } -pallet-staking = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2", default-features = false } -pallet-validator-set = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2", default-features = false } -pallet-bridge = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2", default-features = false } -pallet-assets = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2" , default-features = false } +uniarts-common = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4", default-features = false } +pallet-names = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4", default-features = false } +pallet-nft-multi = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4", default-features = false } +pallet-nft-blindbox = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4", default-features = false } +pallet-rewards = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4", default-features = false } +pallet-staking = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4", default-features = false } +pallet-validator-set = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4", default-features = false } +pallet-bridge = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4", default-features = false } +pallet-assets = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4" , default-features = false } # pallet-lotteries = { path = "../../configs/lotteries", default-features = false } -uniarts-primitives = { package = "uniarts-primitives", git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2", default-features = false } +uniarts-primitives = { package = "uniarts-primitives", git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4", default-features = false } #EVM pallet-ethereum = { version = "0.1.0", default-features = false, path = "../../pallets/ethereum" } diff --git a/runtime/fuxi/src/lib.rs b/runtime/fuxi/src/lib.rs index 85b2c07..ad5b87a 100644 --- a/runtime/fuxi/src/lib.rs +++ b/runtime/fuxi/src/lib.rs @@ -129,7 +129,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("uart"), impl_name: create_runtime_str!("uart"), authoring_version: 1, - spec_version: 48, + spec_version: 50, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 2, diff --git a/runtime/pangu/Cargo.toml b/runtime/pangu/Cargo.toml index aba4ad1..3efe2fa 100644 --- a/runtime/pangu/Cargo.toml +++ b/runtime/pangu/Cargo.toml @@ -62,18 +62,18 @@ pallet-contracts-rpc-runtime-api = { version = "3.0.0", default-features = false # Used for RPCs pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", default-features = false } -pallet-staking-rpc-runtime-api = { version = "3.0.0", default-features = false, git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2" } +pallet-staking-rpc-runtime-api = { version = "3.0.0", default-features = false, git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4" } # Uni-Arts configs -uniarts-common = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2", default-features = false } -pallet-assets = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2" , default-features = false } -pallet-names = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2" , default-features = false } -pallet-nft = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2" , default-features = false } -pallet-rewards = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2" , default-features = false } -pallet-staking = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2" , default-features = false } -pallet-validator-set = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2" , default-features = false } +uniarts-common = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4", default-features = false } +pallet-assets = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4" , default-features = false } +pallet-names = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4" , default-features = false } +pallet-nft = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4" , default-features = false } +pallet-rewards = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4" , default-features = false } +pallet-staking = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4" , default-features = false } +pallet-validator-set = { git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4" , default-features = false } # pallet-lotteries = { path = "../../configs/lotteries", default-features = false } -uniarts-primitives = { package = "uniarts-primitives", git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.2" , default-features = false } +uniarts-primitives = { package = "uniarts-primitives", git = "https://github.com/uni-arts-chain/uni-arts-common.git", tag = "v3.0.4" , default-features = false } # Used for runtime benchmarking frame-benchmarking = { version = "3.0.0", default-features = false, optional = true }