From 6ec8479db9c0b8f38ed30f8a982092fde416ea34 Mon Sep 17 00:00:00 2001 From: Alain Brenzikofer Date: Thu, 14 Mar 2024 16:32:33 +0100 Subject: [PATCH 1/4] bump pallets to use sbliff --- Cargo.lock | 34 +++++++++---------- .../integritee-runtime/src/lib.rs | 4 +-- zombienet/rococo-local-with-integritee.toml | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f325cfe2..74bbdb36 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1221,7 +1221,7 @@ dependencies = [ [[package]] name = "claims-primitives" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#2c5e3bcfe334fdc0114dadf7cdad966059824119" +source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#0b49d445fd96181e6ce92595cac879c3c13ad100" dependencies = [ "parity-scale-codec", "rustc-hex", @@ -1353,7 +1353,7 @@ checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101" [[package]] name = "common-primitives" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#2c5e3bcfe334fdc0114dadf7cdad966059824119" +source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#0b49d445fd96181e6ce92595cac879c3c13ad100" dependencies = [ "derive_more", "parity-scale-codec", @@ -2810,7 +2810,7 @@ dependencies = [ [[package]] name = "enclave-bridge-primitives" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#2c5e3bcfe334fdc0114dadf7cdad966059824119" +source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#0b49d445fd96181e6ce92595cac879c3c13ad100" dependencies = [ "common-primitives", "log", @@ -6301,7 +6301,7 @@ dependencies = [ [[package]] name = "pallet-asset-registry" version = "0.0.1" -source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#2c5e3bcfe334fdc0114dadf7cdad966059824119" +source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#0b49d445fd96181e6ce92595cac879c3c13ad100" dependencies = [ "frame-benchmarking", "frame-support", @@ -6573,7 +6573,7 @@ dependencies = [ [[package]] name = "pallet-claims" version = "0.9.12" -source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#2c5e3bcfe334fdc0114dadf7cdad966059824119" +source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#0b49d445fd96181e6ce92595cac879c3c13ad100" dependencies = [ "claims-primitives", "frame-benchmarking", @@ -6727,7 +6727,7 @@ dependencies = [ [[package]] name = "pallet-enclave-bridge" version = "0.12.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#2c5e3bcfe334fdc0114dadf7cdad966059824119" +source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#0b49d445fd96181e6ce92595cac879c3c13ad100" dependencies = [ "enclave-bridge-primitives", "frame-benchmarking", @@ -7206,7 +7206,7 @@ dependencies = [ [[package]] name = "pallet-sidechain" version = "0.11.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#2c5e3bcfe334fdc0114dadf7cdad966059824119" +source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#0b49d445fd96181e6ce92595cac879c3c13ad100" dependencies = [ "enclave-bridge-primitives", "frame-benchmarking", @@ -7344,7 +7344,7 @@ dependencies = [ [[package]] name = "pallet-teeracle" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#2c5e3bcfe334fdc0114dadf7cdad966059824119" +source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#0b49d445fd96181e6ce92595cac879c3c13ad100" dependencies = [ "frame-benchmarking", "frame-support", @@ -7368,7 +7368,7 @@ dependencies = [ [[package]] name = "pallet-teerex" version = "0.10.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#2c5e3bcfe334fdc0114dadf7cdad966059824119" +source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#0b49d445fd96181e6ce92595cac879c3c13ad100" dependencies = [ "frame-benchmarking", "frame-support", @@ -7595,7 +7595,7 @@ dependencies = [ [[package]] name = "pallet-xcm-transactor" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#2c5e3bcfe334fdc0114dadf7cdad966059824119" +source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#0b49d445fd96181e6ce92595cac879c3c13ad100" dependencies = [ "cumulus-primitives-core", "frame-benchmarking", @@ -11635,7 +11635,7 @@ dependencies = [ [[package]] name = "sgx-verify" version = "0.1.4" -source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#2c5e3bcfe334fdc0114dadf7cdad966059824119" +source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#0b49d445fd96181e6ce92595cac879c3c13ad100" dependencies = [ "base64 0.13.1", "chrono", @@ -11806,7 +11806,7 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "sidechain-primitives" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#2c5e3bcfe334fdc0114dadf7cdad966059824119" +source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#0b49d445fd96181e6ce92595cac879c3c13ad100" dependencies = [ "parity-scale-codec", "scale-info", @@ -13314,7 +13314,7 @@ checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" [[package]] name = "teeracle-primitives" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#2c5e3bcfe334fdc0114dadf7cdad966059824119" +source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#0b49d445fd96181e6ce92595cac879c3c13ad100" dependencies = [ "common-primitives", "sp-std", @@ -13324,7 +13324,7 @@ dependencies = [ [[package]] name = "teerex-primitives" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#2c5e3bcfe334fdc0114dadf7cdad966059824119" +source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#0b49d445fd96181e6ce92595cac879c3c13ad100" dependencies = [ "common-primitives", "derive_more", @@ -13378,7 +13378,7 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "test-utils" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#2c5e3bcfe334fdc0114dadf7cdad966059824119" +source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#0b49d445fd96181e6ce92595cac879c3c13ad100" dependencies = [ "log", "sgx-verify", @@ -15089,7 +15089,7 @@ dependencies = [ [[package]] name = "xcm-primitives" version = "0.0.1" -source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#2c5e3bcfe334fdc0114dadf7cdad966059824119" +source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#0b49d445fd96181e6ce92595cac879c3c13ad100" dependencies = [ "frame-support", "sp-runtime", @@ -15113,7 +15113,7 @@ dependencies = [ [[package]] name = "xcm-transactor-primitives" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#2c5e3bcfe334fdc0114dadf7cdad966059824119" +source = "git+https://github.com/integritee-network/pallets.git?branch=polkadot-v1.6.0#0b49d445fd96181e6ce92595cac879c3c13ad100" dependencies = [ "common-primitives", "cumulus-primitives-core", diff --git a/polkadot-parachains/integritee-runtime/src/lib.rs b/polkadot-parachains/integritee-runtime/src/lib.rs index db2d57b2..e7b19cf4 100644 --- a/polkadot-parachains/integritee-runtime/src/lib.rs +++ b/polkadot-parachains/integritee-runtime/src/lib.rs @@ -119,10 +119,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("integritee-parachain"), impl_name: create_runtime_str!("integritee-full"), authoring_version: 2, - spec_version: 49, + spec_version: 50, impl_version: 1, apis: RUNTIME_API_VERSIONS, - transaction_version: 6, + transaction_version: 7, state_version: 0, }; diff --git a/zombienet/rococo-local-with-integritee.toml b/zombienet/rococo-local-with-integritee.toml index 1b30429d..5ba23848 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" +default_command = "~/bin/polkadot-v1.6.0" default_args = [ "-lparachain=debug,xcm=trace" ] [[relaychain.nodes]] From 7ae89fd80f8123f2a247c44ebbc22edbae363d79 Mon Sep 17 00:00:00 2001 From: Alain Brenzikofer Date: Fri, 15 Mar 2024 09:19:51 +0100 Subject: [PATCH 2/4] revert out-of-context change --- zombienet/rococo-local-with-integritee.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zombienet/rococo-local-with-integritee.toml b/zombienet/rococo-local-with-integritee.toml index 5ba23848..1b30429d 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-v1.6.0" +default_command = "~/bin/polkadot" default_args = [ "-lparachain=debug,xcm=trace" ] [[relaychain.nodes]] From 2a2ee25f63338f9728908efaa12c766377c484df Mon Sep 17 00:00:00 2001 From: Alain Brenzikofer Date: Fri, 15 Mar 2024 12:10:22 +0100 Subject: [PATCH 3/4] bump cargo about --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e711942d..4a5020b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -200,7 +200,7 @@ jobs: uses: baptiste0928/cargo-install@v2 with: crate: cargo-about - version: "0.5.6" + version: "0.6.1" - name: Run license check # Explicitly use stable because otherwise cargo will trigger a download of From 6a9cde0b128d666fa2552f54e6aead694d08e909 Mon Sep 17 00:00:00 2001 From: Alain Brenzikofer Date: Fri, 15 Mar 2024 13:21:51 +0100 Subject: [PATCH 4/4] bump versions --- Cargo.lock | 4 ++-- polkadot-parachains/Cargo.toml | 2 +- polkadot-parachains/integritee-runtime/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 74bbdb36..4ce498b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4234,7 +4234,7 @@ dependencies = [ [[package]] name = "integritee-collator" -version = "1.9.2" +version = "1.9.3" dependencies = [ "assert_cmd", "async-trait", @@ -4341,7 +4341,7 @@ dependencies = [ [[package]] name = "integritee-runtime" -version = "1.9.49" +version = "1.9.50" dependencies = [ "assets-common", "cumulus-pallet-aura-ext", diff --git a/polkadot-parachains/Cargo.toml b/polkadot-parachains/Cargo.toml index a4e5a8be..3a181745 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.9.2" +version = "1.9.3" 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 62c2038f..4b2394d6 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.9.49" +version = "1.9.50" authors = ["Integritee AG "] homepage = "https://integritee.network/" repository = "https://github.com/integritee-network/parachain"