Merge pull request #4 from paritytech/master

Update to latest SDK

.config/zepter.yaml

@@ -27,7 +27,7 @@ workflows:
       ]
   # The umbrella crate uses more features, so we to check those too:
   check_umbrella:
-    - [ $check.0, '--features=serde,experimental,riscv,runtime,with-tracing,tuples-96,with-tracing', '-p=polkadot-sdk' ]
+    - [ $check.0, '--features=serde,experimental,runtime,with-tracing,tuples-96,with-tracing', '-p=polkadot-sdk' ]
   # Same as `check_*`, but with the `--fix` flag.
   default:
     - [ $check.0, '--fix' ]

.github/scripts/cmd/cmd.py

@@ -6,6 +6,7 @@
 import argparse
 import _help
 import importlib.util
+import re
 
 _HelpAction = _help._HelpAction
 
@@ -40,20 +41,20 @@ def setup_logging():
 setup_logging()
 
 """
-BENCH 
+BENCH
 """
 
 bench_example = '''**Examples**:
- Runs all benchmarks 
+ Runs all benchmarks
  %(prog)s
 
  Runs benchmarks for pallet_balances and pallet_multisig for all runtimes which have these pallets. **--quiet** makes it to output nothing to PR but reactions
  %(prog)s --pallet pallet_balances pallet_xcm_benchmarks::generic --quiet
- 
+
  Runs bench for all pallets for westend runtime and fails fast on first failed benchmark
  %(prog)s --runtime westend --fail-fast
- 
- Does not output anything and cleans up the previous bot's & author command triggering comments in PR 
+
+ Does not output anything and cleans up the previous bot's & author command triggering comments in PR
  %(prog)s --runtime westend rococo --pallet pallet_balances pallet_multisig --quiet --clean
 '''
 
@@ -67,14 +68,14 @@ def setup_logging():
 parser_bench.add_argument('--fail-fast', help='Fail fast on first failed benchmark', action='store_true')
 
 """
-FMT 
+FMT
 """
 parser_fmt = subparsers.add_parser('fmt', help='Formats code (cargo +nightly-VERSION fmt) and configs (taplo format)')
 for arg, config in common_args.items():
     parser_fmt.add_argument(arg, **config)
 
 """
-Update UI 
+Update UI
 """
 parser_ui = subparsers.add_parser('update-ui', help='Updates UI tests')
 for arg, config in common_args.items():
@@ -175,7 +176,15 @@ def main():
                     print(f'-- package_dir: {package_dir}')
                     print(f'-- manifest_path: {manifest_path}')
                     output_path = os.path.join(package_dir, "src", "weights.rs")
+                    # TODO: we can remove once all pallets in dev runtime are migrated to polkadot-sdk-frame
+                    try:
+                        uses_polkadot_sdk_frame = "true" in os.popen(f"cargo metadata --locked --format-version 1 --no-deps | jq -r '.packages[] | select(.name == \"{pallet.replace('_', '-')}\") | .dependencies | any(.name == \"polkadot-sdk-frame\")'").read()
+                    # Empty output from the previous os.popen command
+                    except StopIteration:
+                        uses_polkadot_sdk_frame = False
                     template = config['template']
+                    if uses_polkadot_sdk_frame and re.match(r"frame-(:?umbrella-)?weight-template\.hbs", os.path.normpath(template).split(os.path.sep)[-1]):
+                        template = "substrate/.maintain/frame-umbrella-weight-template.hbs"
                 else:
                     default_path = f"./{config['path']}/src/weights"
                     xcm_path = f"./{config['path']}/src/weights/xcm"
@@ -251,4 +260,4 @@ def main():
     print('🚀 Done')
 
 if __name__ == '__main__':
-    main()
+    main()

.github/scripts/cmd/test_cmd.py

@@ -13,7 +13,7 @@
         "path": "substrate/frame",
         "header": "substrate/HEADER-APACHE2",
         "template": "substrate/.maintain/frame-weight-template.hbs",
-        "bench_features": "runtime-benchmarks,riscv",
+        "bench_features": "runtime-benchmarks",
         "bench_flags": "--flag1 --flag2"
     },
     {
@@ -67,7 +67,7 @@ def setUp(self):
         self.patcher6 = patch('importlib.util.spec_from_file_location', return_value=MagicMock())
         self.patcher7 = patch('importlib.util.module_from_spec', return_value=MagicMock())
         self.patcher8 = patch('cmd.generate_prdoc.main', return_value=0)
-        
+
         self.mock_open = self.patcher1.start()
         self.mock_json_load = self.patcher2.start()
         self.mock_parse_args = self.patcher3.start()
@@ -101,27 +101,27 @@ def test_bench_command_normal_execution_all_runtimes(self):
             clean=False,
             image=None
         ), [])
-        
+
         self.mock_popen.return_value.read.side_effect = [
             "pallet_balances\npallet_staking\npallet_something\n",  # Output for dev runtime
             "pallet_balances\npallet_staking\npallet_something\n",  # Output for westend runtime
             "pallet_staking\npallet_something\n",                   # Output for rococo runtime - no pallet here
             "pallet_balances\npallet_staking\npallet_something\n",  # Output for asset-hub-westend runtime
             "./substrate/frame/balances/Cargo.toml\n",                # Mock manifest path for dev -> pallet_balances
         ]
-        
+
         with patch('sys.exit') as mock_exit:
             import cmd
             cmd.main()
             mock_exit.assert_not_called()
 
             expected_calls = [
                 # Build calls
-                call("forklift cargo build -p kitchensink-runtime --profile release --features=runtime-benchmarks,riscv"),
+                call("forklift cargo build -p kitchensink-runtime --profile release --features=runtime-benchmarks"),
                 call("forklift cargo build -p westend-runtime --profile release --features=runtime-benchmarks"),
                 call("forklift cargo build -p rococo-runtime --profile release --features=runtime-benchmarks"),
                 call("forklift cargo build -p asset-hub-westend-runtime --profile release --features=runtime-benchmarks"),
-                
+
                 call(get_mock_bench_output(
                     runtime='kitchensink',
                     pallets='pallet_balances',
@@ -162,7 +162,7 @@ def test_bench_command_normal_execution(self):
         self.mock_popen.return_value.read.side_effect = [
             "pallet_balances\npallet_staking\npallet_something\n",  # Output for westend runtime
         ]
-        
+
         with patch('sys.exit') as mock_exit:
             import cmd
             cmd.main()
@@ -171,7 +171,7 @@ def test_bench_command_normal_execution(self):
             expected_calls = [
                 # Build calls
                 call("forklift cargo build -p westend-runtime --profile release --features=runtime-benchmarks"),
-                
+
                 # Westend runtime calls
                 call(get_mock_bench_output(
                     runtime='westend',
@@ -205,7 +205,7 @@ def test_bench_command_normal_execution_xcm(self):
         self.mock_popen.return_value.read.side_effect = [
             "pallet_balances\npallet_staking\npallet_something\npallet_xcm_benchmarks::generic\n",  # Output for westend runtime
         ]
-        
+
         with patch('sys.exit') as mock_exit:
             import cmd
             cmd.main()
@@ -214,7 +214,7 @@ def test_bench_command_normal_execution_xcm(self):
             expected_calls = [
                 # Build calls
                 call("forklift cargo build -p westend-runtime --profile release --features=runtime-benchmarks"),
-                
+
                 # Westend runtime calls
                 call(get_mock_bench_output(
                     runtime='westend',
@@ -241,7 +241,7 @@ def test_bench_command_two_runtimes_two_pallets(self):
             "pallet_staking\npallet_balances\n",  # Output for westend runtime
             "pallet_staking\npallet_balances\n",  # Output for rococo runtime
         ]
-        
+
         with patch('sys.exit') as mock_exit:
             import cmd
             cmd.main()
@@ -309,7 +309,7 @@ def test_bench_command_one_dev_runtime(self):
 
             expected_calls = [
                 # Build calls
-                call("forklift cargo build -p kitchensink-runtime --profile release --features=runtime-benchmarks,riscv"),
+                call("forklift cargo build -p kitchensink-runtime --profile release --features=runtime-benchmarks"),
                 # Westend runtime calls
                 call(get_mock_bench_output(
                     runtime='kitchensink',
@@ -429,4 +429,4 @@ def test_prdoc_command(self, mock_system, mock_parse_args):
             self.mock_generate_prdoc_main.assert_called_with(mock_parse_args.return_value[0])
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()

.github/scripts/common/lib.sh

@@ -306,9 +306,10 @@ function import_gpg_keys() {
   EGOR="E6FC4D4782EB0FA64A4903CCDB7D3555DD3932D3"
   MORGAN="2E92A9D8B15D7891363D1AE8AF9E6C43F7F8C4CF"
   PARITY_RELEASES="90BD75EBBB8E95CB3DA6078F94A4029AB4B35DAE"
+  PARITY_RELEASES_SIGN_COMMITS="D8018FBB3F534D866A45998293C5FB5F6A367B51"
 
   echo "Importing GPG keys from $GPG_KEYSERVER"
-  for key in $SEC $EGOR $MORGAN $PARITY_RELEASES; do
+  for key in $SEC $EGOR $MORGAN $PARITY_RELEASES $PARITY_RELEASES_SIGN_COMMITS; do
     (
       echo "Importing GPG key $key"
       gpg --no-tty --quiet --keyserver $GPG_KEYSERVER --recv-keys $key

.github/scripts/release/build-deb.sh

@@ -9,8 +9,7 @@ cargo install --version 2.7.0 cargo-deb --locked -q
 echo "Using cargo-deb v$(cargo-deb --version)"
 echo "Building a Debian package for '$PRODUCT' in '$PROFILE' profile"
 
-# we need to start  the custom version with a didgit as requires it cargo-deb
-cargo deb --profile $PROFILE --no-strip --no-build -p $PRODUCT --deb-version 1-$VERSION
+cargo deb --profile $PROFILE --no-strip --no-build -p $PRODUCT --deb-version $VERSION
 
 deb=target/debian/$PRODUCT_*_amd64.deb
 

.github/workflows/build-publish-eth-rpc.yml

@@ -0,0 +1,79 @@
+name: Build and push ETH-RPC image
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review, labeled]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  IMAGE_NAME: "docker.io/paritypr/eth-rpc"
+
+jobs:
+  set-variables:
+    # This workaround sets the container image for each job using 'set-variables' job output.
+    # env variables don't work for PR from forks, so we need to use outputs.
+    runs-on: ubuntu-latest
+    outputs:
+      VERSION: ${{ steps.version.outputs.VERSION }}
+    steps:
+      - name: Define version
+        id: version
+        run: |
+          export COMMIT_SHA=${{ github.sha }}
+          export COMMIT_SHA_SHORT=${COMMIT_SHA:0:8}
+          export REF_NAME=${{ github.ref_name }}
+          export REF_SLUG=${REF_NAME//\//_}
+          VERSION=${REF_SLUG}-${COMMIT_SHA_SHORT}
+          echo "VERSION=${REF_SLUG}-${COMMIT_SHA_SHORT}" >> $GITHUB_OUTPUT
+          echo "set VERSION=${VERSION}"
+
+  build_docker:
+    name: Build docker image
+    runs-on: parity-large
+    needs: [set-variables]
+    env:
+      VERSION: ${{ needs.set-variables.outputs.VERSION }}
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./substrate/frame/revive/rpc/Dockerfile
+          push: false
+          tags: |
+            ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
+
+  build_push_docker:
+    name: Build and push docker image
+    runs-on: parity-large
+    if: github.ref == 'refs/heads/master'
+    needs: [set-variables]
+    env:
+      VERSION: ${{ needs.set-variables.outputs.VERSION }}
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.PARITYPR_DOCKERHUB_USERNAME }}
+          password: ${{ secrets.PARITYPR_DOCKERHUB_PASSWORD }}
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./substrate/frame/revive/rpc/Dockerfile
+          push: true
+          tags: |
+            ${{ env.IMAGE_NAME }}:${{ env.VERSION }}

.github/workflows/check-licenses.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc # v4.1.7
-      - uses: actions/setup-node@v4.0.4
+      - uses: actions/setup-node@v4.1.0
         with:
           node-version: "18.x"
           registry-url: "https://npm.pkg.github.com"
@@ -56,7 +56,7 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc # v4.1.7
-      - uses: actions/setup-node@v4.0.4
+      - uses: actions/setup-node@v4.1.0
         with:
           node-version: "18.x"
           registry-url: "https://npm.pkg.github.com"

.github/workflows/check-links.yml

@@ -33,7 +33,7 @@ jobs:
       - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc # v4.1.0 (22. Sep 2023)
 
       - name: Lychee link checker
-        uses: lycheeverse/lychee-action@2bb232618be239862e31382c5c0eaeba12e5e966 # for v1.9.1 (10. Jan 2024)
+        uses: lycheeverse/lychee-action@7cd0af4c74a61395d455af97419279d86aafaede # for v1.9.1 (10. Jan 2024)
         with:
           args: >-
             --config .config/lychee.toml

.github/workflows/check-semver.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
   workflow_dispatch:
+  merge_group:
 
 concurrency:
   group: check-semver-${{ github.event.pull_request.number || github.ref }}

.github/workflows/checks-quick.yml

@@ -102,7 +102,7 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc # v4.1.7
       - name: Setup Node.js
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.1.0
         with:
           node-version: "18.x"
           registry-url: "https://npm.pkg.github.com"

.github/workflows/checks.yml

@@ -32,8 +32,8 @@ jobs:
       - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc # v4.1.7
       - name: script
         run: |
-          forklift cargo clippy --all-targets --locked --workspace --quiet
-          forklift cargo clippy --all-targets --all-features --locked --workspace --quiet
+          cargo clippy --all-targets --locked --workspace --quiet
+          cargo clippy --all-targets --all-features --locked --workspace --quiet
   check-try-runtime:
     runs-on: ${{ needs.preflight.outputs.RUNNER }}
     needs: [preflight]

.github/workflows/misc-sync-templates.yml

@@ -83,6 +83,12 @@ jobs:
           homepage = "https://paritytech.github.io/polkadot-sdk/"
 
           [workspace]
+          EOF
+
+          [ ${{ matrix.template }} != "solochain" ] && echo "# Leave out the node compilation from regular template usage." \
+            && echo "\"default-members\" = [\"pallets/template\", \"runtime\"]" >> Cargo.toml
+          [ ${{ matrix.template }} == "solochain" ] && echo "# The node isn't yet replaceable by Omni Node."
+          cat << EOF >> Cargo.toml
           members = [
               "node",
               "pallets/template",