Merge branch 'master' into aleks-container-chains-disabled-offchain-w…

…orkers-check
moondance-labs · Nov 5, 2024 · 53fac57 · 53fac57
2 parents 7834cad + fafdcc9
commit 53fac57
Show file tree

Hide file tree

Showing 100 changed files with 5,754 additions and 1,595 deletions.
diff --git a/.github/workflow-templates/typescript-tests-moonwall/action.yml b/.github/workflow-templates/typescript-tests-moonwall/action.yml
@@ -29,7 +29,7 @@ runs:
     - name: Setup Node
       uses: actions/setup-node@v4
       with:
-        node-version: 20.x
+        node-version: 22.x
         cache: "pnpm"
 
     - name: Install typescript-api

diff --git a/.github/workflow-templates/zombienet-tests/action.yml b/.github/workflow-templates/zombienet-tests/action.yml
@@ -19,7 +19,7 @@ runs:
     - name: Setup Node
       uses: actions/setup-node@v4
       with:
-        node-version: 20.x
+        node-version: 22.x
         cache: "pnpm"
 
     - name: "Download binaries"

diff --git a/.github/workflows/client-release-issue.yml b/.github/workflows/client-release-issue.yml
@@ -26,10 +26,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Use Node.js 18.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 22.x
       - name: Download Original Tools
         uses: actions/download-artifact@v4
         with:

diff --git a/.github/workflows/publish-binary-tannsi-relay.yml b/.github/workflows/publish-binary-tannsi-relay.yml
@@ -73,10 +73,10 @@ jobs:
         with:
           ref: ${{ github.event.inputs.to }}
           fetch-depth: 0
-      - name: Use Node.js 18.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 22.x
       - name: Download Original Tools
         uses: actions/download-artifact@v4
         with:

diff --git a/.github/workflows/publish-binary.yml b/.github/workflows/publish-binary.yml
@@ -73,10 +73,10 @@ jobs:
         with:
           ref: ${{ github.event.inputs.to }}
           fetch-depth: 0
-      - name: Use Node.js 18.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 22.x
       - name: Download Original Tools
         uses: actions/download-artifact@v4
         with:

diff --git a/.github/workflows/publish-runtime-chevdor.yml b/.github/workflows/publish-runtime-chevdor.yml
@@ -133,10 +133,10 @@ jobs:
         with:
           ref: ${{ github.event.inputs.to }}
           fetch-depth: 0 
-      - name: Use Node.js 18.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x  
+          node-version: 22.x  
       - name: Download Original Tools
         uses: actions/download-artifact@v4
         with:

diff --git a/.github/workflows/publish-runtime.yml b/.github/workflows/publish-runtime.yml
@@ -163,10 +163,10 @@ jobs:
         with:
           ref: ${{ github.event.inputs.to }}
           fetch-depth: 0 
-      - name: Use Node.js 18.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x  
+          node-version: 22.x  
       - name: Download Original Tools
         uses: actions/download-artifact@v4
         with:

diff --git a/.github/workflows/publish-typescript-api.yml b/.github/workflows/publish-typescript-api.yml
@@ -40,10 +40,10 @@ jobs:
         uses: pnpm/[email protected]
         with:
           version: 9
-      - name: Use Node.js 20.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
           cache: 'pnpm'
       - name: Build typescript API
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -191,7 +191,7 @@ jobs:
             - name: "Setup Node"
               uses: actions/setup-node@v4
               with:
-                  node-version: 20.x
+                  node-version: 22.x
                   cache: "pnpm"
             - name: "Formatting check"
               run: |
@@ -214,7 +214,7 @@ jobs:
             - name: "Setup Node"
               uses: actions/setup-node@v4
               with:
-                  node-version: 20.x
+                  node-version: 22.x
                   cache: "pnpm"
             - name: "Linting check"
               run: |
@@ -419,7 +419,7 @@ jobs:
             - name: "Setup Node"
               uses: actions/setup-node@v4
               with:
-                  node-version: 20.x
+                  node-version: 22.x
                   cache: "pnpm"
             - name: "Generate Local interfaces"
               run: |
@@ -452,7 +452,7 @@ jobs:
             - name: "Setup Node"
               uses: actions/setup-node@v4
               with:
-                  node-version: 20.x
+                  node-version: 22.x
                   cache: "pnpm"
             - name: "Generate typescript api"
               run: |
@@ -487,7 +487,7 @@ jobs:
             - name: "Setup Node"
               uses: actions/setup-node@v4
               with:
-                  node-version: 20.x
+                  node-version: 22.x
                   cache: "pnpm"
             - name: "Generate typescript api"
               run: |
@@ -517,7 +517,7 @@ jobs:
             - name: Setup Node
               uses: actions/setup-node@v4
               with:
-                  node-version: 20.x
+                  node-version: 22.x
                   cache: "pnpm"
             - name: "Download binaries"
               uses: actions/download-artifact@v4
@@ -552,7 +552,7 @@ jobs:
             - name: Setup Node
               uses: actions/setup-node@v4
               with:
-                  node-version: 20.x
+                  node-version: 22.x
                   cache: "pnpm"
             - name: "Download binaries"
               uses: actions/download-artifact@v4
@@ -587,7 +587,7 @@ jobs:
             - name: Setup Node
               uses: actions/setup-node@v4
               with:
-                  node-version: 20.x
+                  node-version: 22.x
                   cache: "pnpm"
             - name: "Download binaries"
               uses: actions/download-artifact@v4
@@ -621,7 +621,7 @@ jobs:
           - name: "Setup Node"
             uses: actions/setup-node@v4
             with:
-                node-version: 20.x
+                node-version: 22.x
                 cache: "pnpm"
           - name: "Generate typescript api"
             run: |
@@ -683,7 +683,7 @@ jobs:
             version: 9
         - uses: actions/setup-node@v4
           with:
-            node-version: 20.x
+            node-version: 22.x
             cache: "pnpm"
         - name: Create local folders
           run: |
@@ -720,7 +720,7 @@ jobs:
             - name: Setup node
               uses: actions/setup-node@v4
               with:
-                  node-version: 20.x
+                  node-version: 22.x
                   cache: "pnpm"
 
             - name: Create local folders
@@ -803,7 +803,7 @@ jobs:
             - name: Setup node
               uses: actions/setup-node@v4
               with:
-                  node-version: 20.x
+                  node-version: 22.x
                   cache: "pnpm"
 
             - name: Create local folders
@@ -850,7 +850,7 @@ jobs:
             - name: Setup node
               uses: actions/setup-node@v4
               with:
-                  node-version: 20.x
+                  node-version: 22.x
                   cache: "pnpm"
 
             - name: Create local folders

diff --git a/.github/workflows/run-zombienet-tests.yml b/.github/workflows/run-zombienet-tests.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
           cache: "pnpm"
 
       - name: Get test names

diff --git a/.github/workflows/runtime-release-issue.yml b/.github/workflows/runtime-release-issue.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - name: Download Original Tools
         uses: actions/download-artifact@v4
         with:

diff --git a/.github/workflows/upgrade-typescript-api.yml b/.github/workflows/upgrade-typescript-api.yml
@@ -58,10 +58,10 @@ jobs:
         uses: pnpm/[email protected]
         with:
           version: 9
-      - name: Use Node.js 20.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - name: Regenerate typescript api with new runtime metadata
         run: |
           cd typescript-api

diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.10.0
+          node-version: 22.11.0
       - name: Generate version bump issue
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.prettierignore b/.prettierignore
@@ -10,6 +10,9 @@
 **/.yarn
 test/tsconfig.json
 
+# Test data
+tmp
+
 # Spec/Wasm build directory
 **/build/
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -60,6 +60,7 @@ pallet-collator-assignment-runtime-api = { path = "pallets/collator-assignment/r
 pallet-configuration = { path = "pallets/configuration", default-features = false }
 pallet-data-preservers = { path = "pallets/data-preservers", default-features = false }
 pallet-data-preservers-runtime-api = { path = "pallets/data-preservers/runtime-api", default-features = false }
+pallet-external-validators = { path = "pallets/external-validators", default-features = false }
 pallet-inflation-rewards = { path = "pallets/inflation-rewards", default-features = false }
 pallet-initializer = { path = "pallets/initializer", default-features = false }
 pallet-invulnerables = { path = "pallets/invulnerables", default-features = false }

diff --git a/container-chains/nodes/frontier/src/command.rs b/container-chains/nodes/frontier/src/command.rs
@@ -313,7 +313,7 @@ pub fn run() -> Result<()> {
 
             runner.run_node_until_exit(|config| async move {
                 let relaychain_args = cli.relaychain_args();
-				let hwbench = (!cli.no_hardware_benchmarks).then_some(
+				let hwbench = (!cli.no_hardware_benchmarks).then(||
 					config.database.path().map(|database_path| {
 						let _ = std::fs::create_dir_all(database_path);
 						sc_sysinfo::gather_hwbench(Some(database_path))

diff --git a/container-chains/nodes/simple/src/command.rs b/container-chains/nodes/simple/src/command.rs
@@ -296,7 +296,7 @@ pub fn run() -> Result<()> {
             let collator_options = cli.run.collator_options();
 
             runner.run_node_until_exit(|config| async move {
-                let hwbench = (!cli.no_hardware_benchmarks).then_some(
+                let hwbench = (!cli.no_hardware_benchmarks).then(||
                     config.database.path().map(|database_path| {
                         let _ = std::fs::create_dir_all(database_path);
                         sc_sysinfo::gather_hwbench(Some(database_path))

diff --git a/node/src/command.rs b/node/src/command.rs
@@ -372,10 +372,12 @@ pub fn run() -> Result<()> {
                     .as_ref()
                     .expect("base_path is always set");
                 let hwbench = (!cmd.no_hardware_benchmarks)
-                    .then_some(Some(containers_base_path).map(|database_path| {
-                        let _ = std::fs::create_dir_all(database_path);
-                        sc_sysinfo::gather_hwbench(Some(database_path))
-                    }))
+                    .then(|| {
+                        Some(containers_base_path).map(|database_path| {
+                            let _ = std::fs::create_dir_all(database_path);
+                            sc_sysinfo::gather_hwbench(Some(database_path))
+                        })
+                    })
                     .flatten();
 
                 let polkadot_cli = solochain::relay_chain_cli_new(
@@ -413,7 +415,7 @@ pub fn run() -> Result<()> {
             let collator_options = cli.run.collator_options();
 
             runner.run_node_until_exit(|config| async move {
-				let hwbench = (!cli.no_hardware_benchmarks).then_some(
+				let hwbench = (!cli.no_hardware_benchmarks).then(||
 					config.database.path().map(|database_path| {
 						let _ = std::fs::create_dir_all(database_path);
 						sc_sysinfo::gather_hwbench(Some(database_path))