Merge branch 'master' into backport-tests-for-claim-assets

paritytech · Jul 6, 2024 · 2f8822b · 2f8822b
2 parents b55758c + 221eddc
commit 2f8822b
Show file tree

Hide file tree

Showing 107 changed files with 4,493 additions and 1,399 deletions.
diff --git a/.github/workflows/checks-quick.yml b/.github/workflows/checks-quick.yml
@@ -20,7 +20,7 @@ jobs:
     # However, env variables don't work for forks: https://github.com/orgs/community/discussions/44322
     # This workaround sets the container image for each job using 'set-image' job output.
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     outputs:
       IMAGE: ${{ steps.set_image.outputs.IMAGE }}
     steps:
@@ -30,7 +30,7 @@ jobs:
         run: cat .github/env >> $GITHUB_OUTPUT
   fmt:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     needs: [set-image]
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
@@ -40,7 +40,7 @@ jobs:
         run: cargo +nightly fmt --all -- --check
   check-dependency-rules:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: check dependency rules
@@ -49,7 +49,7 @@ jobs:
           ../.gitlab/ensure-deps.sh
   check-rust-feature-propagation:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     needs: [set-image]
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
@@ -65,7 +65,7 @@ jobs:
           time zepter run check
   test-rust-features:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     needs: [set-image]
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
@@ -75,7 +75,7 @@ jobs:
         run: bash .gitlab/rust-features.sh .
   check-toml-format:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     needs: [set-image]
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
@@ -87,7 +87,7 @@ jobs:
           echo "Please run `taplo format --config .config/taplo.toml` to fix any toml formatting issues"
   check-workspace:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.0 (22. Sep 2023)
       - name: install python deps
@@ -104,7 +104,7 @@ jobs:
         run: python3 .github/scripts/deny-git-deps.py .
   check-markdown:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     steps:
       - name: Checkout sources
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -127,7 +127,7 @@ jobs:
           markdownlint --config "$CONFIG" --ignore target .
   check-umbrella:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
     needs: [set-image]
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}

diff --git a/.github/workflows/command-bench-all.yml b/.github/workflows/command-bench-all.yml
@@ -1,7 +1,7 @@
 name: Command Bench All
 
-on: 
-  workflow_dispatch: 
+on:
+  workflow_dispatch:
     inputs:
       pr:
         description: Number of the Pull Request
@@ -51,9 +51,8 @@ on:
           - people-rococo
           - people-westend
 
-
 jobs:
-  set-image:     
+  set-image:
     runs-on: ubuntu-latest
     outputs:
       IMAGE: ${{ steps.set_image.outputs.IMAGE }}

diff --git a/.github/workflows/command-bench-overhead.yml b/.github/workflows/command-bench-overhead.yml
@@ -1,7 +1,7 @@
 name: Command Bench Overhead
 
-on: 
-  workflow_dispatch: 
+on:
+  workflow_dispatch:
     inputs:
       pr:
         description: Number of the Pull Request
@@ -31,7 +31,7 @@ on:
           - cumulus
 
 jobs:
-  set-image:     
+  set-image:
     runs-on: ubuntu-latest
     outputs:
       IMAGE: ${{ steps.set_image.outputs.IMAGE }}

diff --git a/.github/workflows/command-bench.yml b/.github/workflows/command-bench.yml
@@ -1,7 +1,7 @@
 name: Command Bench
 
-on: 
-  workflow_dispatch: 
+on:
+  workflow_dispatch:
     inputs:
       pr:
         description: Number of the Pull Request
@@ -76,9 +76,8 @@ on:
           - starters
           - testing
 
-
 jobs:
-  set-image:     
+  set-image:
     runs-on: ubuntu-latest
     outputs:
       IMAGE: ${{ steps.set_image.outputs.IMAGE }}

diff --git a/.github/workflows/command-fmt.yml b/.github/workflows/command-fmt.yml
@@ -1,14 +1,14 @@
 name: Command FMT
 
-on: 
-  workflow_dispatch: 
+on:
+  workflow_dispatch:
     inputs:
       pr:
         description: Number of the Pull Request
         required: true
 
 jobs:
-  set-image:     
+  set-image:
     runs-on: ubuntu-latest
     outputs:
       IMAGE: ${{ steps.set_image.outputs.IMAGE }}
@@ -20,6 +20,7 @@ jobs:
   cmd-fmt:
     needs: [set-image]
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
     steps:

diff --git a/.github/workflows/command-update-ui.yml b/.github/workflows/command-update-ui.yml
@@ -1,7 +1,7 @@
 name: Command Update UI
 
-on: 
-  workflow_dispatch: 
+on:
+  workflow_dispatch:
     inputs:
       pr:
         description: Number of the Pull Request
@@ -11,7 +11,7 @@ on:
         required: false
 
 jobs:
-  set-image:     
+  set-image:
     runs-on: ubuntu-latest
     outputs:
       IMAGE: ${{ steps.set_image.outputs.IMAGE }}
@@ -23,6 +23,7 @@ jobs:
   cmd-update-ui:
     needs: [set-image]
     runs-on: arc-runners-polkadot-sdk-beefy
+    timeout-minutes: 90
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
     steps:

diff --git a/.github/workflows/tests-linux-stable.yml b/.github/workflows/tests-linux-stable.yml
@@ -37,7 +37,7 @@ jobs:
     needs: [set-image, changes]
     if: ${{ needs.changes.outputs.rust }}
     runs-on: arc-runners-polkadot-sdk-beefy
-    timeout-minutes: 30
+    timeout-minutes: 60
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
     env:
@@ -58,7 +58,7 @@ jobs:
     needs: [set-image, changes]
     if: ${{ needs.changes.outputs.rust }}
     runs-on: arc-runners-polkadot-sdk-beefy
-    timeout-minutes: 30
+    timeout-minutes: 60
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
     env:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -34,7 +34,7 @@ jobs:
     needs: [set-image, changes]
     if: ${{ needs.changes.outputs.rust }}
     runs-on: arc-runners-polkadot-sdk-beefy
-    timeout-minutes: 30
+    timeout-minutes: 60
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
     env:
@@ -53,7 +53,7 @@ jobs:
     needs: [set-image, changes]
     if: ${{ needs.changes.outputs.rust }}
     runs-on: arc-runners-polkadot-sdk-beefy
-    timeout-minutes: 30
+    timeout-minutes: 60
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
     continue-on-error: true # this rarely triggers in practice
@@ -78,7 +78,7 @@ jobs:
     needs: [set-image, changes]
     if: ${{ needs.changes.outputs.rust }}
     runs-on: arc-runners-polkadot-sdk-beefy
-    timeout-minutes: 30
+    timeout-minutes: 60
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
     env:

diff --git a/.gitlab/pipeline/zombienet/cumulus.yml b/.gitlab/pipeline/zombienet/cumulus.yml
@@ -149,3 +149,27 @@ zombienet-cumulus-0007-full_node_warp_sync:
       --local-dir="${LOCAL_DIR}"
       --concurrency=1
       --test="0007-full_node_warp_sync.zndsl"
+
+zombienet-cumulus-0008-elastic_authoring:
+  extends:
+    - .zombienet-cumulus-common
+    - .zombienet-refs
+    - .zombienet-before-script
+    - .zombienet-after-script
+  script:
+    - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+      --local-dir="${LOCAL_DIR}"
+      --concurrency=1
+      --test="0008-elastic_authoring.zndsl"
+
+zombienet-cumulus-0009-elastic_pov_recovery:
+  extends:
+    - .zombienet-cumulus-common
+    - .zombienet-refs
+    - .zombienet-before-script
+    - .zombienet-after-script
+  script:
+    - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+      --local-dir="${LOCAL_DIR}"
+      --concurrency=1
+      --test="0009-elastic_pov_recovery.zndsl"
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cumulus/client/consensus/aura/Cargo.toml b/cumulus/client/consensus/aura/Cargo.toml
@@ -16,13 +16,15 @@ futures = { workspace = true }
 parking_lot = { workspace = true }
 tracing = { workspace = true, default-features = true }
 schnellru = { workspace = true }
+tokio = { workspace = true, features = ["macros"] }
 
 # Substrate
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-consensus-aura = { workspace = true, default-features = true }
 sc-consensus-babe = { workspace = true, default-features = true }
 sc-consensus-slots = { workspace = true, default-features = true }
+sc-utils = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }