From 7c31245d6bf28b8cda0629614f5b1f2d5c2668c6 Mon Sep 17 00:00:00 2001 From: brenzi Date: Sat, 23 Dec 2023 08:15:32 +0100 Subject: [PATCH] bump pallets (#245) * bump pallets * add weights --- Cargo.lock | 38 +++++++++---------- polkadot-parachains/Cargo.toml | 2 +- .../integritee-runtime/Cargo.toml | 16 ++++---- .../integritee-runtime/src/lib.rs | 2 +- .../src/weights/pallet_enclave_bridge.rs | 6 +++ polkadot-parachains/shell-runtime/Cargo.toml | 4 +- zombienet/rococo-local-with-integritee.toml | 2 +- 7 files changed, 38 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7cf79688..ab19e29e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -993,7 +993,7 @@ dependencies = [ [[package]] name = "claims-primitives" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.6-polkadot-v0.9.42#94aa66fbe63d0d5bc848b9cf8f7a71fa34ef8ce8" +source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.9-polkadot-v0.9.42#8469a054e131f87f67f2829331b88ecce30a432d" dependencies = [ "parity-scale-codec", "rustc-hex", @@ -1098,7 +1098,7 @@ dependencies = [ [[package]] name = "common-primitives" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.6-polkadot-v0.9.42#94aa66fbe63d0d5bc848b9cf8f7a71fa34ef8ce8" +source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.9-polkadot-v0.9.42#8469a054e131f87f67f2829331b88ecce30a432d" dependencies = [ "derive_more", "parity-scale-codec", @@ -2489,7 +2489,7 @@ dependencies = [ [[package]] name = "enclave-bridge-primitives" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.6-polkadot-v0.9.42#94aa66fbe63d0d5bc848b9cf8f7a71fa34ef8ce8" +source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.9-polkadot-v0.9.42#8469a054e131f87f67f2829331b88ecce30a432d" dependencies = [ "common-primitives", "log", @@ -3874,7 +3874,7 @@ dependencies = [ [[package]] name = "integritee-collator" -version = "1.6.3" +version = "1.6.4" dependencies = [ "assert_cmd", "async-trait", @@ -3957,7 +3957,7 @@ dependencies = [ [[package]] name = "integritee-runtime" -version = "1.6.39" +version = "1.6.40" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -6128,7 +6128,7 @@ dependencies = [ [[package]] name = "pallet-claims" version = "0.9.12" -source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.6-polkadot-v0.9.42#94aa66fbe63d0d5bc848b9cf8f7a71fa34ef8ce8" +source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.9-polkadot-v0.9.42#8469a054e131f87f67f2829331b88ecce30a432d" dependencies = [ "claims-primitives", "frame-benchmarking", @@ -6253,8 +6253,8 @@ dependencies = [ [[package]] name = "pallet-enclave-bridge" -version = "0.11.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.6-polkadot-v0.9.42#94aa66fbe63d0d5bc848b9cf8f7a71fa34ef8ce8" +version = "0.12.0" +source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.9-polkadot-v0.9.42#8469a054e131f87f67f2829331b88ecce30a432d" dependencies = [ "enclave-bridge-primitives", "frame-benchmarking", @@ -6665,8 +6665,8 @@ dependencies = [ [[package]] name = "pallet-sidechain" -version = "0.10.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.6-polkadot-v0.9.42#94aa66fbe63d0d5bc848b9cf8f7a71fa34ef8ce8" +version = "0.11.0" +source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.9-polkadot-v0.9.42#8469a054e131f87f67f2829331b88ecce30a432d" dependencies = [ "enclave-bridge-primitives", "frame-benchmarking", @@ -6790,7 +6790,7 @@ dependencies = [ [[package]] name = "pallet-teeracle" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.6-polkadot-v0.9.42#94aa66fbe63d0d5bc848b9cf8f7a71fa34ef8ce8" +source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.9-polkadot-v0.9.42#8469a054e131f87f67f2829331b88ecce30a432d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6814,7 +6814,7 @@ dependencies = [ [[package]] name = "pallet-teerex" version = "0.10.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.6-polkadot-v0.9.42#94aa66fbe63d0d5bc848b9cf8f7a71fa34ef8ce8" +source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.9-polkadot-v0.9.42#8469a054e131f87f67f2829331b88ecce30a432d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7024,7 +7024,7 @@ dependencies = [ [[package]] name = "pallet-xcm-transactor" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.6-polkadot-v0.9.42#94aa66fbe63d0d5bc848b9cf8f7a71fa34ef8ce8" +source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.9-polkadot-v0.9.42#8469a054e131f87f67f2829331b88ecce30a432d" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -11013,7 +11013,7 @@ dependencies = [ [[package]] name = "sgx-verify" version = "0.1.4" -source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.6-polkadot-v0.9.42#94aa66fbe63d0d5bc848b9cf8f7a71fa34ef8ce8" +source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.9-polkadot-v0.9.42#8469a054e131f87f67f2829331b88ecce30a432d" dependencies = [ "base64 0.13.1", "chrono", @@ -11178,7 +11178,7 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "sidechain-primitives" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.6-polkadot-v0.9.42#94aa66fbe63d0d5bc848b9cf8f7a71fa34ef8ce8" +source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.9-polkadot-v0.9.42#8469a054e131f87f67f2829331b88ecce30a432d" dependencies = [ "parity-scale-codec", "scale-info", @@ -12467,7 +12467,7 @@ checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" [[package]] name = "teeracle-primitives" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.6-polkadot-v0.9.42#94aa66fbe63d0d5bc848b9cf8f7a71fa34ef8ce8" +source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.9-polkadot-v0.9.42#8469a054e131f87f67f2829331b88ecce30a432d" dependencies = [ "common-primitives", "sp-std", @@ -12477,7 +12477,7 @@ dependencies = [ [[package]] name = "teerex-primitives" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.6-polkadot-v0.9.42#94aa66fbe63d0d5bc848b9cf8f7a71fa34ef8ce8" +source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.9-polkadot-v0.9.42#8469a054e131f87f67f2829331b88ecce30a432d" dependencies = [ "common-primitives", "derive_more", @@ -12521,7 +12521,7 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "test-utils" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.6-polkadot-v0.9.42#94aa66fbe63d0d5bc848b9cf8f7a71fa34ef8ce8" +source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.9-polkadot-v0.9.42#8469a054e131f87f67f2829331b88ecce30a432d" dependencies = [ "log", "sgx-verify", @@ -14456,7 +14456,7 @@ dependencies = [ [[package]] name = "xcm-transactor-primitives" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.6-polkadot-v0.9.42#94aa66fbe63d0d5bc848b9cf8f7a71fa34ef8ce8" +source = "git+https://github.com/integritee-network/pallets.git?branch=sdk-v0.12.9-polkadot-v0.9.42#8469a054e131f87f67f2829331b88ecce30a432d" dependencies = [ "common-primitives", "cumulus-primitives-core", diff --git a/polkadot-parachains/Cargo.toml b/polkadot-parachains/Cargo.toml index 452f5784..edea43c2 100644 --- a/polkadot-parachains/Cargo.toml +++ b/polkadot-parachains/Cargo.toml @@ -2,7 +2,7 @@ name = "integritee-collator" description = "The Integritee parachain collator binary" # align major.minor revision with the runtimes. bump patch revision ad lib. make this the github release tag -version = "1.6.3" +version = "1.6.4" authors = ["Integritee AG "] homepage = "https://integritee.network/" repository = "https://github.com/integritee-network/parachain" diff --git a/polkadot-parachains/integritee-runtime/Cargo.toml b/polkadot-parachains/integritee-runtime/Cargo.toml index 70265f06..fc345111 100644 --- a/polkadot-parachains/integritee-runtime/Cargo.toml +++ b/polkadot-parachains/integritee-runtime/Cargo.toml @@ -2,7 +2,7 @@ name = "integritee-runtime" description = "The Integritee parachain runtime" # patch revision must match runtime spec_version -version = "1.6.39" +version = "1.6.40" authors = ["Integritee AG "] homepage = "https://integritee.network/" repository = "https://github.com/integritee-network/parachain" @@ -54,15 +54,15 @@ pallet-utility = { default-features = false, git = "https://github.com/paritytec pallet-vesting = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } # integritee pallets -pallet-claims = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.6-polkadot-v0.9.42" } -pallet-enclave-bridge = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.6-polkadot-v0.9.42" } -pallet-sidechain = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.6-polkadot-v0.9.42" } -pallet-teeracle = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.6-polkadot-v0.9.42" } -pallet-teerex = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.6-polkadot-v0.9.42" } -pallet-xcm-transactor = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.6-polkadot-v0.9.42" } +pallet-claims = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.9-polkadot-v0.9.42" } +pallet-enclave-bridge = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.9-polkadot-v0.9.42" } +pallet-sidechain = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.9-polkadot-v0.9.42" } +pallet-teeracle = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.9-polkadot-v0.9.42" } +pallet-teerex = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.9-polkadot-v0.9.42" } +pallet-xcm-transactor = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.9-polkadot-v0.9.42" } # other integritee deps -xcm-transactor-primitives = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.6-polkadot-v0.9.42" } +xcm-transactor-primitives = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.9-polkadot-v0.9.42" } # Cumulus dependencies cumulus-pallet-aura-ext = { default-features = false, git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } diff --git a/polkadot-parachains/integritee-runtime/src/lib.rs b/polkadot-parachains/integritee-runtime/src/lib.rs index 07308cd7..655b9e42 100644 --- a/polkadot-parachains/integritee-runtime/src/lib.rs +++ b/polkadot-parachains/integritee-runtime/src/lib.rs @@ -105,7 +105,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("integritee-parachain"), impl_name: create_runtime_str!("integritee-full"), authoring_version: 2, - spec_version: 39, + spec_version: 40, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 6, diff --git a/polkadot-parachains/integritee-runtime/src/weights/pallet_enclave_bridge.rs b/polkadot-parachains/integritee-runtime/src/weights/pallet_enclave_bridge.rs index 29bf0610..33fde159 100644 --- a/polkadot-parachains/integritee-runtime/src/weights/pallet_enclave_bridge.rs +++ b/polkadot-parachains/integritee-runtime/src/weights/pallet_enclave_bridge.rs @@ -127,4 +127,10 @@ impl pallet_enclave_bridge::WeightInfo for WeightInfo Weight { + Weight::from_parts(10_000_000, 0) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) + } } diff --git a/polkadot-parachains/shell-runtime/Cargo.toml b/polkadot-parachains/shell-runtime/Cargo.toml index a917a796..38647aa1 100644 --- a/polkadot-parachains/shell-runtime/Cargo.toml +++ b/polkadot-parachains/shell-runtime/Cargo.toml @@ -55,14 +55,14 @@ parachain-info = { default-features = false, git = "https://github.com/paritytec # Polkadot dependencies pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } -pallet-xcm-transactor = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.6-polkadot-v0.9.42" } +pallet-xcm-transactor = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.9-polkadot-v0.9.42" } polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } xcm-builder = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } # other integritee deps -xcm-transactor-primitives = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.6-polkadot-v0.9.42" } +xcm-transactor-primitives = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.9-polkadot-v0.9.42" } # orml orml-traits = { default-features = false, git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.42" } diff --git a/zombienet/rococo-local-with-integritee.toml b/zombienet/rococo-local-with-integritee.toml index 2bee4bd1..9d9870df 100644 --- a/zombienet/rococo-local-with-integritee.toml +++ b/zombienet/rococo-local-with-integritee.toml @@ -3,7 +3,7 @@ timeout = 10000 [relaychain] chain = "rococo-local" -default_command = "~/bin/polkadot-v0.9.43" +default_command = "~/bin/polkadot-v0.9.42" default_args = [ "-lparachain=debug" ] [[relaychain.nodes]]