Merge branch 'aa/dip' into aa/state-proofs

.github/workflows/polkadot-version-upgrade-ticket.yml

@@ -30,7 +30,7 @@ jobs:
     steps:
       - name: Install subalfred
         env:
-          SUBALFRED_VERSION: 0.9.1
+          SUBALFRED_VERSION: 0.9.2
         run: cargo install --version $SUBALFRED_VERSION --git https://github.com/hack-ink/subalfred.git subalfred
       - name: Run subalfred for Substrate
         env:

.gitlab-ci.yml

@@ -3,33 +3,25 @@ stages:
   - build
 
 clippy:
-  # Corresponds to paritytech/ci-linux:production at the time of this PR
-  # https://hub.docker.com/layers/ci-linux/paritytech/ci-linux/production/images/sha256-4e8c072ea12bc17d99cb531adb58dea5a4c7d4880a8a86525052d24d1454e89e?context=explore
-  image: paritytech/ci-linux@sha256:4e8c072ea12bc17d99cb531adb58dea5a4c7d4880a8a86525052d24d1454e89e
+  image: paritytech/ci-unified:bullseye-1.70.0
   stage: test
   script:
     - cargo clippy --all-features --all-targets --locked -- -D warnings
 
 fmt:
-  # Corresponds to paritytech/ci-linux:production at the time of this PR
-  # https://hub.docker.com/layers/ci-linux/paritytech/ci-linux/production/images/sha256-4e8c072ea12bc17d99cb531adb58dea5a4c7d4880a8a86525052d24d1454e89e?context=explore
-  image: paritytech/ci-linux@sha256:4e8c072ea12bc17d99cb531adb58dea5a4c7d4880a8a86525052d24d1454e89e
+  image: paritytech/ci-unified:bullseye-1.70.0
   stage: test
   script:
     - cargo fmt -- --check
 
 test:
-  # Corresponds to paritytech/ci-linux:production at the time of this PR
-  # https://hub.docker.com/layers/ci-linux/paritytech/ci-linux/production/images/sha256-4e8c072ea12bc17d99cb531adb58dea5a4c7d4880a8a86525052d24d1454e89e?context=explore
-  image: paritytech/ci-linux@sha256:4e8c072ea12bc17d99cb531adb58dea5a4c7d4880a8a86525052d24d1454e89e
+  image: paritytech/ci-unified:bullseye-1.70.0
   stage: test
   script:
     - cargo test --all --all-targets --locked
 
 test-features:
-  # Corresponds to paritytech/ci-linux:production at the time of this PR
-  # https://hub.docker.com/layers/ci-linux/paritytech/ci-linux/production/images/sha256-4e8c072ea12bc17d99cb531adb58dea5a4c7d4880a8a86525052d24d1454e89e?context=explore
-  image: paritytech/ci-linux@sha256:4e8c072ea12bc17d99cb531adb58dea5a4c7d4880a8a86525052d24d1454e89e
+  image: paritytech/ci-unified:bullseye-1.70.0
   stage: test
   script:
     - cargo test --all --all-features --all-targets --locked
@@ -65,7 +57,7 @@ build:
 
 build-wasm-peregrine:
   image:
-    name: paritytech/srtool:1.66.1-0.9.25
+    name: paritytech/srtool:1.70.0
     entrypoint: [""]
   stage: build
   only:
@@ -79,16 +71,21 @@ build-wasm-peregrine:
     - export AUTHORIZE_UPGRADE_PREFIX=0x02
     - cp -r * /build
     - /srtool/build build
+    - subwasm meta --format=json+scale /out/peregrine_runtime.compact.wasm > /out/peregrine-metadata.json
+    - subwasm get -o peregrine-live.wasm wss://peregrine.kilt.io
+    - subwasm diff --no-color peregrine-live.wasm /out/peregrine_runtime.compact.wasm | tee /out/peregrine-diff.txt
     - mkdir ./out
     - mv /out/* ./out/
   artifacts:
     paths:
       - out/*.wasm
+      - out/*.json
+      - out/*.txt
     expire_in: 12 week
 
 build-wasm-spiritnet:
   image:
-    name: paritytech/srtool:1.66.1-0.9.25
+    name: paritytech/srtool:1.70.0
     entrypoint: [""]
   stage: build
   only:
@@ -102,9 +99,14 @@ build-wasm-spiritnet:
     - export AUTHORIZE_UPGRADE_PREFIX=0x02
     - cp -r * /build
     - /srtool/build build
+    - subwasm meta --format=json+scale /out/spiritnet_runtime.compact.wasm > /out/spiritnet-metadata.json
+    - subwasm get -o spiritnet-live.wasm wss://spiritnet.kilt.io
+    - subwasm diff --no-color spiritnet-live.wasm /out/spiritnet_runtime.compact.wasm | tee /out/spiritnet-diff.txt
     - mkdir ./out
     - mv /out/* ./out/
   artifacts:
     paths:
       - out/*.wasm
+      - out/*.json
+      - out/*.txt
     expire_in: 12 week

.maintain/weight-template.hbs

@@ -57,11 +57,11 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 		{{#if (ne benchmark.base_calculated_proof_size "0")}}
 		Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}})
 		{{else}}
-		Weight::from_ref_time({{underscore benchmark.base_weight}})
+		Weight::from_parts({{underscore benchmark.base_weight}}, 0)
 		{{/if}}
 			{{#each benchmark.component_weight as |cw|}}
 			// Standard Error: {{underscore cw.error}}
-			.saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
+			.saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into()))
 			{{/each}}
 			{{#if (ne benchmark.base_reads "0")}}
 			.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}_u64))
@@ -76,7 +76,7 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
 			{{/each}}
 			{{#each benchmark.component_calculated_proof_size as |cp|}}
-			.saturating_add(Weight::from_proof_size({{cp.slope}}).saturating_mul({{cp.name}}.into()))
+			.saturating_add(Weight::from_parts(0 ,{{cp.slope}}).saturating_mul({{cp.name}}.into()))
 			{{/each}}
 	}
 	{{/each}}
@@ -103,11 +103,11 @@ impl WeightInfo for () {
 		{{#if (ne benchmark.base_calculated_proof_size "0")}}
 		Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}})
 		{{else}}
-		Weight::from_ref_time({{underscore benchmark.base_weight}})
+		Weight::from_parts({{underscore benchmark.base_weight}}, 0)
 		{{/if}}
 			{{#each benchmark.component_weight as |cw|}}
 			// Standard Error: {{underscore cw.error}}
-			.saturating_add(Weight::from_ref_time({{underscore cw.slope}}).saturating_mul({{cw.name}}.into()))
+			.saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into()))
 			{{/each}}
 			{{#if (ne benchmark.base_reads "0")}}
 			.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}}_u64))
@@ -122,7 +122,7 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
 			{{/each}}
 			{{#each benchmark.component_calculated_proof_size as |cp|}}
-			.saturating_add(Weight::from_proof_size({{cp.slope}}).saturating_mul({{cp.name}}.into()))
+			.saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into()))
 			{{/each}}
 	}
 	{{/each}}