diff --git a/.github/pr-custom-review.yml b/.github/pr-custom-review.yml new file mode 100644 index 0000000000..4b6b1799d5 --- /dev/null +++ b/.github/pr-custom-review.yml @@ -0,0 +1,29 @@ +# 🔒 PROTECTED: Changes to locks-review-team should be approved by the current locks-review-team +locks-review-team: cumulus-locks-review +team-leads-team: polkadot-review +action-review-team: ci + +rules: + - name: Runtime files + check_type: changed_files + condition: ^polkadot-parachains/(statemine|statemint)/src/[^/]+\.rs$ + all_distinct: + - min_approvals: 1 + teams: + - cumulus-locks-review + - min_approvals: 1 + teams: + - polkadot-review + + - name: Core developers + check_type: changed_files + condition: + include: .* + exclude: ^polkadot-parachains/(statemine|statemint)/src/[^/]+\.rs$ + min_approvals: 2 + teams: + - core-devs + +prevent-review-request: + teams: + - core-devs diff --git a/.github/workflows/check-labels.yml b/.github/workflows/check-labels.yml index f150054202..28d38d3ecd 100644 --- a/.github/workflows/check-labels.yml +++ b/.github/workflows/check-labels.yml @@ -15,7 +15,7 @@ jobs: ref: ${{ github.event.pull_request.head.ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Check labels - run: bash ${{ github.workspace }}/scripts/github/check_labels.sh + run: bash ${{ github.workspace }}/scripts/ci/github/check_labels.sh env: GITHUB_PR: ${{ github.event.pull_request.number }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/extrinsic-ordering-check-from-bin.yml b/.github/workflows/extrinsic-ordering-check-from-bin.yml index 2584b170bc..9998608c71 100644 --- a/.github/workflows/extrinsic-ordering-check-from-bin.yml +++ b/.github/workflows/extrinsic-ordering-check-from-bin.yml @@ -61,7 +61,7 @@ jobs: $CMD >> output.txt sed -z -i 's/\n\n/\n/g' output.txt cat output.txt | egrep -n -i '' - SUMMARY=$(./scripts/extrinsic-ordering-filter.sh output.txt) + SUMMARY=$(./scripts/ci/extrinsic-ordering-filter.sh output.txt) echo -e $SUMMARY echo -e $SUMMARY >> output.txt diff --git a/.github/workflows/pr-custom-review.yml b/.github/workflows/pr-custom-review.yml new file mode 100644 index 0000000000..322403da03 --- /dev/null +++ b/.github/workflows/pr-custom-review.yml @@ -0,0 +1,23 @@ +name: Assign reviewers + +on: + pull_request: + branches: + - master + - main + types: + - opened + - reopened + - synchronize + - review_requested + - review_request_removed + pull_request_review: + +jobs: + pr-custom-review: + runs-on: ubuntu-latest + steps: + - name: pr-custom-review + uses: paritytech/pr-custom-review@v2 + with: + token: ${{ secrets.PRCR_TOKEN }} diff --git a/.github/workflows/release-02_create-draft.yml b/.github/workflows/release-02_create-draft.yml index 3bf4411ac8..8e7fa38ad4 100644 --- a/.github/workflows/release-02_create-draft.yml +++ b/.github/workflows/release-02_create-draft.yml @@ -5,16 +5,23 @@ on: inputs: ref1: description: The 'from' tag to use for the diff - default: statemine-v5.0.0 + default: parachains-v7.0.0 required: true ref2: description: The 'to' tag to use for the diff - default: release-statemine-v6 + default: release-parachains-v8.0.0 required: true + release_type: + description: Pass "client" for client releases, leave empty otherwise + required: false pre_release: description: For pre-releases default: "true" required: true + notification: + description: Whether or not to notify over Matrix + default: "true" + required: true jobs: get-rust-versions: @@ -30,6 +37,8 @@ jobs: echo "::set-output name=stable::$(rustc +stable --version)" echo "::set-output name=nightly::$(rustc +nightly --version)" + # We do not skip the entire job for client builds (although we don't need it) + # because it is a dep of the next job. However we skip the time consuming steps. build-runtimes: runs-on: ubuntu-latest strategy: @@ -37,11 +46,12 @@ jobs: runtime: ["shell", "statemine", "statemint", "westmint", "rococo-parachain", "canvas-kusama"] steps: - name: Checkout sources - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ github.event.inputs.ref2 }} - name: Cache target dir + if: ${{ github.event.inputs.release_type != 'client' }} uses: actions/cache@v2 with: path: "${{ github.workspace }}/runtime/${{ matrix.runtime }}/target" @@ -51,6 +61,7 @@ jobs: srtool-target- - name: Build ${{ matrix.runtime }} runtime + if: ${{ github.event.inputs.release_type != 'client' }} id: srtool_build uses: chevdor/srtool-actions@v0.3.0 with: @@ -59,18 +70,21 @@ jobs: runtime_dir: polkadot-parachains/${{ matrix.runtime }} - name: Store srtool digest to disk + if: ${{ github.event.inputs.release_type != 'client' }} run: | echo '${{ steps.srtool_build.outputs.json }}' | \ - jq > ${{ matrix.runtime }}_srtool_output.json + jq > ${{ matrix.runtime }}-srtool-digest.json - name: Upload ${{ matrix.runtime }} srtool json - uses: actions/upload-artifact@v2 + if: ${{ github.event.inputs.release_type != 'client' }} + uses: actions/upload-artifact@v3 with: name: ${{ matrix.runtime }}-srtool-json - path: ${{ matrix.runtime }}_srtool_output.json + path: ${{ matrix.runtime }}-srtool-digest.json - name: Upload ${{ matrix.runtime }} runtime - uses: actions/upload-artifact@v2 + if: ${{ github.event.inputs.release_type != 'client' }} + uses: actions/upload-artifact@v3 with: name: ${{ matrix.runtime }}-runtime path: | @@ -84,7 +98,7 @@ jobs: asset_upload_url: ${{ steps.create-release.outputs.upload_url }} steps: - name: Checkout sources - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 path: cumulus @@ -99,7 +113,7 @@ jobs: - name: Prepare tooling run: | - cd cumulus/scripts/changelog + cd cumulus/scripts/ci/changelog gem install bundler changelogerator:0.9.1 bundle install changelogerator --help @@ -116,39 +130,47 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NO_CACHE: 1 DEBUG: 1 - SHELL_DIGEST: ${{ github.workspace}}/shell-srtool-json/shell_srtool_output.json - WESTMINT_DIGEST: ${{ github.workspace}}/westmint-srtool-json/westmint_srtool_output.json - STATEMINE_DIGEST: ${{ github.workspace}}/statemine-srtool-json/statemine_srtool_output.json - STATEMINT_DIGEST: ${{ github.workspace}}/statemint-srtool-json/statemint_srtool_output.json - ROCOCO_PARA_DIGEST: ${{ github.workspace}}/rococo-parachain-srtool-json/rococo-parachain_srtool_output.json - CANVAS_KUSAMA_DIGEST: ${{ github.workspace}}/canvas-kusama-srtool-json/canvas-kusama_srtool_output.json + SHELL_DIGEST: ${{ github.workspace}}/shell-srtool-json/shell-srtool-digest.json + WESTMINT_DIGEST: ${{ github.workspace}}/westmint-srtool-json/westmint-srtool-digest.json + STATEMINE_DIGEST: ${{ github.workspace}}/statemine-srtool-json/statemine-srtool-digest.json + STATEMINT_DIGEST: ${{ github.workspace}}/statemint-srtool-json/statemint-srtool-digest.json + ROCOCO_PARA_DIGEST: ${{ github.workspace}}/rococo-parachain-srtool-json/rococo-parachain-srtool-digest.json + CANVAS_KUSAMA_DIGEST: ${{ github.workspace}}/canvas-kusama-srtool-json/canvas-kusama-srtool-digest.json REF1: ${{ github.event.inputs.ref1 }} REF2: ${{ github.event.inputs.ref2 }} PRE_RELEASE: ${{ github.event.inputs.pre_release }} - HIDE_SRTOOL_ROCOCO: false - HIDE_SRTOOL_SHELL: false + RELEASE_TYPE: ${{ github.event.inputs.release_type }} run: | - find ${{env.GITHUB_WORKSPACE}} -type f -name "*_srtool_output.json" - ls -al $SHELL_DIGEST - ls -al $WESTMINT_DIGEST - ls -al $STATEMINE_DIGEST - ls -al $STATEMINT_DIGEST - ls -al $ROCOCO_PARA_DIGEST - ls -al $CANVAS_KUSAMA_DIGEST + find ${{env.GITHUB_WORKSPACE}} -type f -name "*-srtool-digest.json" + + if [ "$RELEASE_TYPE" == "client" ]; then + ls -al $SHELL_DIGEST || true + ls -al $WESTMINT_DIGEST || true + ls -al $STATEMINE_DIGEST || true + ls -al $STATEMINT_DIGEST || true + ls -al $ROCOCO_PARA_DIGEST || true + ls -al $CANVAS_KUSAMA_DIGEST || true + fi echo "The diff will be computed from $REF1 to $REF2" - cd cumulus/scripts/changelog + cd cumulus/scripts/ci/changelog ./bin/changelog $REF1 $REF2 release-notes.md - ls -al release-notes.md - ls -al context.json + ls -al {release-notes.md,context.json} || true - - name: Archive artifact context.json - uses: actions/upload-artifact@v2 + - name: Archive srtool json + if: ${{ github.event.inputs.release_type != 'client' }} + uses: actions/upload-artifact@v3 + with: + name: srtool-json + path: | + **/*-srtool-digest.json + + - name: Archive context artifact + uses: actions/upload-artifact@v3 with: name: release-notes-context path: | context.json - **/*_srtool_output.json - name: Create draft release id: create-release @@ -156,12 +178,13 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: parachains-${{ github.ref }} - release_name: Parachains ${{ github.ref }} - body_path: ./cumulus/scripts/changelog/release-notes.md + body_path: ./cumulus/scripts/ci/changelog/release-notes.md + tag_name: ${{ github.event.inputs.ref2 }} + release_name: ${{ github.event.inputs.ref2 }} draft: true publish-runtimes: + if: ${{ github.event.inputs.release_type != 'client' }} runs-on: ubuntu-latest needs: ["publish-draft-release"] env: @@ -171,7 +194,7 @@ jobs: runtime: ["shell", "statemine", "statemint", "westmint", "rococo-parachain", "canvas-kusama"] steps: - name: Checkout sources - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ github.event.inputs.ref2 }} @@ -185,7 +208,7 @@ jobs: - name: Get runtime version for ${{ matrix.runtime }} id: get-runtime-ver run: | - echo "require './scripts/github/runtime-version.rb'" > script.rb + echo "require './scripts/ci/github/runtime-version.rb'" > script.rb echo "puts get_runtime(runtime: \"${{ matrix.runtime }}\", runtime_dir: \"$RUNTIME_DIR\")" >> script.rb echo "Current folder: $PWD" @@ -194,11 +217,12 @@ jobs: echo "Found version: >$runtime_ver<" echo "::set-output name=runtime_ver::$runtime_ver" - - name: Fix parachain runtime name + - name: Fix runtime name id: fix-runtime-path run: | cd "${{ matrix.runtime }}-runtime/" mv "$(sed 's/-parachain/_parachain/' <<< ${{ matrix.runtime }})_runtime.compact.compressed.wasm" "${{ matrix.runtime }}_runtime.compact.compressed.wasm" || true + mv "$(sed 's/-kusama/_kusama/' <<< ${{ matrix.runtime }})_runtime.compact.compressed.wasm" "${{ matrix.runtime }}_runtime.compact.compressed.wasm" || true - name: Upload compressed ${{ matrix.runtime }} wasm uses: actions/upload-release-asset@v1 @@ -211,6 +235,7 @@ jobs: asset_content_type: application/wasm post_to_matrix: + if: ${{ github.event.inputs.notification == 'true' }} runs-on: ubuntu-latest needs: publish-draft-release steps: @@ -220,7 +245,7 @@ jobs: room_id: ${{ secrets.INTERNAL_CUMULUS_MATRIX_ROOM_ID }} access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }} message: | - **New draft for ${{ github.repository }}**: ${{ github.ref }}
+ **New draft for ${{ github.repository }}**: ${{ github.event.inputs.ref2 }}
Draft release created: [draft](${{ needs.publish-draft-release.outputs.release_url }}) diff --git a/.github/workflows/release-10_docker-manual.yml b/.github/workflows/release-10_docker-manual.yml index f6a7604ac8..142f456805 100644 --- a/.github/workflows/release-10_docker-manual.yml +++ b/.github/workflows/release-10_docker-manual.yml @@ -72,8 +72,9 @@ jobs: - name: Build injected image env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_ORG: parity run: | - export OWNER=$DOCKERHUB_USERNAME + export OWNER=$DOCKERHUB_ORG mkdir -p target/release cp -f $BINARY* target/release/ ./docker/scripts/build-injected-image.sh @@ -87,9 +88,10 @@ jobs: - name: Tag and Publish env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_ORG: parity run: | - docker run --pull never --rm $DOCKERHUB_USERNAME/$BINARY --version - VERSION=$(docker run --pull never --rm $DOCKERHUB_USERNAME/$BINARY --version | awk '{ print $2 }' ) + docker run --pull never --rm $DOCKERHUB_ORG/$BINARY --version + VERSION=$(docker run --pull never --rm $DOCKERHUB_ORG/$BINARY --version | awk '{ print $2 }' ) SEMVER=$( echo $VERSION | cut -f1 -d- ) GITREF=$( echo $VERSION | cut -f2 -d- ) PRE=${{ github.event.inputs.prerelease }} @@ -107,15 +109,15 @@ jobs: echo "PRE_STR=$PRE_STR" echo "TAG=$TAG" - docker tag $DOCKERHUB_USERNAME/$BINARY $DOCKERHUB_USERNAME/$BINARY:$TAG - docker push $DOCKERHUB_USERNAME/$BINARY:$TAG + docker tag $DOCKERHUB_ORG/$BINARY $DOCKERHUB_ORG/$BINARY:$TAG + docker push $DOCKERHUB_ORG/$BINARY:$TAG if [[ $PRE != "true" ]]; then - docker tag $DOCKERHUB_USERNAME/$BINARY $DOCKERHUB_USERNAME/$BINARY:latest - docker tag $DOCKERHUB_USERNAME/$BINARY $DOCKERHUB_USERNAME/$BINARY:$SEMVER + docker tag $DOCKERHUB_ORG/$BINARY $DOCKERHUB_ORG/$BINARY:latest + docker tag $DOCKERHUB_ORG/$BINARY $DOCKERHUB_ORG/$BINARY:$SEMVER - docker push $DOCKERHUB_USERNAME/$BINARY:latest - docker push $DOCKERHUB_USERNAME/$BINARY:$SEMVER + docker push $DOCKERHUB_ORG/$BINARY:latest + docker push $DOCKERHUB_ORG/$BINARY:$SEMVER fi - docker images | grep $DOCKERHUB_USERNAME/$BINARY + docker images | grep $DOCKERHUB_ORG/$BINARY diff --git a/.github/workflows/release-10_docker.yml b/.github/workflows/release-10_docker.yml index 361b36166b..4d07cad290 100644 --- a/.github/workflows/release-10_docker.yml +++ b/.github/workflows/release-10_docker.yml @@ -73,8 +73,9 @@ jobs: - name: Build injected image env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_ORG: parity run: | - export OWNER=$DOCKERHUB_USERNAME + export OWNER=$DOCKERHUB_ORG mkdir -p target/release cp -f $BINARY* target/release/ ./docker/scripts/build-injected-image.sh @@ -88,9 +89,10 @@ jobs: - name: Tag and Publish env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_ORG: parity run: | - docker run --pull never --rm $DOCKERHUB_USERNAME/$BINARY --version - VERSION=$(docker run --pull never --rm $DOCKERHUB_USERNAME/$BINARY --version | awk '{ print $2 }' ) + docker run --pull never --rm $DOCKERHUB_ORG/$BINARY --version + VERSION=$(docker run --pull never --rm $DOCKERHUB_ORG/$BINARY --version | awk '{ print $2 }' ) SEMVER=$( echo $VERSION | cut -f1 -d- ) GITREF=$( echo $VERSION | cut -f2 -d- ) PRE=${{ github.event.release.prerelease }} @@ -108,15 +110,15 @@ jobs: echo "PRE_STR=$PRE_STR" echo "TAG=$TAG" - docker tag $DOCKERHUB_USERNAME/$BINARY $DOCKERHUB_USERNAME/$BINARY:$TAG - docker push $DOCKERHUB_USERNAME/$BINARY:$TAG + docker tag $DOCKERHUB_ORG/$BINARY $DOCKERHUB_ORG/$BINARY:$TAG + docker push $DOCKERHUB_ORG/$BINARY:$TAG if [[ $PRE != "true" ]]; then - docker tag $DOCKERHUB_USERNAME/$BINARY $DOCKERHUB_USERNAME/$BINARY:latest - docker tag $DOCKERHUB_USERNAME/$BINARY $DOCKERHUB_USERNAME/$BINARY:$SEMVER + docker tag $DOCKERHUB_ORG/$BINARY $DOCKERHUB_ORG/$BINARY:latest + docker tag $DOCKERHUB_ORG/$BINARY $DOCKERHUB_ORG/$BINARY:$SEMVER - docker push $DOCKERHUB_USERNAME/$BINARY:latest - docker push $DOCKERHUB_USERNAME/$BINARY:$SEMVER + docker push $DOCKERHUB_ORG/$BINARY:latest + docker push $DOCKERHUB_ORG/$BINARY:$SEMVER fi - docker images | grep $DOCKERHUB_USERNAME/$BINARY + docker images | grep $DOCKERHUB_ORG/$BINARY diff --git a/.gitignore b/.gitignore index 11807c3e71..9b34b3bb43 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ polkadot_argument_parsing **/node_modules **/chains/ *.iml +.env diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 04151c92d4..2d88762bb5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,16 +8,33 @@ stages: - test - publish + - benchmarks-build + - benchmarks-run -variables: &default-vars +default: + interruptible: true + retry: + max: 2 + when: + - runner_system_failure + - unknown_failure + - api_failure + +variables: GIT_STRATEGY: fetch GIT_DEPTH: 100 CARGO_INCREMENTAL: 0 - CARGO_TARGET_DIR: "/ci-cache/${CI_PROJECT_NAME}/targets/${CI_COMMIT_REF_NAME}/${CI_JOB_NAME}" CI_IMAGE: "paritytech/ci-linux:production" DOCKER_OS: "debian:stretch" ARCH: "x86_64" - WASM_BUILD_WORKSPACE_HINT: "/builds/parity/cumulus/" + +.collect-artifacts: &collect-artifacts + artifacts: + name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}" + when: on_success + expire_in: 1 days + paths: + - ./artifacts/ .rust-info-script: &rust-info-script - rustup show @@ -25,38 +42,41 @@ variables: &default-vars - rustup +nightly show - cargo +nightly --version - bash --version - - sccache -s .publish-refs: &publish-refs rules: - - if: $CI_PIPELINE_SOURCE == "web" + - if: $CI_PIPELINE_SOURCE == "web" && + $CI_COMMIT_REF_NAME == "master" # run from web and on master branch + - if: $CI_PIPELINE_SOURCE == "web" && + $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # run from web and on version tag (i.e. v1.0, v2.1rc1) - if: $CI_PIPELINE_SOURCE == "schedule" - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1 +# run benchmarks manually only on release-parachains-v* branch +.benchmarks-manual-refs: &benchmarks-manual-refs + rules: + - if: $CI_PIPELINE_SOURCE == "web" && + $CI_COMMIT_REF_NAME =~ /^release-parachains-v[0-9]+\.[0-9]+.*$/ # run from web and on branch release-parachains-v* (i.e. 1.0, 2.1rc1) + when: manual + - if: $CI_COMMIT_REF_NAME =~ /^release-parachains-v[0-9]+\.[0-9]+.*$/ # i.e. release-parachains-v1.0, release-parachains-v2.1rc1 + when: manual + +# run benchmarks only on release-parachains-v* branch +.benchmarks-refs: &benchmarks-refs + rules: + - if: $CI_PIPELINE_SOURCE == "web" && + $CI_COMMIT_REF_NAME =~ /^release-parachains-v[0-9]+\.[0-9]+.*$/ # run from web and on branch release-parachains-v* (i.e. 1.0, 2.1rc1) + - if: $CI_COMMIT_REF_NAME =~ /^release-parachains-v[0-9]+\.[0-9]+.*$/ # i.e. release-parachains-v1.0, release-parachains-v2.1rc1 + .docker-env: &docker-env image: "${CI_IMAGE}" before_script: - *rust-info-script - - ./scripts/ci/pre_cache.sh - - sccache -s - retry: - max: 2 - when: - - runner_system_failure - - unknown_failure - - api_failure - interruptible: true tags: - linux-docker .kubernetes-env: &kubernetes-env - retry: - max: 2 - when: - - runner_system_failure - - unknown_failure - - api_failure - interruptible: true + image: "${CI_IMAGE}" tags: - kubernetes-parity-build @@ -87,7 +107,6 @@ test-linux-stable: - if: $CI_PIPELINE_SOURCE == "schedule" <<: *collect-artifacts variables: - <<: *default-vars # Enable debug assertions since we are running optimized builds for testing # but still want to have debug assertions. RUSTFLAGS: "-Cdebug-assertions=y -Dwarnings" @@ -139,7 +158,6 @@ check-rustdoc: stage: test <<: *docker-env variables: - <<: *default-vars SKIP_WASM_BUILD: 1 RUSTDOCFLAGS: "-Dwarnings" script: @@ -172,3 +190,48 @@ publish-s3: after_script: - aws s3 ls s3://${BUCKET}/${PREFIX}/latest/ --recursive --human-readable --summarize + +#### stage: benchmarks +# Work only on release-parachains-v* branches + +benchmarks-build: + stage: benchmarks-build + <<: *docker-env + <<: *collect-artifacts + <<: *benchmarks-manual-refs + script: + - time cargo build --profile production --locked --features runtime-benchmarks + - mkdir artifacts + - cp $CARGO_TARGET_DIR/production/polkadot-collator ./artifacts/ + +benchmarks: + stage: benchmarks-run + before_script: + - *rust-info-script + <<: *collect-artifacts + <<: *benchmarks-refs + script: + - ./scripts/benchmarks-ci.sh statemine > ./artifacts/bench-statemine.log + - ./scripts/benchmarks-ci.sh statemint > ./artifacts/bench-statemint.log + - ./scripts/benchmarks-ci.sh westmint > ./artifacts/bench-westmint.log + - git status + - export BRANCHNAME="${CI_COMMIT_BRANCH}-weights" + # Set git config + - rm -rf .git/config + - git config --global user.email "${GITHUB_EMAIL}" + - git config --global user.name "${GITHUB_USER}" + - git config remote.origin.url "https://${GITHUB_USER}:${GITHUB_TOKEN}@github.com:/paritytech/${CI_PROJECT_NAME}.git" + - git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" + # push results to github + - git checkout -b $BRANCHNAME + - git add polkadot-parachains/* + - git commit -m "[benchmarks] pr with wieghts" + - git push origin $BRANCHNAME + # create PR + - curl -u ${GITHUB_USER}:${GITHUB_TOKEN} + -d '{"title":"[benchmarks] Update weights","body":"This PR is generated automatically by CI.","head":"'$BRANCHNAME'","base":"'${CI_COMMIT_BRANCH}'"}' + -X POST https://api.github.com/repos/paritytech/${CI_PROJECT_NAME}/pulls + after_script: + - rm -rf .git/config + tags: + - weights diff --git a/CODEOWNERS b/CODEOWNERS index 3810c3101c..bae050d50c 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -19,9 +19,5 @@ # CI /.github/ @paritytech/ci @chevdor /.gitlab-ci.yml @paritytech/ci -/scripts/ci/ @paritytech/ci -/scripts/github/ @paritytech/ci @chevdor -/scripts/extrinsic-ordering-filter.sh @paritytech/ci @chevdor +/scripts/ci/ @paritytech/ci @chevdor -# CHANGELOG -/scripts/changelog/ @chevdor diff --git a/Cargo.lock b/Cargo.lock index 1c74d08731..a985ad536e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -44,7 +44,7 @@ checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if 1.0.0", "cipher", - "cpufeatures 0.2.1", + "cpufeatures 0.2.2", "opaque-debug 0.3.0", ] @@ -68,7 +68,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.5", + "getrandom 0.2.6", "once_cell", "version_check", ] @@ -202,9 +202,9 @@ dependencies = [ [[package]] name = "async-global-executor" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c026b7e44f1316b567ee750fea85103f87fcb80792b860e979f221259796ca0a" +checksum = "c290043c9a95b05d45e952fb6383c67bcb61471f60cfa21e890dba6654234f43" dependencies = [ "async-channel", "async-executor", @@ -272,9 +272,9 @@ dependencies = [ [[package]] name = "async-std" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952" +checksum = "52580991739c5cdb36cde8b2a516371c0a3b70dda36d916cc08b82372916808c" dependencies = [ "async-attributes", "async-channel", @@ -320,9 +320,9 @@ checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" [[package]] name = "async-trait" -version = "0.1.52" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" +checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" dependencies = [ "proc-macro2", "quote", @@ -394,7 +394,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ "futures-core", - "getrandom 0.2.5", + "getrandom 0.2.6", "instant", "pin-project-lite 0.2.8", "rand 0.8.5", @@ -411,7 +411,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide", + "miniz_oxide 0.4.4", "object", "rustc-demangle", ] @@ -442,9 +442,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "base64ct" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71acf5509fc522cce1b100ac0121c635129bfd4d91cdf036bcc9b9935f97ccf5" +checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179" [[package]] name = "beef" @@ -458,17 +458,19 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "beefy-primitives", "fnv", "futures 0.3.21", + "futures-timer", "hex", "log", "parity-scale-codec", "parking_lot 0.12.0", "sc-chain-spec", "sc-client-api", + "sc-finality-grandpa", "sc-keystore", "sc-network", "sc-network-gossip", @@ -477,8 +479,10 @@ dependencies = [ "sp-application-crypto", "sp-arithmetic", "sp-blockchain", + "sp-consensus", "sp-core", "sp-keystore", + "sp-mmr-primitives", "sp-runtime", "substrate-prometheus-endpoint", "thiserror", @@ -488,7 +492,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -511,12 +515,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "parity-scale-codec", "scale-info", @@ -732,8 +736,9 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ + "bp-runtime", "finality-grandpa", "frame-support", "parity-scale-codec", @@ -748,7 +753,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bp-runtime", "frame-support", @@ -760,7 +765,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bitvec", "bp-runtime", @@ -770,13 +775,14 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", + "sp-core", "sp-std", ] [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bp-messages", "bp-runtime", @@ -794,7 +800,7 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -811,7 +817,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "frame-support", "hash-db", @@ -829,7 +835,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -844,7 +850,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -859,12 +865,13 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bp-message-dispatch", "bp-messages", "bp-runtime", "frame-support", + "frame-system", "hash-db", "pallet-bridge-dispatch", "pallet-bridge-grandpa", @@ -872,6 +879,7 @@ dependencies = [ "pallet-transaction-payment", "parity-scale-codec", "scale-info", + "sp-api", "sp-core", "sp-runtime", "sp-state-machine", @@ -1055,7 +1063,7 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.6", + "semver 1.0.7", "serde", "serde_json", ] @@ -1196,9 +1204,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.6" +version = "3.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123" +checksum = "71c47df61d9e16dc010b55dba1952a57d8c215dbb533fd13cdd13369aac73b1c" dependencies = [ "atty", "bitflags", @@ -1213,9 +1221,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.1.4" +version = "3.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da95d038ede1a964ce99f49cbe27a7fb538d1da595e4b4f70b8c8f338d17bf16" +checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1" dependencies = [ "heck 0.4.0", "proc-macro-error", @@ -1224,6 +1232,18 @@ dependencies = [ "syn", ] +[[package]] +name = "coarsetime" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "454038500439e141804c655b4cd1bc6a70bcb95cd2bc9463af5661b6956f0e46" +dependencies = [ + "libc", + "once_cell", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + [[package]] name = "concurrent-queue" version = "1.2.2" @@ -1287,27 +1307,27 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" dependencies = [ "libc", ] [[package]] name = "cranelift-bforest" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62fc68cdb867b7d27b5f33cd65eb11376dfb41a2d09568a1a2c2bc1dc204f4ef" +checksum = "38faa2a16616c8e78a18d37b4726b98bfd2de192f2fdc8a39ddf568a408a0f75" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31253a44ab62588f8235a996cc9b0636d98a299190069ced9628b8547329b47a" +checksum = "26f192472a3ba23860afd07d2b0217dc628f21fcc72617aa1336d98e1671f33b" dependencies = [ "cranelift-bforest", "cranelift-codegen-meta", @@ -1322,33 +1342,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a20ab4627d30b702fb1b8a399882726d216b8164d3b3fa6189e3bf901506afe" +checksum = "0f32ddb89e9b89d3d9b36a5b7d7ea3261c98235a76ac95ba46826b8ec40b1a24" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6687d9668dacfed4468361f7578d86bded8ca4db978f734d9b631494bebbb5b8" +checksum = "01fd0d9f288cc1b42d9333b7a776b17e278fc888c28e6a0f09b5573d45a150bc" [[package]] name = "cranelift-entity" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77c5d72db97ba2cb36f69037a709edbae0d29cb25503775891e7151c5c874bf" +checksum = "9e3bfe172b83167604601faf9dc60453e0d0a93415b57a9c4d1a7ae6849185cf" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426dca83f63c7c64ea459eb569aadc5e0c66536c0042ed5d693f91830e8750d0" +checksum = "a006e3e32d80ce0e4ba7f1f9ddf66066d052a8c884a110b91d05404d6ce26dce" dependencies = [ "cranelift-codegen", "log", @@ -1358,9 +1378,9 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8007864b5d0c49b026c861a15761785a2871124e401630c03ef1426e6d0d559e" +checksum = "501241b0cdf903412ec9075385ac9f2b1eb18a89044d1538e97fab603231f70c" dependencies = [ "cranelift-codegen", "libc", @@ -1369,9 +1389,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.80.1" +version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94cf12c071415ba261d897387ae5350c4d83c238376c8c5a96514ecfa2ea66a3" +checksum = "16d9e4211bbc3268042a96dd4de5bd979cda22434991d035f5f8eacba987fad2" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1432,9 +1452,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" +checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1453,10 +1473,11 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9" +checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" dependencies = [ + "autocfg", "cfg-if 1.0.0", "crossbeam-utils", "lazy_static", @@ -1465,10 +1486,20 @@ dependencies = [ ] [[package]] -name = "crossbeam-utils" -version = "0.8.7" +name = "crossbeam-queue" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6" +checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ "cfg-if 1.0.0", "lazy_static", @@ -1555,9 +1586,9 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" +checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" dependencies = [ "quote", "syn", @@ -1587,7 +1618,7 @@ dependencies = [ name = "cumulus-client-cli" version = "0.1.0" dependencies = [ - "clap 3.1.6", + "clap 3.1.8", "sc-cli", "sc-service", "url 2.2.2", @@ -2071,7 +2102,7 @@ dependencies = [ "cumulus-primitives-core", "derive_more", "futures 0.3.21", - "jsonrpsee-core 0.9.0", + "jsonrpsee-core", "parity-scale-codec", "parking_lot 0.12.0", "polkadot-overseer", @@ -2096,7 +2127,7 @@ dependencies = [ "cumulus-relay-chain-interface", "futures 0.3.21", "futures-timer", - "jsonrpsee 0.9.0", + "jsonrpsee", "parity-scale-codec", "parking_lot 0.12.0", "polkadot-service", @@ -2393,9 +2424,9 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", "redox_users", @@ -2481,9 +2512,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed12bbf7b5312f8da1c2722bc06d8c6b12c2d86a7fb35a194c7f3e6fc2bbe39" +checksum = "3d5c4b5e5959dc2c2b89918d8e2cc40fcdd623cef026ed09d2f0ee05199dc8e4" dependencies = [ "signature", ] @@ -2540,18 +2571,18 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.6.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0" +checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb" dependencies = [ "enumflags2_derive", ] [[package]] name = "enumflags2_derive" -version = "0.6.4" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" +checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" dependencies = [ "proc-macro2", "quote", @@ -2646,6 +2677,7 @@ dependencies = [ "fs-err", "proc-macro2", "quote", + "syn", ] [[package]] @@ -2759,15 +2791,15 @@ checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" [[package]] name = "flate2" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" dependencies = [ "cfg-if 1.0.0", "crc32fast", "libc", "libz-sys", - "miniz_oxide", + "miniz_oxide 0.5.1", ] [[package]] @@ -2779,7 +2811,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "parity-scale-codec", ] @@ -2797,7 +2829,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-support", "frame-system", @@ -2819,13 +2851,14 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "Inflector", "chrono", - "clap 3.1.6", + "clap 3.1.8", "frame-benchmarking", "frame-support", + "frame-system", "handlebars", "hash-db", "hex", @@ -2836,6 +2869,7 @@ dependencies = [ "memory-db", "parity-scale-codec", "rand 0.8.5", + "sc-block-builder", "sc-cli", "sc-client-api", "sc-client-db", @@ -2849,18 +2883,20 @@ dependencies = [ "sp-core", "sp-database", "sp-externalities", + "sp-inherents", "sp-keystore", "sp-runtime", "sp-state-machine", "sp-std", "sp-storage", "sp-trie", + "thousands", ] [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -2871,7 +2907,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2887,7 +2923,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-support", "frame-system", @@ -2915,7 +2951,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "bitflags", "frame-metadata", @@ -2944,7 +2980,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2956,7 +2992,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.3", @@ -2968,7 +3004,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "proc-macro2", "quote", @@ -2978,7 +3014,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-support", "log", @@ -2995,7 +3031,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -3010,7 +3046,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "parity-scale-codec", "sp-api", @@ -3019,7 +3055,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-support", "sp-api", @@ -3246,9 +3282,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" +checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ "cfg-if 1.0.0", "libc", @@ -3297,9 +3333,9 @@ dependencies = [ [[package]] name = "gloo-timers" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d12a7f4e95cfe710f1d624fb1210b7d961a5fb05c4fd942f4feab06e61f590e" +checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" dependencies = [ "futures-channel", "futures-core", @@ -3320,9 +3356,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62eeb471aa3e3c9197aa4bfeabfe02982f6dc96f750486c0bb0009ac58b26d2b" +checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" dependencies = [ "bytes 1.1.0", "fnv", @@ -3333,7 +3369,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util", + "tokio-util 0.7.1", "tracing", ] @@ -3498,9 +3534,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" +checksum = "6330e8a36bd8c859f3fa6d9382911fbb7147ec39807f63b923933a247240b9ba" [[package]] name = "httpdate" @@ -3516,9 +3552,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.17" +version = "0.14.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043f0e083e9901b6cc658a77d1eb86f4fc650bbb977a4337dd63192826aa85dd" +checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" dependencies = [ "bytes 1.1.0", "futures-channel", @@ -3565,10 +3601,10 @@ dependencies = [ "hyper", "log", "rustls 0.20.4", - "rustls-native-certs 0.6.1", + "rustls-native-certs 0.6.2", "tokio", - "tokio-rustls 0.23.2", - "webpki-roots 0.22.2", + "tokio-rustls 0.23.3", + "webpki-roots 0.22.3", ] [[package]] @@ -3661,9 +3697,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" dependencies = [ "autocfg", "hashbrown 0.11.2", @@ -3696,12 +3732,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "0.4.4" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ef6787e7f0faedc040f95716bdd0e62bcfcf4ba93da053b62dea2691c13864" -dependencies = [ - "winapi 0.3.9", -] +checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6" [[package]] name = "iovec" @@ -3768,9 +3801,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.56" +version = "0.3.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" +checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" dependencies = [ "wasm-bindgen", ] @@ -3888,7 +3921,7 @@ dependencies = [ "log", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.6.9", "unicase", ] @@ -3909,86 +3942,43 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.4.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6373a33d987866ccfe1af4bc11b089dce941764313f9fd8b7cf13fcb51b72dc5" +checksum = "91dc760c341fa81173f9a434931aaf32baad5552b0230cc6c93e8fb7eaad4c19" dependencies = [ - "jsonrpsee-types 0.4.1", - "jsonrpsee-utils", - "jsonrpsee-ws-client 0.4.1", -] - -[[package]] -name = "jsonrpsee" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05fd8cd6c6b1bbd06881d2cf88f1fc83cc36c98f2219090f839115fb4a956cb9" -dependencies = [ - "jsonrpsee-core 0.8.0", - "jsonrpsee-proc-macros", - "jsonrpsee-types 0.8.0", - "jsonrpsee-ws-client 0.8.0", -] - -[[package]] -name = "jsonrpsee" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d0b8cc1959f8c05256ace093b2317482da9127f1d9227564f47e7e6bf9bda8" -dependencies = [ - "jsonrpsee-core 0.9.0", + "jsonrpsee-core", "jsonrpsee-http-client", - "jsonrpsee-types 0.9.0", - "jsonrpsee-ws-client 0.9.0", + "jsonrpsee-proc-macros", + "jsonrpsee-types", + "jsonrpsee-ws-client", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.8.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3303cdf246e6ab76e2866fb3d9acb6c76a068b1b28bd923a1b7a8122257ad7b5" +checksum = "765f7a36d5087f74e3b3b47805c2188fef8eb54afcb587b078d9f8ebfe9c7220" dependencies = [ "futures 0.3.21", "http", - "jsonrpsee-core 0.8.0", - "jsonrpsee-types 0.8.0", + "jsonrpsee-core", + "jsonrpsee-types", "pin-project 1.0.10", - "rustls-native-certs 0.6.1", + "rustls-native-certs 0.6.2", "soketto", "thiserror", "tokio", - "tokio-rustls 0.23.2", - "tokio-util", + "tokio-rustls 0.23.3", + "tokio-util 0.7.1", "tracing", - "webpki-roots 0.22.2", -] - -[[package]] -name = "jsonrpsee-client-transport" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa370c2c717d798c3c0a315ae3f0a707a388c6963c11f9da7dbbe1d3f7392f5f" -dependencies = [ - "futures 0.3.21", - "http", - "jsonrpsee-core 0.9.0", - "jsonrpsee-types 0.9.0", - "pin-project 1.0.10", - "rustls-native-certs 0.6.1", - "soketto", - "thiserror", - "tokio", - "tokio-rustls 0.23.2", - "tokio-util", - "tracing", - "webpki-roots 0.22.2", + "webpki-roots 0.22.3", ] [[package]] name = "jsonrpsee-core" -version = "0.8.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f220b5a238dc7992b90f1144fbf6eaa585872c9376afe6fe6863ffead6191bf3" +checksum = "82ef77ecd20c2254d54f5da8c0738eacca61e6b6511268a8f2753e3148c6c706" dependencies = [ "anyhow", "arrayvec 0.7.2", @@ -3997,30 +3987,7 @@ dependencies = [ "futures-channel", "futures-util", "hyper", - "jsonrpsee-types 0.8.0", - "rustc-hash", - "serde", - "serde_json", - "soketto", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "jsonrpsee-core" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22abc3274b265dcefe2e26c4beecf9fda4fffa48cf94930443a6c73678f020d5" -dependencies = [ - "anyhow", - "arrayvec 0.7.2", - "async-trait", - "beef", - "futures-channel", - "futures-util", - "hyper", - "jsonrpsee-types 0.9.0", + "jsonrpsee-types", "rustc-hash", "serde", "serde_json", @@ -4032,15 +3999,15 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d31b837273d09dd80051eefa57d337769dff6c3266108c43a3544ac7ffed9d68" +checksum = "92709e0b8255691f4df954a0176b1cbc3312f151e7ed2e643812e8bd121f1d1c" dependencies = [ "async-trait", "hyper", "hyper-rustls 0.23.0", - "jsonrpsee-core 0.9.0", - "jsonrpsee-types 0.9.0", + "jsonrpsee-core", + "jsonrpsee-types", "rustc-hash", "serde", "serde_json", @@ -4051,9 +4018,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.8.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4299ebf790ea9de1cb72e73ff2ae44c723ef264299e5e2d5ef46a371eb3ac3d8" +checksum = "b7291c72805bc7d413b457e50d8ef3e87aa554da65ecbbc278abb7dfc283e7f0" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -4063,28 +4030,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.4.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f778cf245158fbd8f5d50823a2e9e4c708a40be164766bd35e9fb1d86715b2" -dependencies = [ - "anyhow", - "async-trait", - "beef", - "futures-channel", - "futures-util", - "hyper", - "log", - "serde", - "serde_json", - "soketto", - "thiserror", -] - -[[package]] -name = "jsonrpsee-types" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b3f601bbbe45cd63f5407b6f7d7950e08a7d4f82aa699ff41a4a5e9e54df58" +checksum = "38b6aa52f322cbf20c762407629b8300f39bcc0cf0619840d9252a2f65fd2dd9" dependencies = [ "anyhow", "beef", @@ -4094,82 +4042,22 @@ dependencies = [ "tracing", ] -[[package]] -name = "jsonrpsee-types" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f4c45d2e2aa1db4c7d7d7dbaabc10a5b5258d99cd9d42fbfd5260b76f80c324" -dependencies = [ - "anyhow", - "beef", - "serde", - "serde_json", - "thiserror", - "tracing", -] - -[[package]] -name = "jsonrpsee-utils" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0109c4f972058f3b1925b73a17210aff7b63b65967264d0045d15ee88fe84f0c" -dependencies = [ - "arrayvec 0.7.2", - "beef", - "jsonrpsee-types 0.4.1", -] - [[package]] name = "jsonrpsee-ws-client" -version = "0.4.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559aa56fc402af206c00fc913dc2be1d9d788dcde045d14df141a535245d35ef" +checksum = "dd66d18bab78d956df24dd0d2e41e4c00afbb818fda94a98264bdd12ce8506ac" dependencies = [ - "arrayvec 0.7.2", - "async-trait", - "fnv", - "futures 0.3.21", - "http", - "jsonrpsee-types 0.4.1", - "log", - "pin-project 1.0.10", - "rustls-native-certs 0.5.0", - "serde", - "serde_json", - "soketto", - "thiserror", - "tokio", - "tokio-rustls 0.22.0", - "tokio-util", -] - -[[package]] -name = "jsonrpsee-ws-client" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff425cee7c779e33920913bc695447416078ee6d119f443f3060feffa4e86b5" -dependencies = [ - "jsonrpsee-client-transport 0.8.0", - "jsonrpsee-core 0.8.0", - "jsonrpsee-types 0.8.0", -] - -[[package]] -name = "jsonrpsee-ws-client" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b58983485b2b626c276f1eb367d62dae82132451b281072a7bfa536a33ddf3" -dependencies = [ - "jsonrpsee-client-transport 0.9.0", - "jsonrpsee-core 0.9.0", - "jsonrpsee-types 0.9.0", + "jsonrpsee-client-transport", + "jsonrpsee-core", + "jsonrpsee-types", ] [[package]] name = "k256" -version = "0.10.2" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cc5937366afd3b38071f400d1ce5bd8b1d40b5083cc14e6f8dbcc4032a7f5bb" +checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d" dependencies = [ "cfg-if 1.0.0", "ecdsa", @@ -4195,8 +4083,8 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "beefy-primitives", "bitvec", @@ -4217,6 +4105,7 @@ dependencies = [ "pallet-bags-list", "pallet-balances", "pallet-bounties", + "pallet-child-bounties", "pallet-collective", "pallet-democracy", "pallet-election-provider-multi-phase", @@ -4227,7 +4116,6 @@ dependencies = [ "pallet-im-online", "pallet-indices", "pallet-membership", - "pallet-mmr-primitives", "pallet-multisig", "pallet-nicks", "pallet-offences", @@ -4249,6 +4137,7 @@ dependencies = [ "pallet-utility", "pallet-vesting", "pallet-xcm", + "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", @@ -4266,6 +4155,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", "sp-runtime", @@ -4283,8 +4173,8 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "frame-support", "polkadot-primitives", @@ -4325,9 +4215,9 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e72a631a32527fafe22d0751c002e67d28173c49dcaecf79d1aaa323c520e9" +checksum = "ca7fbdfd71cd663dceb0faf3367a99f8cf724514933e9867cec4995b6027cbc1" dependencies = [ "fs-swap", "kvdb", @@ -4355,9 +4245,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.120" +version = "0.2.123" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5c14e80759d0939d013e6ca49930e59fc53dd8e5009132f76240c179380c09" +checksum = "cb691a747a7ab48abc15c5b42066eaafde10dc427e3b6ee2a1cf43db04c763bd" [[package]] name = "libloading" @@ -4751,7 +4641,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "lru 0.7.3", + "lru 0.7.5", "rand 0.7.3", "smallvec", "unsigned-varint 0.7.1", @@ -4959,24 +4849,25 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.0.36" +version = "0.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a261afc61b7a5e323933b402ca6a1765183687c614789b1e4db7762ed4230bca" +checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" [[package]] name = "lock_api" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ + "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" dependencies = [ "cfg-if 1.0.0", "value-bag", @@ -4993,9 +4884,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb87f3080f6d1d69e8c564c0fcfde1d7aa8cc451ce40cae89479111f03bc0eb" +checksum = "32613e41de4c47ab04970c348ca7ae7382cf116625755af070b008a15516a889" dependencies = [ "hashbrown 0.11.2", ] @@ -5147,14 +5038,17 @@ dependencies = [ [[package]] name = "metered-channel" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ + "coarsetime", + "crossbeam-queue", "derive_more", "futures 0.3.21", "futures-timer", + "nanorand", "thiserror", - "tracing", + "tracing-gum", ] [[package]] @@ -5184,6 +5078,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "miniz_oxide" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" +dependencies = [ + "adler", +] + [[package]] name = "mio" version = "0.6.23" @@ -5205,9 +5108,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba42135c6a5917b9db9cd7b293e5409e1c6b041e6f9825e92e55a894c63b6f8" +checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" dependencies = [ "libc", "log", @@ -5380,13 +5283,19 @@ dependencies = [ [[package]] name = "names" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a8690bf09abf659851e58cd666c3d37ac6af07c2bd7a9e332cfba471715775" +checksum = "e7d66043b25d4a6cccb23619d10c19c25304b355a7dccd4a8e11423dd2382146" dependencies = [ "rand 0.8.5", ] +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" + [[package]] name = "net2" version = "0.2.37" @@ -5425,13 +5334,12 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nom" -version = "7.1.0" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" dependencies = [ "memchr", "minimal-lexical", - "version_check", ] [[package]] @@ -5463,6 +5371,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-format" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bafe4179722c2894288ee77a9f044f02811c86af699344c498b0840c698a2465" +dependencies = [ + "arrayvec 0.4.12", + "itoa 0.4.8", +] + [[package]] name = "num-integer" version = "0.1.44" @@ -5610,7 +5528,7 @@ dependencies = [ [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-support", "frame-system", @@ -5627,7 +5545,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5641,7 +5559,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-support", "frame-system", @@ -5657,7 +5575,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-support", "frame-system", @@ -5673,7 +5591,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-support", "frame-system", @@ -5688,7 +5606,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5712,7 +5630,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5732,7 +5650,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5747,7 +5665,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "beefy-primitives", "frame-support", @@ -5763,7 +5681,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -5774,7 +5692,6 @@ dependencies = [ "log", "pallet-beefy", "pallet-mmr", - "pallet-mmr-primitives", "pallet-session", "parity-scale-codec", "scale-info", @@ -5788,7 +5705,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5806,7 +5723,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -5823,7 +5740,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bp-header-chain", "bp-runtime", @@ -5845,7 +5762,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bitvec", "bp-message-dispatch", @@ -5863,6 +5780,25 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-child-bounties" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-bounties", + "pallet-treasury", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-collator-selection" version = "3.0.0" @@ -5892,7 +5828,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -5909,7 +5845,7 @@ dependencies = [ [[package]] name = "pallet-contracts" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "bitflags", "frame-benchmarking", @@ -5936,7 +5872,7 @@ dependencies = [ [[package]] name = "pallet-contracts-primitives" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "bitflags", "parity-scale-codec", @@ -5951,7 +5887,7 @@ dependencies = [ [[package]] name = "pallet-contracts-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "proc-macro2", "quote", @@ -5961,7 +5897,7 @@ dependencies = [ [[package]] name = "pallet-contracts-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5980,7 +5916,7 @@ dependencies = [ [[package]] name = "pallet-contracts-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "pallet-contracts-primitives", "parity-scale-codec", @@ -5993,7 +5929,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6009,7 +5945,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6032,7 +5968,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6050,7 +5986,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6065,7 +6001,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6088,7 +6024,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6104,7 +6040,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6124,7 +6060,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6141,7 +6077,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6158,33 +6094,17 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", "frame-support", "frame-system", - "pallet-mmr-primitives", "parity-scale-codec", "scale-info", "sp-core", "sp-io", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-mmr-primitives" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" -dependencies = [ - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "serde", - "sp-api", - "sp-core", + "sp-mmr-primitives", "sp-runtime", "sp-std", ] @@ -6192,24 +6112,24 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", - "pallet-mmr-primitives", "parity-scale-codec", "serde", "sp-api", "sp-blockchain", "sp-core", + "sp-mmr-primitives", "sp-runtime", ] [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6224,7 +6144,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-support", "frame-system", @@ -6238,7 +6158,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-support", "frame-system", @@ -6255,7 +6175,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6278,7 +6198,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6294,7 +6214,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6309,7 +6229,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-support", "frame-system", @@ -6323,7 +6243,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-support", "frame-system", @@ -6337,7 +6257,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6353,7 +6273,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-support", "frame-system", @@ -6374,7 +6294,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6390,7 +6310,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-support", "frame-system", @@ -6404,7 +6324,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6427,7 +6347,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -6438,7 +6358,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "log", "sp-arithmetic", @@ -6447,7 +6367,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-support", "frame-system", @@ -6476,7 +6396,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6494,7 +6414,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6513,7 +6433,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-support", "frame-system", @@ -6530,7 +6450,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -6547,7 +6467,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6558,7 +6478,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6575,7 +6495,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6590,7 +6510,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6606,7 +6526,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6620,8 +6540,8 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "frame-support", "frame-system", @@ -6638,8 +6558,8 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "frame-benchmarking", "frame-support", @@ -6669,7 +6589,7 @@ dependencies = [ name = "parachain-template-node" version = "0.1.0" dependencies = [ - "clap 3.1.6", + "clap 3.1.8", "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-aura", @@ -6816,9 +6736,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865edee5b792f537356d9e55cbc138e7f4718dc881a7ea45a18b37bf61c21e3d" +checksum = "b3e7f385d61562f5834282b90aa50b41f38a35cf64d5209b8b05487b50553dbe" dependencies = [ "blake2-rfc", "crc32fast", @@ -6963,7 +6883,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" dependencies = [ "lock_api", - "parking_lot_core 0.9.1", + "parking_lot_core 0.9.2", ] [[package]] @@ -6982,9 +6902,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" +checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37" dependencies = [ "cfg-if 1.0.0", "libc", @@ -6995,9 +6915,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" +checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" [[package]] name = "pbkdf2" @@ -7159,9 +7079,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "platforms" @@ -7199,8 +7119,8 @@ dependencies = [ [[package]] name = "polkadot-approval-distribution" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", @@ -7208,31 +7128,31 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "futures 0.3.21", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-availability-distribution" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "derive_more", "fatality", "futures 0.3.21", - "lru 0.7.3", + "lru 0.7.5", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -7244,17 +7164,17 @@ dependencies = [ "sp-core", "sp-keystore", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-availability-recovery" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "fatality", "futures 0.3.21", - "lru 0.7.3", + "lru 0.7.5", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -7265,18 +7185,19 @@ dependencies = [ "rand 0.8.5", "sc-network", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-cli" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ - "clap 3.1.6", + "clap 3.1.8", "frame-benchmarking-cli", "futures 0.3.21", "log", + "polkadot-client", "polkadot-node-core-pvf", "polkadot-node-metrics", "polkadot-performance-test", @@ -7293,16 +7214,21 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "beefy-primitives", "frame-benchmarking", + "frame-benchmarking-cli", + "frame-system", "frame-system-rpc-runtime-api", - "pallet-mmr-primitives", + "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", + "polkadot-core-primitives", + "polkadot-node-core-parachains-inherent", "polkadot-primitives", "polkadot-runtime", + "polkadot-runtime-common", "sc-client-api", "sc-consensus", "sc-executor", @@ -7313,22 +7239,27 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", + "sp-core", "sp-finality-grandpa", + "sp-inherents", + "sp-keyring", + "sp-mmr-primitives", "sp-offchain", "sp-runtime", "sp-session", "sp-storage", + "sp-timestamp", "sp-transaction-pool", ] [[package]] name = "polkadot-collator" -version = "5.2.0" +version = "5.4.0" dependencies = [ "assert_cmd", "async-trait", "canvas-kusama-runtime", - "clap 3.1.6", + "clap 3.1.8", "cumulus-client-cli", "cumulus-client-consensus-aura", "cumulus-client-consensus-common", @@ -7399,8 +7330,8 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "always-assert", "fatality", @@ -7415,13 +7346,13 @@ dependencies = [ "sp-keystore", "sp-runtime", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-core-primitives" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -7433,13 +7364,13 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "derive_more", "fatality", "futures 0.3.21", - "lru 0.7.3", + "lru 0.7.5", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -7451,13 +7382,13 @@ dependencies = [ "sp-application-crypto", "sp-keystore", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-erasure-coding" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -7470,8 +7401,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "futures 0.3.21", "futures-timer", @@ -7485,13 +7416,13 @@ dependencies = [ "sp-application-crypto", "sp-core", "sp-keystore", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-network-bridge" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "async-trait", "futures 0.3.21", @@ -7504,13 +7435,13 @@ dependencies = [ "polkadot-primitives", "sc-network", "sp-consensus", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-collation-generation" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "futures 0.3.21", "parity-scale-codec", @@ -7522,20 +7453,20 @@ dependencies = [ "sp-core", "sp-maybe-compressed-blob", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bitvec", "derive_more", "futures 0.3.21", "futures-timer", "kvdb", - "lru 0.7.3", + "lru 0.7.5", "merlin", "parity-scale-codec", "polkadot-node-jaeger", @@ -7550,13 +7481,14 @@ dependencies = [ "sp-consensus", "sp-consensus-slots", "sp-runtime", - "tracing", + "thiserror", + "tracing-gum", ] [[package]] name = "polkadot-node-core-av-store" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bitvec", "futures 0.3.21", @@ -7570,13 +7502,13 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-backing" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bitvec", "futures 0.3.21", @@ -7588,13 +7520,13 @@ dependencies = [ "polkadot-statement-table", "sp-keystore", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -7602,14 +7534,14 @@ dependencies = [ "polkadot-primitives", "sp-keystore", "thiserror", - "tracing", + "tracing-gum", "wasm-timer", ] [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "async-trait", "futures 0.3.21", @@ -7621,13 +7553,13 @@ dependencies = [ "polkadot-parachain", "polkadot-primitives", "sp-maybe-compressed-blob", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "futures 0.3.21", "polkadot-node-subsystem", @@ -7636,13 +7568,13 @@ dependencies = [ "sc-client-api", "sc-consensus-babe", "sp-blockchain", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "futures 0.3.21", "futures-timer", @@ -7653,18 +7585,18 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "fatality", "futures 0.3.21", "kvdb", - "lru 0.7.3", + "lru 0.7.5", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7672,13 +7604,13 @@ dependencies = [ "polkadot-primitives", "sc-keystore", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "async-trait", "futures 0.3.21", @@ -7689,13 +7621,13 @@ dependencies = [ "sp-inherents", "sp-runtime", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bitvec", "futures 0.3.21", @@ -7706,13 +7638,13 @@ dependencies = [ "polkadot-primitives", "rand 0.8.5", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "always-assert", "assert_matches", @@ -7736,13 +7668,13 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-tracing", "sp-wasm-interface", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "futures 0.3.21", "polkadot-node-primitives", @@ -7752,13 +7684,13 @@ dependencies = [ "polkadot-primitives", "sp-keystore", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "futures 0.3.21", "memory-lru", @@ -7770,13 +7702,13 @@ dependencies = [ "sp-authority-discovery", "sp-consensus-babe", "sp-core", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-jaeger" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "async-std", "lazy_static", @@ -7793,8 +7725,8 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bs58", "futures 0.3.21", @@ -7807,13 +7739,13 @@ dependencies = [ "sc-service", "sc-tracing", "substrate-prometheus-endpoint", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-network-protocol" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "async-trait", "fatality", @@ -7830,8 +7762,8 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bounded-vec", "futures 0.3.21", @@ -7852,8 +7784,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7862,8 +7794,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-test-helpers" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "async-trait", "futures 0.3.21", @@ -7880,8 +7812,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "derive_more", "futures 0.3.21", @@ -7899,8 +7831,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "async-trait", "derive_more", @@ -7908,7 +7840,7 @@ dependencies = [ "futures 0.3.21", "itertools", "kvdb", - "lru 0.7.3", + "lru 0.7.5", "metered-channel", "parity-db", "parity-scale-codec", @@ -7927,17 +7859,17 @@ dependencies = [ "sp-core", "sp-keystore", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-overseer" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "futures 0.3.21", "futures-timer", - "lru 0.7.3", + "lru 0.7.5", "parity-util-mem", "parking_lot 0.12.0", "polkadot-node-metrics", @@ -7948,13 +7880,13 @@ dependencies = [ "polkadot-primitives", "sc-client-api", "sp-api", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-overseer-gen" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "async-trait", "futures 0.3.21", @@ -7965,13 +7897,13 @@ dependencies = [ "polkadot-node-primitives", "polkadot-overseer-gen-proc-macro", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-overseer-gen-proc-macro" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "expander 0.0.6", "proc-macro-crate 1.1.3", @@ -7982,8 +7914,8 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "derive_more", "frame-support", @@ -7999,8 +7931,8 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "env_logger", "kusama-runtime", @@ -8014,8 +7946,8 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bitvec", "frame-system", @@ -8044,8 +7976,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -8071,12 +8003,13 @@ dependencies = [ "sp-keystore", "sp-runtime", "substrate-frame-rpc-system", + "substrate-state-trie-migration-rpc", ] [[package]] name = "polkadot-runtime" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "beefy-primitives", "bitvec", @@ -8096,6 +8029,7 @@ dependencies = [ "pallet-bags-list", "pallet-balances", "pallet-bounties", + "pallet-child-bounties", "pallet-collective", "pallet-democracy", "pallet-election-provider-multi-phase", @@ -8105,7 +8039,6 @@ dependencies = [ "pallet-im-online", "pallet-indices", "pallet-membership", - "pallet-mmr-primitives", "pallet-multisig", "pallet-nicks", "pallet-offences", @@ -8142,6 +8075,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", "sp-runtime", @@ -8159,8 +8093,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "beefy-primitives", "bitvec", @@ -8206,8 +8140,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "frame-support", "polkadot-primitives", @@ -8218,8 +8152,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bs58", "parity-scale-codec", @@ -8230,8 +8164,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "bitflags", "bitvec", @@ -8257,6 +8191,7 @@ dependencies = [ "scale-info", "serde", "sp-api", + "sp-application-crypto", "sp-core", "sp-inherents", "sp-io", @@ -8272,8 +8207,8 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "async-trait", "beefy-gadget", @@ -8284,10 +8219,9 @@ dependencies = [ "kusama-runtime", "kvdb", "kvdb-rocksdb", - "lru 0.7.3", + "lru 0.7.5", "pallet-babe", "pallet-im-online", - "pallet-mmr-primitives", "pallet-staking", "pallet-transaction-payment-rpc-runtime-api", "parity-db", @@ -8367,14 +8301,14 @@ dependencies = [ "sp-trie", "substrate-prometheus-endpoint", "thiserror", - "tracing", + "tracing-gum", "westend-runtime", ] [[package]] name = "polkadot-statement-distribution" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "arrayvec 0.5.2", "fatality", @@ -8389,13 +8323,13 @@ dependencies = [ "sp-keystore", "sp-staking", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-statement-table" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -8404,8 +8338,8 @@ dependencies = [ [[package]] name = "polkadot-test-client" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "parity-scale-codec", "polkadot-node-subsystem", @@ -8429,8 +8363,8 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "beefy-primitives", "bitvec", @@ -8446,7 +8380,6 @@ dependencies = [ "pallet-balances", "pallet-grandpa", "pallet-indices", - "pallet-mmr-primitives", "pallet-nicks", "pallet-offences", "pallet-session", @@ -8475,6 +8408,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-mmr-primitives", "sp-offchain", "sp-runtime", "sp-session", @@ -8491,8 +8425,8 @@ dependencies = [ [[package]] name = "polkadot-test-service" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "frame-benchmarking", "frame-system", @@ -8540,7 +8474,7 @@ dependencies = [ "tempfile", "test-runtime-constants", "tokio", - "tracing", + "tracing-gum", ] [[package]] @@ -8562,7 +8496,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" dependencies = [ - "cpufeatures 0.2.1", + "cpufeatures 0.2.2", "opaque-debug 0.3.0", "universal-hash", ] @@ -8574,7 +8508,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ "cfg-if 1.0.0", - "cpufeatures 0.2.1", + "cpufeatures 0.2.2", "opaque-debug 0.3.0", "universal-hash", ] @@ -8679,9 +8613,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" dependencies = [ "unicode-xid", ] @@ -8755,9 +8689,9 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eca0fa5dd7c4c96e184cec588f0b1db1ee3165e678db21c09793105acb17e6f" +checksum = "871372391786ccec00d3c5d3d6608905b3d4db263639cfe075d3b60a736d115a" dependencies = [ "cc", ] @@ -8787,9 +8721,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4af2ec4714533fcdf07e886f17025ace8b997b9ce51204ee69b6da831c3da57" +checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" dependencies = [ "proc-macro2", ] @@ -8860,7 +8794,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.5", + "getrandom 0.2.6", ] [[package]] @@ -8908,9 +8842,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221" dependencies = [ "autocfg", "crossbeam-deque", @@ -8920,34 +8854,34 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4" dependencies = [ "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "lazy_static", "num_cpus", ] [[package]] name = "redox_syscall" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ "bitflags", ] [[package]] name = "redox_users" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.5", + "getrandom 0.2.6", "redox_syscall", + "thiserror", ] [[package]] @@ -8985,9 +8919,9 @@ dependencies = [ [[package]] name = "regalloc" -version = "0.0.33" +version = "0.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d808cff91dfca7b239d40b972ba628add94892b1d9e19a842aedc5cfae8ab1a" +checksum = "62446b1d3ebf980bdc68837700af1d77b37bc430e524bf95319c6eada2a4cc02" dependencies = [ "log", "rustc-hash", @@ -9035,10 +8969,10 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "env_logger", - "jsonrpsee 0.8.0", + "jsonrpsee", "log", "parity-scale-codec", "serde", @@ -9151,9 +9085,10 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ + "beefy-merkle-tree", "beefy-primitives", "bp-messages", "bp-rococo", @@ -9164,6 +9099,7 @@ dependencies = [ "frame-executive", "frame-support", "frame-system", + "frame-system-benchmarking", "frame-system-rpc-runtime-api", "hex-literal", "log", @@ -9182,7 +9118,6 @@ dependencies = [ "pallet-indices", "pallet-membership", "pallet-mmr", - "pallet-mmr-primitives", "pallet-multisig", "pallet-offences", "pallet-proxy", @@ -9211,6 +9146,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-mmr-primitives", "sp-offchain", "sp-runtime", "sp-session", @@ -9226,8 +9162,8 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "frame-support", "polkadot-primitives", @@ -9288,14 +9224,14 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.6", + "semver 1.0.7", ] [[package]] name = "rustix" -version = "0.31.3" +version = "0.33.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2dcfc2778a90e38f56a708bfc90572422e11d6c7ee233d053d1f782cf9df6d2" +checksum = "7ac32d9fc97153ca55305284cb6c2dcbb84e1fc6d7ac13392cea02222f2d8741" dependencies = [ "bitflags", "errno", @@ -9344,9 +9280,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943" +checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -9356,9 +9292,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "0.2.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" dependencies = [ "base64", ] @@ -9416,7 +9352,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "log", "sp-core", @@ -9427,7 +9363,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "async-trait", "futures 0.3.21", @@ -9454,7 +9390,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "futures 0.3.21", "futures-timer", @@ -9477,7 +9413,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9493,7 +9429,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.3", @@ -9510,7 +9446,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -9521,10 +9457,10 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "chrono", - "clap 3.1.6", + "clap 3.1.8", "fdlimit", "futures 0.3.21", "hex", @@ -9559,7 +9495,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "fnv", "futures 0.3.21", @@ -9587,7 +9523,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "hash-db", "kvdb", @@ -9612,7 +9548,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "async-trait", "futures 0.3.21", @@ -9636,7 +9572,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "async-trait", "futures 0.3.21", @@ -9665,7 +9601,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "async-trait", "fork-tree", @@ -9708,7 +9644,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -9732,7 +9668,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9745,7 +9681,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "async-trait", "futures 0.3.21", @@ -9770,7 +9706,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "sc-client-api", "sp-authorship", @@ -9781,10 +9717,10 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "lazy_static", - "lru 0.6.6", + "lru 0.7.5", "parity-scale-codec", "parking_lot 0.12.0", "sc-executor-common", @@ -9808,7 +9744,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "environmental", "parity-scale-codec", @@ -9825,7 +9761,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "log", "parity-scale-codec", @@ -9841,7 +9777,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "cfg-if 1.0.0", "libc", @@ -9859,7 +9795,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "ahash", "async-trait", @@ -9899,7 +9835,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "finality-grandpa", "futures 0.3.21", @@ -9923,7 +9859,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "ansi_term", "futures 0.3.21", @@ -9940,7 +9876,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "async-trait", "hex", @@ -9955,7 +9891,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "async-trait", "asynchronous-codec 0.5.0", @@ -9973,7 +9909,7 @@ dependencies = [ "linked-hash-map", "linked_hash_set", "log", - "lru 0.7.3", + "lru 0.7.5", "parity-scale-codec", "parking_lot 0.12.0", "pin-project 1.0.10", @@ -10004,14 +9940,14 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "ahash", "futures 0.3.21", "futures-timer", "libp2p", "log", - "lru 0.7.3", + "lru 0.7.5", "sc-network", "sp-runtime", "substrate-prometheus-endpoint", @@ -10021,7 +9957,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "bytes 1.1.0", "fnv", @@ -10049,7 +9985,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "futures 0.3.21", "libp2p", @@ -10062,7 +9998,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -10071,7 +10007,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "futures 0.3.21", "hash-db", @@ -10102,7 +10038,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -10114,6 +10050,7 @@ dependencies = [ "parking_lot 0.12.0", "sc-chain-spec", "sc-transaction-pool-api", + "scale-info", "serde", "serde_json", "sp-core", @@ -10127,7 +10064,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "futures 0.3.21", "jsonrpc-core", @@ -10144,7 +10081,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "async-trait", "directories", @@ -10172,6 +10109,7 @@ dependencies = [ "sc-offchain", "sc-rpc", "sc-rpc-server", + "sc-sysinfo", "sc-telemetry", "sc-tracing", "sc-transaction-pool", @@ -10208,7 +10146,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "log", "parity-scale-codec", @@ -10222,7 +10160,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -10240,10 +10178,27 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sc-sysinfo" +version = "6.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" +dependencies = [ + "futures 0.3.21", + "libc", + "log", + "rand 0.7.3", + "rand_pcg 0.2.1", + "regex", + "sc-telemetry", + "serde", + "serde_json", + "sp-core", +] + [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "chrono", "futures 0.3.21", @@ -10261,7 +10216,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "ansi_term", "atty", @@ -10292,7 +10247,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -10303,7 +10258,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "futures 0.3.21", "futures-timer", @@ -10330,7 +10285,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "futures 0.3.21", "log", @@ -10343,7 +10298,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "futures 0.3.21", "futures-timer", @@ -10355,9 +10310,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0563970d79bcbf3c537ce3ad36d859b30d36fc5b190efd227f1f7a84d7cf0d42" +checksum = "8980cafbe98a7ee7a9cc16b32ebce542c77883f512d83fbf2ddc8f6a85ea74c9" dependencies = [ "bitvec", "cfg-if 1.0.0", @@ -10369,9 +10324,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7805950c36512db9e3251c970bb7ac425f326716941862205d612ab3b5e46e2" +checksum = "4260c630e8a8a33429d1688eff2f163f24c65a4e1b1578ef6b565061336e4b6f" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -10562,9 +10517,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d" +checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4" dependencies = [ "serde", ] @@ -10654,7 +10609,7 @@ checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures 0.2.1", + "cpufeatures 0.2.2", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -10679,7 +10634,7 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures 0.2.1", + "cpufeatures 0.2.2", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -10691,7 +10646,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ "cfg-if 1.0.0", - "cpufeatures 0.2.1", + "cpufeatures 0.2.2", "digest 0.10.3", ] @@ -10809,14 +10764,14 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "slot-range-helper" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "enumn", "parity-scale-codec", @@ -10904,7 +10859,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "hash-db", "log", @@ -10921,7 +10876,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "blake2 0.10.4", "proc-macro-crate 1.1.3", @@ -10933,7 +10888,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "parity-scale-codec", "scale-info", @@ -10946,7 +10901,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "integer-sqrt", "num-traits", @@ -10961,7 +10916,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "parity-scale-codec", "scale-info", @@ -10974,7 +10929,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "async-trait", "parity-scale-codec", @@ -10986,7 +10941,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "parity-scale-codec", "sp-api", @@ -10998,11 +10953,11 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "futures 0.3.21", "log", - "lru 0.7.3", + "lru 0.7.5", "parity-scale-codec", "parking_lot 0.12.0", "sp-api", @@ -11016,7 +10971,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "async-trait", "futures 0.3.21", @@ -11035,7 +10990,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "async-trait", "parity-scale-codec", @@ -11053,7 +11008,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "async-trait", "merlin", @@ -11076,7 +11031,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "parity-scale-codec", "scale-info", @@ -11090,7 +11045,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -11102,7 +11057,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "base58", "bitflags", @@ -11148,7 +11103,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "blake2 0.10.4", "byteorder", @@ -11162,7 +11117,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "proc-macro2", "quote", @@ -11173,7 +11128,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "kvdb", "parking_lot 0.12.0", @@ -11182,7 +11137,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "proc-macro2", "quote", @@ -11192,7 +11147,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "environmental", "parity-scale-codec", @@ -11203,7 +11158,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "finality-grandpa", "log", @@ -11221,7 +11176,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -11235,7 +11190,7 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "futures 0.3.21", "hash-db", @@ -11260,7 +11215,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "lazy_static", "sp-core", @@ -11271,7 +11226,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "async-trait", "futures 0.3.21", @@ -11288,16 +11243,31 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "thiserror", "zstd", ] +[[package]] +name = "sp-mmr-primitives" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" +dependencies = [ + "log", + "parity-scale-codec", + "serde", + "sp-api", + "sp-core", + "sp-debug-derive", + "sp-runtime", + "sp-std", +] + [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "parity-scale-codec", "scale-info", @@ -11311,7 +11281,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "sp-api", "sp-core", @@ -11321,7 +11291,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "backtrace", "lazy_static", @@ -11331,7 +11301,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "rustc-hash", "serde", @@ -11341,7 +11311,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "either", "hash256-std-hasher", @@ -11363,7 +11333,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -11380,7 +11350,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "Inflector", "proc-macro-crate 1.1.3", @@ -11392,7 +11362,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "log", "parity-scale-codec", @@ -11406,7 +11376,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "serde", "serde_json", @@ -11415,7 +11385,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "parity-scale-codec", "scale-info", @@ -11429,7 +11399,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "parity-scale-codec", "scale-info", @@ -11440,7 +11410,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "hash-db", "log", @@ -11456,19 +11426,18 @@ dependencies = [ "sp-trie", "thiserror", "tracing", - "trie-db", "trie-root", ] [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11481,7 +11450,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "log", "sp-core", @@ -11494,7 +11463,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "async-trait", "futures-timer", @@ -11510,7 +11479,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "parity-scale-codec", "sp-std", @@ -11522,7 +11491,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "sp-api", "sp-runtime", @@ -11531,7 +11500,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "async-trait", "log", @@ -11547,7 +11516,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "hash-db", "memory-db", @@ -11563,7 +11532,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11580,7 +11549,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -11591,7 +11560,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "impl-trait-for-tuples", "log", @@ -11619,11 +11588,12 @@ dependencies = [ [[package]] name = "ss58-registry" -version = "1.15.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f9799e6d412271cb2414597581128b03f3285f260ea49f5363d07df6a332b3e" +checksum = "7b84a70894df7a73666e0694f44b41a9571625e9546fb58a0818a565d2c7e084" dependencies = [ "Inflector", + "num-format", "proc-macro2", "quote", "serde", @@ -11881,7 +11851,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "platforms", ] @@ -11889,7 +11859,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", @@ -11911,7 +11881,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "futures-util", "hyper", @@ -11921,10 +11891,33 @@ dependencies = [ "tokio", ] +[[package]] +name = "substrate-state-trie-migration-rpc" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" +dependencies = [ + "jsonrpc-core", + "jsonrpc-core-client", + "jsonrpc-derive", + "log", + "parity-scale-codec", + "sc-client-api", + "sc-rpc-api", + "scale-info", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", + "trie-db", +] + [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "async-trait", "futures 0.3.21", @@ -11950,7 +11943,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "futures 0.3.21", "substrate-test-utils-derive", @@ -11960,7 +11953,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "proc-macro-crate 1.1.3", "proc-macro2", @@ -11971,7 +11964,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ "ansi_term", "build-helper", @@ -11992,9 +11985,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54" +checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" dependencies = [ "proc-macro2", "quote", @@ -12056,8 +12049,8 @@ checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b" [[package]] name = "test-runtime-constants" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "frame-support", "polkadot-primitives", @@ -12101,6 +12094,12 @@ dependencies = [ "syn", ] +[[package]] +name = "thousands" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" + [[package]] name = "thread_local" version = "1.1.4" @@ -12207,7 +12206,7 @@ dependencies = [ "bytes 1.1.0", "libc", "memchr", - "mio 0.8.1", + "mio 0.8.2", "num_cpus", "once_cell", "parking_lot 0.12.0", @@ -12242,9 +12241,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b" +checksum = "4151fda0cf2798550ad0b34bcfc9b9dcc2a9d2471c895c68f3a8818e54f2389e" dependencies = [ "rustls 0.20.4", "tokio", @@ -12270,7 +12269,6 @@ checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ "bytes 1.1.0", "futures-core", - "futures-io", "futures-sink", "log", "pin-project-lite 0.2.8", @@ -12278,10 +12276,25 @@ dependencies = [ ] [[package]] -name = "toml" -version = "0.5.8" +name = "tokio-util" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" +dependencies = [ + "bytes 1.1.0", + "futures-core", + "futures-io", + "futures-sink", + "pin-project-lite 0.2.8", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "serde", ] @@ -12294,9 +12307,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.32" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" +checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" dependencies = [ "cfg-if 1.0.0", "pin-project-lite 0.2.8", @@ -12317,9 +12330,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c" +checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" dependencies = [ "lazy_static", "valuable", @@ -12335,6 +12348,29 @@ dependencies = [ "tracing", ] +[[package]] +name = "tracing-gum" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" +dependencies = [ + "polkadot-node-jaeger", + "polkadot-primitives", + "tracing", + "tracing-gum-proc-macro", +] + +[[package]] +name = "tracing-gum-proc-macro" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" +dependencies = [ + "expander 0.0.6", + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tracing-log" version = "0.1.2" @@ -12453,10 +12489,10 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#345e3b1fcbbb0c479a031c45859d7154e7c4b5f7" +source = "git+https://github.com/paritytech/substrate?branch=master#c4f3d028621edb293d2c423516221aa396f76a2d" dependencies = [ - "clap 3.1.6", - "jsonrpsee 0.4.1", + "clap 3.1.8", + "jsonrpsee", "log", "parity-scale-codec", "remote-externalities", @@ -12718,9 +12754,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" +checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -12728,9 +12764,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" +checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" dependencies = [ "bumpalo", "lazy_static", @@ -12743,9 +12779,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.29" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" +checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -12755,9 +12791,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" +checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -12765,9 +12801,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" +checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" dependencies = [ "proc-macro2", "quote", @@ -12778,9 +12814,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" +checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" [[package]] name = "wasm-gc-api" @@ -12844,31 +12880,30 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.81.0" +version = "0.83.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98930446519f63d00a836efdc22f67766ceae8dbcc1571379f2bcabc6b2b9abc" +checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" [[package]] name = "wasmtime" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9c724da92e39a85d2231d4c2a942c8be295211441dbca581c6c3f3f45a9f00" +checksum = "21ffb4705016d5ca91e18a72ed6822dab50e6d5ddd7045461b17ef19071cdef1" dependencies = [ "anyhow", "backtrace", "bincode", "cfg-if 1.0.0", - "cpp_demangle", "indexmap", "lazy_static", "libc", "log", "object", + "once_cell", "paste", "psm", "rayon", "region", - "rustc-demangle", "serde", "target-lexicon", "wasmparser", @@ -12882,9 +12917,9 @@ dependencies = [ [[package]] name = "wasmtime-cache" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4439d99100298344567c0eb6916ad5864e99e54760b8177c427e529077fb30" +checksum = "85c6ab24291fa7cb3a181f5669f6c72599b7ef781669759b45c7828c5999d0c0" dependencies = [ "anyhow", "base64", @@ -12902,9 +12937,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1762765dd69245f00e5d9783b695039e449a7be0f9c5383e4c78465dd6131aeb" +checksum = "f04c810078a491b7bc4866ebe045f714d2b95e6b539e1f64009a4a7606be11de" dependencies = [ "anyhow", "cranelift-codegen", @@ -12924,9 +12959,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4468301d95ec71710bb6261382efe27d1296447711645e3dbabaea6e4de3504" +checksum = "61448266ea164b1ac406363cdcfac81c7c44db4d94c7a81c8620ac6c5c6cdf59" dependencies = [ "anyhow", "cranelift-entity", @@ -12944,38 +12979,52 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab0ae6e581ff014b470ec35847ea3c0b4c3ace89a55df5a04c802a11f4574e7d" +checksum = "156b4623c6b0d4b8c24afb846c20525922f538ef464cc024abab7ea8de2109a2" dependencies = [ "addr2line", "anyhow", "bincode", "cfg-if 1.0.0", + "cpp_demangle", "gimli", + "log", "object", "region", + "rustc-demangle", "rustix", "serde", "target-lexicon", "thiserror", "wasmtime-environ", + "wasmtime-jit-debug", "wasmtime-runtime", "winapi 0.3.9", ] [[package]] -name = "wasmtime-runtime" -version = "0.33.1" +name = "wasmtime-jit-debug" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9c28877ae37a367cda7b52b8887589816152e95dde9b7c80cc686f52761961" +checksum = "d5dc31f811760a6c76b2672c404866fd19b75e5fb3b0075a3e377a6846490654" +dependencies = [ + "lazy_static", + "object", + "rustix", +] + +[[package]] +name = "wasmtime-runtime" +version = "0.35.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f907beaff69d4d920fa4688411ee4cc75c0f01859e424677f9e426e2ef749864" dependencies = [ "anyhow", "backtrace", "cc", "cfg-if 1.0.0", "indexmap", - "lazy_static", "libc", "log", "mach", @@ -12986,14 +13035,15 @@ dependencies = [ "rustix", "thiserror", "wasmtime-environ", + "wasmtime-jit-debug", "winapi 0.3.9", ] [[package]] name = "wasmtime-types" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395726e8f5dd8c57cb0db445627b842343f7e29ed7489467fdf7953ed9d3cd4f" +checksum = "514ef0e5fd197b9609dc9eb74beba0c84d5a12b2417cbae55534633329ba4852" dependencies = [ "cranelift-entity", "serde", @@ -13003,9 +13053,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.56" +version = "0.3.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" +checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" dependencies = [ "js-sys", "wasm-bindgen", @@ -13042,9 +13092,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449" +checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf" dependencies = [ "webpki 0.22.0", ] @@ -13060,8 +13110,8 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "beefy-primitives", "bitvec", @@ -13089,7 +13139,6 @@ dependencies = [ "pallet-im-online", "pallet-indices", "pallet-membership", - "pallet-mmr-primitives", "pallet-multisig", "pallet-nicks", "pallet-offences", @@ -13129,6 +13178,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", "sp-runtime", @@ -13146,8 +13196,8 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "frame-support", "polkadot-primitives", @@ -13224,9 +13274,9 @@ dependencies = [ [[package]] name = "which" -version = "4.2.4" +version = "4.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2" +checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" dependencies = [ "either", "lazy_static", @@ -13284,9 +13334,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" +checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825" dependencies = [ "windows_aarch64_msvc", "windows_i686_gnu", @@ -13297,33 +13347,33 @@ dependencies = [ [[package]] name = "windows_aarch64_msvc" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" [[package]] name = "windows_i686_gnu" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" [[package]] name = "windows_i686_msvc" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" [[package]] name = "windows_x86_64_gnu" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" [[package]] name = "windows_x86_64_msvc" -version = "0.32.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" [[package]] name = "winreg" @@ -13366,8 +13416,8 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -13379,8 +13429,8 @@ dependencies = [ [[package]] name = "xcm-builder" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "frame-support", "frame-system", @@ -13399,8 +13449,8 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.18" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +version = "0.9.19" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "frame-benchmarking", "frame-support", @@ -13418,7 +13468,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#e4e40d215be3814aaf441e48496eac2bce267c3b" +source = "git+https://github.com/paritytech/polkadot?branch=master#2fcea5e70ad9f2cd48b06eef3a280afeb719858d" dependencies = [ "Inflector", "proc-macro2", @@ -13442,9 +13492,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.5.3" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50344758e2f40e3a1fcfc8f6f91aa57b5f8ebd8d27919fe6451f15aaaf9ee608" +checksum = "7eb5728b8afd3f280a869ce1d4c554ffaed35f45c231fc41bfbd0381bef50317" dependencies = [ "zeroize_derive", ] @@ -13463,18 +13513,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.9.2+zstd.1.5.1" +version = "0.10.0+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54" +checksum = "3b1365becbe415f3f0fcd024e2f7b45bacfb5bdd055f0dc113571394114e7bdd" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "4.1.3+zstd.1.5.1" +version = "4.1.4+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79" +checksum = "2f7cd17c9af1a4d6c24beb1cc54b17e2ef7b593dc92f19e9d9acad8b182bbaee" dependencies = [ "libc", "zstd-sys", @@ -13482,9 +13532,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.6.2+zstd.1.5.1" +version = "1.6.3+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f" +checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" dependencies = [ "cc", "libc", diff --git a/client/consensus/aura/Cargo.toml b/client/consensus/aura/Cargo.toml index d09f884973..ffc10f91ef 100644 --- a/client/consensus/aura/Cargo.toml +++ b/client/consensus/aura/Cargo.toml @@ -6,10 +6,10 @@ authors = ["Parity Technologies "] edition = "2021" [dependencies] -async-trait = "0.1.42" +async-trait = "0.1.53" codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] } futures = { version = "0.3.8", features = ["compat"] } -tracing = "0.1.32" +tracing = "0.1.33" # Substrate sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml index 8cc6e7591a..3a27fec78d 100644 --- a/client/consensus/common/Cargo.toml +++ b/client/consensus/common/Cargo.toml @@ -8,8 +8,8 @@ edition = "2021" [dependencies] futures = { version = "0.3.8", features = ["compat"] } codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] } -tracing = "0.1.32" -async-trait = "0.1.52" +tracing = "0.1.33" +async-trait = "0.1.53" dyn-clone = "1.0.5" # Substrate diff --git a/client/consensus/relay-chain/Cargo.toml b/client/consensus/relay-chain/Cargo.toml index 32209e8e75..6626a0eea2 100644 --- a/client/consensus/relay-chain/Cargo.toml +++ b/client/consensus/relay-chain/Cargo.toml @@ -6,10 +6,10 @@ authors = ["Parity Technologies "] edition = "2021" [dependencies] -async-trait = "0.1.42" +async-trait = "0.1.53" futures = { version = "0.3.8", features = ["compat"] } parking_lot = "0.12.0" -tracing = "0.1.32" +tracing = "0.1.33" # Substrate sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml index 3e35830fa7..9e1a2fd01e 100644 --- a/client/network/Cargo.toml +++ b/client/network/Cargo.toml @@ -6,13 +6,13 @@ description = "Cumulus-specific networking protocol" edition = "2021" [dependencies] -async-trait = "0.1.52" +async-trait = "0.1.53" codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] } derive_more = "0.99.2" futures = { version = "0.3.1", features = ["compat"] } futures-timer = "3.0.2" parking_lot = "0.12.0" -tracing = "0.1.32" +tracing = "0.1.33" # Substrate sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/client/pov-recovery/Cargo.toml b/client/pov-recovery/Cargo.toml index a87014c615..9893ee0f38 100644 --- a/client/pov-recovery/Cargo.toml +++ b/client/pov-recovery/Cargo.toml @@ -10,7 +10,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "deriv futures = { version = "0.3.1", features = ["compat"] } futures-timer = "3.0.2" rand = "0.8.5" -tracing = "0.1.32" +tracing = "0.1.33" # Substrate sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/client/relay-chain-inprocess-interface/Cargo.toml b/client/relay-chain-inprocess-interface/Cargo.toml index 0191601306..4032807d10 100644 --- a/client/relay-chain-inprocess-interface/Cargo.toml +++ b/client/relay-chain-inprocess-interface/Cargo.toml @@ -5,11 +5,11 @@ version = "0.1.0" edition = "2021" [dependencies] -async-trait = "0.1.52" +async-trait = "0.1.53" futures = "0.3.21" futures-timer = "3.0.2" parking_lot = "0.12.0" -tracing = "0.1.32" +tracing = "0.1.33" # Substrate sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/client/relay-chain-inprocess-interface/src/lib.rs b/client/relay-chain-inprocess-interface/src/lib.rs index e19f794fb3..55e8c567e6 100644 --- a/client/relay-chain-inprocess-interface/src/lib.rs +++ b/client/relay-chain-inprocess-interface/src/lib.rs @@ -19,10 +19,8 @@ use std::{pin::Pin, sync::Arc, time::Duration}; use async_trait::async_trait; use cumulus_primitives_core::{ relay_chain::{ - v2::{ - CommittedCandidateReceipt, OccupiedCoreAssumption, ParachainHost, SessionIndex, - ValidatorId, - }, + runtime_api::ParachainHost, + v2::{CommittedCandidateReceipt, OccupiedCoreAssumption, SessionIndex, ValidatorId}, Block as PBlock, BlockId, Hash as PHash, Header as PHeader, InboundHrmpMessage, }, InboundDownwardMessage, ParaId, PersistedValidationData, diff --git a/client/relay-chain-interface/Cargo.toml b/client/relay-chain-interface/Cargo.toml index 9403e89e79..daacbbd905 100644 --- a/client/relay-chain-interface/Cargo.toml +++ b/client/relay-chain-interface/Cargo.toml @@ -21,7 +21,7 @@ sc-service = { git = "https://github.com/paritytech/substrate", branch = "master futures = "0.3.21" parking_lot = "0.12.0" derive_more = "0.99.2" -async-trait = "0.1.52" +async-trait = "0.1.53" thiserror = "1.0.30" -jsonrpsee-core = "0.9.0" +jsonrpsee-core = "0.10.1" parity-scale-codec = "3.1.2" diff --git a/client/relay-chain-rpc-interface/Cargo.toml b/client/relay-chain-rpc-interface/Cargo.toml index 295b84e866..7d07ace63e 100644 --- a/client/relay-chain-rpc-interface/Cargo.toml +++ b/client/relay-chain-rpc-interface/Cargo.toml @@ -23,8 +23,8 @@ futures = "0.3.21" futures-timer = "3.0.2" parity-scale-codec = "3.1.2" parking_lot = "0.12.0" -jsonrpsee = { version = "0.9.0", features = ["client"] } -tracing = "0.1.32" -async-trait = "0.1.52" +jsonrpsee = { version = "0.10.1", features = ["client"] } +tracing = "0.1.33" +async-trait = "0.1.53" url = "2.2.2" backoff = { version = "0.4.0", features = ["tokio"] } diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml index 308d16a9a9..c657b3a9b0 100644 --- a/client/service/Cargo.toml +++ b/client/service/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0" } parking_lot = "0.12.0" -tracing = "0.1.32" +tracing = "0.1.33" # Substrate sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/docker/polkadot-collator_builder.Containerfile b/docker/polkadot-collator_builder.Containerfile index 4eb7ec04a1..8698bf874d 100644 --- a/docker/polkadot-collator_builder.Containerfile +++ b/docker/polkadot-collator_builder.Containerfile @@ -1,4 +1,4 @@ -# This file is sourced from https://github.com/paritytech/polkadot/blob/master/scripts/dockerfiles/polkadot/polkadot_builder.Dockerfile +# This file is sourced from https://github.com/paritytech/polkadot/blob/master/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile # This is the build stage for Polkadot-collator. Here we create the binary in a temporary image. FROM docker.io/paritytech/ci-linux:production as builder @@ -14,7 +14,7 @@ LABEL io.parity.image.type="builder" \ io.parity.image.authors="devops-team@parity.io" \ io.parity.image.vendor="Parity Technologies" \ io.parity.image.description="Multistage Docker image for Polkadot-collator" \ - io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/docker/test-parachain-collator.dockerfile" \ + io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/ci/dockerfiles/polkadot/polkadot-collator_builder.Dockerfile" \ io.parity.image.documentation="https://github.com/paritytech/cumulus" COPY --from=builder /cumulus/target/release/polkadot-collator /usr/local/bin diff --git a/docker/test-parachain-collator.dockerfile b/docker/test-parachain-collator.dockerfile index 72e4e0d67e..42fe4c17da 100644 --- a/docker/test-parachain-collator.dockerfile +++ b/docker/test-parachain-collator.dockerfile @@ -1,4 +1,4 @@ -# This file is sourced from https://github.com/paritytech/polkadot/blob/master/scripts/dockerfiles/polkadot/polkadot_builder.Dockerfile +# This file is sourced from https://github.com/paritytech/polkadot/blob/master/scripts/ci/dockerfiles/polkadot/polkadot_builder.Dockerfile FROM docker.io/paritytech/ci-linux:production as builder WORKDIR /cumulus diff --git a/pallets/aura-ext/Cargo.toml b/pallets/aura-ext/Cargo.toml index 4666966819..e6e939c955 100644 --- a/pallets/aura-ext/Cargo.toml +++ b/pallets/aura-ext/Cargo.toml @@ -7,7 +7,7 @@ description = "AURA consensus extension pallet for parachains" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.132", optional = true, features = ["derive"] } # Substrate diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml index 9c03886ce5..33dfea8ccc 100644 --- a/pallets/collator-selection/Cargo.toml +++ b/pallets/collator-selection/Cargo.toml @@ -13,10 +13,10 @@ version = "3.0.0" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -log = { version = "0.4.0", default-features = false } +log = { version = "0.4.16", default-features = false } codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.0.0" } rand = { version = "0.8.5", features = ["std_rng"], default-features = false } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.132", default-features = false } sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/pallets/dmp-queue/Cargo.toml b/pallets/dmp-queue/Cargo.toml index b79555c360..bd9d3eb5be 100644 --- a/pallets/dmp-queue/Cargo.toml +++ b/pallets/dmp-queue/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ], default-features = false } -log = { version = "0.4.14", default-features = false } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +log = { version = "0.4.16", default-features = false } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } # Substrate frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } diff --git a/pallets/parachain-system/Cargo.toml b/pallets/parachain-system/Cargo.toml index 0d95571788..6b220da5d7 100644 --- a/pallets/parachain-system/Cargo.toml +++ b/pallets/parachain-system/Cargo.toml @@ -9,8 +9,8 @@ description = "Base pallet for cumulus-based parachains" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } environmental = { version = "1.1.2", default-features = false } impl-trait-for-tuples = "0.2.1" -log = { version = "0.4.14", default-features = false } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +log = { version = "0.4.16", default-features = false } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.132", optional = true, features = ["derive"] } # Substrate diff --git a/pallets/parachain-system/proc-macro/Cargo.toml b/pallets/parachain-system/proc-macro/Cargo.toml index 135e6137f9..d66b730b95 100644 --- a/pallets/parachain-system/proc-macro/Cargo.toml +++ b/pallets/parachain-system/proc-macro/Cargo.toml @@ -9,9 +9,9 @@ description = "Proc macros provided by the parachain-system pallet" proc-macro = true [dependencies] -syn = "1.0.89" -proc-macro2 = "1.0.36" -quote = "1.0.16" +syn = "1.0.91" +proc-macro2 = "1.0.37" +quote = "1.0.18" proc-macro-crate = "1.1.3" [features] diff --git a/pallets/parachain-system/src/relay_state_snapshot.rs b/pallets/parachain-system/src/relay_state_snapshot.rs index ba3149119f..9f69dd9476 100644 --- a/pallets/parachain-system/src/relay_state_snapshot.rs +++ b/pallets/parachain-system/src/relay_state_snapshot.rs @@ -63,6 +63,10 @@ pub struct MessagingStateSnapshot { pub enum Error { /// The provided proof was created against unexpected storage root. RootMismatch, + /// The entry cannot be read. + ReadEntry(ReadEntryErr), + /// The optional entry cannot be read. + ReadOptionalEntry(ReadEntryErr), /// The slot cannot be extracted. Slot(ReadEntryErr), /// The upgrade go-ahead signal cannot be read. @@ -273,4 +277,28 @@ impl RelayChainStateProof { ) .map_err(Error::UpgradeRestriction) } + + /// Read an entry given by the key and try to decode it. If the value specified by the key according + /// to the proof is empty, the `fallback` value will be returned. + /// + /// Returns `Err` in case the backend can't return the value under the specific key (likely due to + /// a malformed proof), in case the decoding fails, or in case where the value is empty in the relay + /// chain state and no fallback was provided. + pub fn read_entry(&self, key: &[u8], fallback: Option) -> Result + where + T: Decode, + { + read_entry(&self.trie_backend, key, fallback).map_err(Error::ReadEntry) + } + + /// Read an optional entry given by the key and try to decode it. + /// + /// Returns `Err` in case the backend can't return the value under the specific key (likely due to + /// a malformed proof) or if the value couldn't be decoded. + pub fn read_optional_entry(&self, key: &[u8]) -> Result, Error> + where + T: Decode, + { + read_optional_entry(&self.trie_backend, key).map_err(Error::ReadOptionalEntry) + } } diff --git a/pallets/xcm/Cargo.toml b/pallets/xcm/Cargo.toml index 27d23c57fe..53b689fde3 100644 --- a/pallets/xcm/Cargo.toml +++ b/pallets/xcm/Cargo.toml @@ -6,7 +6,7 @@ version = "0.1.0" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.132", optional = true, features = ["derive"] } sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } diff --git a/pallets/xcmp-queue/Cargo.toml b/pallets/xcmp-queue/Cargo.toml index f3d871e1b1..7fa57d1111 100644 --- a/pallets/xcmp-queue/Cargo.toml +++ b/pallets/xcmp-queue/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ], default-features = false } -log = { version = "0.4.14", default-features = false } +log = { version = "0.4.16", default-features = false } rand_chacha = { version = "0.3.0", default-features = false } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } # Substrate frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } diff --git a/pallets/xcmp-queue/src/lib.rs b/pallets/xcmp-queue/src/lib.rs index 0bdd385282..5460e4316c 100644 --- a/pallets/xcmp-queue/src/lib.rs +++ b/pallets/xcmp-queue/src/lib.rs @@ -499,13 +499,15 @@ impl Pallet { } let mut s = >::get(); - let index = s.iter().position(|item| item.recipient == recipient).unwrap_or_else(|| { + let details = if let Some(details) = s.iter_mut().find(|item| item.recipient == recipient) { + details + } else { s.push(OutboundChannelDetails::new(recipient)); - s.len() - 1 - }); - let have_active = s[index].last_index > s[index].first_index; + s.last_mut().expect("can't be empty; a new element was just pushed; qed") + }; + let have_active = details.last_index > details.first_index; let appended = have_active && - >::mutate(recipient, s[index].last_index - 1, |s| { + >::mutate(recipient, details.last_index - 1, |s| { if XcmpMessageFormat::decode_with_depth_limit(MAX_XCM_DECODE_DEPTH, &mut &s[..]) != Ok(format) { @@ -518,15 +520,15 @@ impl Pallet { return true }); if appended { - Ok((s[index].last_index - s[index].first_index - 1) as u32) + Ok((details.last_index - details.first_index - 1) as u32) } else { // Need to add a new page. - let page_index = s[index].last_index; - s[index].last_index += 1; + let page_index = details.last_index; + details.last_index += 1; let mut new_page = format.encode(); new_page.extend_from_slice(&data[..]); >::insert(recipient, page_index, new_page); - let r = (s[index].last_index - s[index].first_index - 1) as u32; + let r = (details.last_index - details.first_index - 1) as u32; >::put(s); Ok(r) } @@ -536,8 +538,8 @@ impl Pallet { /// block. fn send_signal(dest: ParaId, signal: ChannelSignal) -> Result<(), ()> { let mut s = >::get(); - if let Some(index) = s.iter().position(|item| item.recipient == dest) { - s[index].signals_exist = true; + if let Some(details) = s.iter_mut().find(|item| item.recipient == dest) { + details.signals_exist = true; } else { s.push(OutboundChannelDetails::new(dest).with_signals()); } @@ -602,7 +604,7 @@ impl Pallet { Ok(xcm) => { let location = (Parent, Parachain(sender.into())); match T::XcmExecutor::execute_xcm(location, xcm, hash, max_weight) { - Outcome::Error(e) => (Err(e.clone()), Event::Fail(Some(hash), e)), + Outcome::Error(e) => (Err(e), Event::Fail(Some(hash), e)), Outcome::Complete(w) => (Ok(w), Event::Success(Some(hash))), // As far as the caller is concerned, this was dispatched without error, so // we just report the weight used. @@ -657,7 +659,11 @@ impl Pallet { remaining_fragments = last_remaining_fragments; break }, - Err(_) => { + Err(error) => { + log::error!( + "Failed to process XCMP-XCM message, caused by {:?}", + error + ); // Message looks invalid; don't attempt to retry }, } @@ -752,7 +758,7 @@ impl Pallet { let suspended = QueueSuspended::::get(); let mut status = >::get(); // <- sorted. - if status.len() == 0 { + if status.is_empty() { return 0 } @@ -861,10 +867,10 @@ impl Pallet { fn suspend_channel(target: ParaId) { >::mutate(|s| { - if let Some(index) = s.iter().position(|item| item.recipient == target) { - let ok = s[index].state == OutboundState::Ok; + if let Some(details) = s.iter_mut().find(|item| item.recipient == target) { + let ok = details.state == OutboundState::Ok; debug_assert!(ok, "WARNING: Attempt to suspend channel that was not Ok."); - s[index].state = OutboundState::Suspended; + details.state = OutboundState::Suspended; } else { s.push(OutboundChannelDetails::new(target).with_suspended_state()); } diff --git a/pallets/xcmp-queue/src/tests.rs b/pallets/xcmp-queue/src/tests.rs index b6d8ef40b0..62e674004e 100644 --- a/pallets/xcmp-queue/src/tests.rs +++ b/pallets/xcmp-queue/src/tests.rs @@ -65,6 +65,18 @@ fn handle_blob_message() { }); } +#[test] +#[should_panic = "Invalid incoming XCMP message data"] +#[cfg(debug_assertions)] +fn handle_invalid_data() { + new_test_ext().execute_with(|| { + let data = Xcm::(vec![]).encode(); + InboundXcmpMessages::::insert(ParaId::from(1000), 1, data); + let format = XcmpMessageFormat::ConcatenatedVersionedXcm; + XcmpQueue::process_xcmp_message(1000.into(), (1, format), 10_000_000_000, 10_000_000_000); + }); +} + #[test] fn service_overweight_unknown() { new_test_ext().execute_with(|| { diff --git a/parachain-template/node/Cargo.toml b/parachain-template/node/Cargo.toml index 172c2e6cb6..31e58aac35 100644 --- a/parachain-template/node/Cargo.toml +++ b/parachain-template/node/Cargo.toml @@ -16,7 +16,7 @@ path = "src/main.rs" [dependencies] clap = { version = "3.1", features = ["derive"] } derive_more = "0.99.2" -log = "0.4.14" +log = "0.4.16" codec = { package = "parity-scale-codec", version = "3.0.0" } serde = { version = "1.0.132", features = ["derive"] } hex-literal = "0.3.4" diff --git a/parachain-template/node/src/cli.rs b/parachain-template/node/src/cli.rs index b7cc61344e..b2e7019f69 100644 --- a/parachain-template/node/src/cli.rs +++ b/parachain-template/node/src/cli.rs @@ -34,8 +34,9 @@ pub enum Subcommand { /// Revert the chain to a previous state. Revert(sc_cli::RevertCmd), - /// The custom benchmark subcommmand benchmarking runtime pallets. - #[clap(name = "benchmark", about = "Benchmark runtime pallets.")] + /// Sub-commands concerned with benchmarking. + /// The pallet benchmarking moved to the `pallet` sub-command. + #[clap(subcommand)] Benchmark(frame_benchmarking_cli::BenchmarkCmd), /// Try some testing command against a specified runtime state. diff --git a/parachain-template/node/src/command.rs b/parachain-template/node/src/command.rs index a6a1040ceb..24f22a71d8 100644 --- a/parachain-template/node/src/command.rs +++ b/parachain-template/node/src/command.rs @@ -6,6 +6,7 @@ use crate::{ use codec::Encode; use cumulus_client_service::genesis::generate_genesis_block; use cumulus_primitives_core::ParaId; +use frame_benchmarking_cli::BenchmarkCmd; use log::info; use parachain_template_runtime::{Block, RuntimeApi}; use polkadot_parachain::primitives::AccountIdConversion; @@ -184,7 +185,7 @@ pub fn run() -> Result<()> { }, Some(Subcommand::Revert(cmd)) => { construct_async_run!(|components, cli, cmd, config| { - Ok(cmd.run(components.client, components.backend)) + Ok(cmd.run(components.client, components.backend, None)) }) }, Some(Subcommand::ExportGenesisState(params)) => { @@ -231,16 +232,38 @@ pub fn run() -> Result<()> { Ok(()) }, - Some(Subcommand::Benchmark(cmd)) => - if cfg!(feature = "runtime-benchmarks") { - let runner = cli.create_runner(cmd)?; + Some(Subcommand::Benchmark(cmd)) => { + let runner = cli.create_runner(cmd)?; + // Switch on the concrete benchmark sub-command- + match cmd { + BenchmarkCmd::Pallet(cmd) => + if cfg!(feature = "runtime-benchmarks") { + runner.sync_run(|config| cmd.run::(config)) + } else { + Err("Benchmarking wasn't enabled when building the node. \ + You can enable it with `--features runtime-benchmarks`." + .into()) + }, + BenchmarkCmd::Block(cmd) => runner.sync_run(|config| { + let partials = new_partial::( + &config, + crate::service::parachain_build_import_queue, + )?; + cmd.run(partials.client) + }), + BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| { + let partials = new_partial::( + &config, + crate::service::parachain_build_import_queue, + )?; + let db = partials.backend.expose_db(); + let storage = partials.backend.expose_storage(); - runner.sync_run(|config| cmd.run::(config)) - } else { - Err("Benchmarking wasn't enabled when building the node. \ - You can enable it with `--features runtime-benchmarks`." - .into()) - }, + cmd.run(config, partials.client.clone(), db, storage) + }), + BenchmarkCmd::Overhead(_) => Err("Unsupported benchmarking command".into()), + } + }, Some(Subcommand::TryRuntime(cmd)) => { if cfg!(feature = "try-runtime") { let runner = cli.create_runner(cmd)?; diff --git a/parachain-template/runtime/Cargo.toml b/parachain-template/runtime/Cargo.toml index 0f7d2947b5..4be12e85b1 100644 --- a/parachain-template/runtime/Cargo.toml +++ b/parachain-template/runtime/Cargo.toml @@ -17,8 +17,8 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } hex-literal = { version = "0.3.4", optional = true } -log = { version = "0.4.14", default-features = false } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +log = { version = "0.4.16", default-features = false } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.132", optional = true, features = ["derive"] } smallvec = "1.6.1" diff --git a/parachain-template/runtime/src/lib.rs b/parachain-template/runtime/src/lib.rs index 264cb4b62d..8f6171dbf8 100644 --- a/parachain-template/runtime/src/lib.rs +++ b/parachain-template/runtime/src/lib.rs @@ -28,8 +28,8 @@ use frame_support::{ construct_runtime, parameter_types, traits::Everything, weights::{ - constants::WEIGHT_PER_SECOND, DispatchClass, Weight, WeightToFeeCoefficient, - WeightToFeeCoefficients, WeightToFeePolynomial, + constants::WEIGHT_PER_SECOND, ConstantMultiplier, DispatchClass, Weight, + WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }, PalletId, }; @@ -354,8 +354,8 @@ parameter_types! { impl pallet_transaction_payment::Config for Runtime { type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter; - type TransactionByteFee = TransactionByteFee; type WeightToFee = WeightToFee; + type LengthToFee = ConstantMultiplier; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; type OperationalFeeMultiplier = OperationalFeeMultiplier; } diff --git a/polkadot-parachains/Cargo.toml b/polkadot-parachains/Cargo.toml index e65f20788f..ee0ec22e7f 100644 --- a/polkadot-parachains/Cargo.toml +++ b/polkadot-parachains/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "polkadot-collator" -version = "5.2.0" +version = "5.4.0" authors = ["Parity Technologies "] build = "build.rs" edition = "2021" @@ -10,12 +10,12 @@ name = "polkadot-collator" path = "src/main.rs" [dependencies] -async-trait = "0.1.42" +async-trait = "0.1.53" clap = { version = "3.1", features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0" } futures = { version = "0.3.1", features = ["compat"] } hex-literal = "0.3.4" -log = "0.4.8" +log = "0.4.16" serde = { version = "1.0.132", features = ["derive"] } # Local diff --git a/polkadot-parachains/canvas-kusama/Cargo.toml b/polkadot-parachains/canvas-kusama/Cargo.toml index 7dee29a1ac..8b4c312618 100644 --- a/polkadot-parachains/canvas-kusama/Cargo.toml +++ b/polkadot-parachains/canvas-kusama/Cargo.toml @@ -13,8 +13,8 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", bran [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } hex-literal = { version = "0.3.4", optional = true } -log = { version = "0.4.14", default-features = false } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +log = { version = "0.4.16", default-features = false } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.119", optional = true, features = ["derive"] } smallvec = "1.6.1" diff --git a/polkadot-parachains/canvas-kusama/src/lib.rs b/polkadot-parachains/canvas-kusama/src/lib.rs index 67b2933477..ddf15918b3 100644 --- a/polkadot-parachains/canvas-kusama/src/lib.rs +++ b/polkadot-parachains/canvas-kusama/src/lib.rs @@ -44,7 +44,7 @@ use constants::{currency::*, fee::WeightToFee}; use frame_support::{ construct_runtime, parameter_types, traits::{ConstU128, ConstU16, ConstU32, ConstU64, ConstU8, Everything}, - weights::DispatchClass, + weights::{ConstantMultiplier, DispatchClass}, PalletId, }; use frame_system::limits::{BlockLength, BlockWeights}; @@ -111,7 +111,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("canvas-kusama"), impl_name: create_runtime_str!("canvas-kusama"), authoring_version: 1, - spec_version: 16, + spec_version: 900, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -208,9 +208,9 @@ impl pallet_balances::Config for Runtime { impl pallet_transaction_payment::Config for Runtime { type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter>; - /// Relay Chain `TransactionByteFee` / 10 - type TransactionByteFee = ConstU128; type WeightToFee = WeightToFee; + /// Relay Chain `TransactionByteFee` / 10 + type LengthToFee = ConstantMultiplier>; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; type OperationalFeeMultiplier = ConstU8<5>; } diff --git a/polkadot-parachains/pallets/parachain-info/Cargo.toml b/polkadot-parachains/pallets/parachain-info/Cargo.toml index 50c7c29d7f..5718a89979 100644 --- a/polkadot-parachains/pallets/parachain-info/Cargo.toml +++ b/polkadot-parachains/pallets/parachain-info/Cargo.toml @@ -6,7 +6,7 @@ version = "0.1.0" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.132", optional = true, features = ["derive"] } frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } diff --git a/polkadot-parachains/pallets/ping/Cargo.toml b/polkadot-parachains/pallets/ping/Cargo.toml index 0ad9ca8aa6..7d7a1ca375 100644 --- a/polkadot-parachains/pallets/ping/Cargo.toml +++ b/polkadot-parachains/pallets/ping/Cargo.toml @@ -6,7 +6,7 @@ version = "0.1.0" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.132", optional = true, features = ["derive"] } sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } diff --git a/polkadot-parachains/parachains-common/Cargo.toml b/polkadot-parachains/parachains-common/Cargo.toml index 383b521de7..57a1eaa6ce 100644 --- a/polkadot-parachains/parachains-common/Cargo.toml +++ b/polkadot-parachains/parachains-common/Cargo.toml @@ -10,7 +10,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } # Substrate frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } diff --git a/polkadot-parachains/rococo-parachain/Cargo.toml b/polkadot-parachains/rococo-parachain/Cargo.toml index a205dd43e0..90560d76b3 100644 --- a/polkadot-parachains/rococo-parachain/Cargo.toml +++ b/polkadot-parachains/rococo-parachain/Cargo.toml @@ -7,8 +7,8 @@ description = "Simple runtime used by the rococo parachain(s)" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -log = { version = "0.4.14", default-features = false } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +log = { version = "0.4.16", default-features = false } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.132", optional = true, features = ["derive"] } # Substrate diff --git a/polkadot-parachains/rococo-parachain/src/lib.rs b/polkadot-parachains/rococo-parachain/src/lib.rs index 63ededdcdc..2bfe18f258 100644 --- a/polkadot-parachains/rococo-parachain/src/lib.rs +++ b/polkadot-parachains/rococo-parachain/src/lib.rs @@ -42,7 +42,7 @@ pub use frame_support::{ traits::{EnsureOneOf, Everything, IsInVec, Randomness}, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, - DispatchClass, IdentityFee, Weight, + ConstantMultiplier, DispatchClass, IdentityFee, Weight, }, StorageValue, }; @@ -94,7 +94,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("test-parachain"), impl_name: create_runtime_str!("test-parachain"), authoring_version: 1, - spec_version: 14, + spec_version: 900, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -241,8 +241,8 @@ parameter_types! { impl pallet_transaction_payment::Config for Runtime { type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter; - type TransactionByteFee = TransactionByteFee; type WeightToFee = IdentityFee; + type LengthToFee = ConstantMultiplier; type FeeMultiplierUpdate = (); type OperationalFeeMultiplier = OperationalFeeMultiplier; } diff --git a/polkadot-parachains/seedling/src/lib.rs b/polkadot-parachains/seedling/src/lib.rs index 601c8aba9e..7ca8829b1d 100644 --- a/polkadot-parachains/seedling/src/lib.rs +++ b/polkadot-parachains/seedling/src/lib.rs @@ -56,7 +56,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("seedling"), impl_name: create_runtime_str!("seedling"), authoring_version: 1, - spec_version: 1, + spec_version: 900, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, diff --git a/polkadot-parachains/shell/Cargo.toml b/polkadot-parachains/shell/Cargo.toml index ceebd96821..2b7c016df6 100644 --- a/polkadot-parachains/shell/Cargo.toml +++ b/polkadot-parachains/shell/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -log = { version = "0.4.14", default-features = false } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +log = { version = "0.4.16", default-features = false } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.132", optional = true, features = ["derive"] } # Substrate diff --git a/polkadot-parachains/src/cli.rs b/polkadot-parachains/src/cli.rs index cceb34d927..6a9106c7ee 100644 --- a/polkadot-parachains/src/cli.rs +++ b/polkadot-parachains/src/cli.rs @@ -51,8 +51,9 @@ pub enum Subcommand { /// Revert the chain to a previous state. Revert(sc_cli::RevertCmd), - /// The custom benchmark subcommmand benchmarking runtime pallets. - #[clap(name = "benchmark", about = "Benchmark runtime pallets.")] + /// Sub-commands concerned with benchmarking. + /// The pallet benchmarking moved to the `pallet` sub-command. + #[clap(subcommand)] Benchmark(frame_benchmarking_cli::BenchmarkCmd), /// Try some testing command against a specified runtime state. diff --git a/polkadot-parachains/src/command.rs b/polkadot-parachains/src/command.rs index 3c93fb8b2e..1c35bf42df 100644 --- a/polkadot-parachains/src/command.rs +++ b/polkadot-parachains/src/command.rs @@ -25,6 +25,7 @@ use crate::{ use codec::Encode; use cumulus_client_service::genesis::generate_genesis_block; use cumulus_primitives_core::ParaId; +use frame_benchmarking_cli::BenchmarkCmd; use log::info; use parachains_common::{AuraId, StatemintAuraId}; use polkadot_parachain::primitives::AccountIdConversion; @@ -268,6 +269,33 @@ fn extract_genesis_wasm(chain_spec: &Box) -> Result { + if $config.chain_spec.is_statemine() { + let $partials = new_partial::( + &$config, + crate::service::statemint_build_import_queue::<_, AuraId>, + )?; + $code + } else if $config.chain_spec.is_westmint() { + let $partials = new_partial::( + &$config, + crate::service::statemint_build_import_queue::<_, AuraId>, + )?; + $code + } else if $config.chain_spec.is_statemint() { + let $partials = new_partial::( + &$config, + crate::service::statemint_build_import_queue::<_, StatemintAuraId>, + )?; + $code + } else { + Err("The chain is not supported".into()) + } + }; +} + macro_rules! construct_async_run { (|$components:ident, $cli:ident, $cmd:ident, $config:ident| $( $code:tt )* ) => {{ let runner = $cli.create_runner($cmd)?; @@ -392,7 +420,7 @@ pub fn run() -> Result<()> { }) }, Some(Subcommand::Revert(cmd)) => construct_async_run!(|components, cli, cmd, config| { - Ok(cmd.run(components.client, components.backend)) + Ok(cmd.run(components.client, components.backend, None)) }), Some(Subcommand::ExportGenesisState(params)) => { let mut builder = sc_cli::LoggerBuilder::new(""); @@ -439,23 +467,43 @@ pub fn run() -> Result<()> { Ok(()) }, - Some(Subcommand::Benchmark(cmd)) => - if cfg!(feature = "runtime-benchmarks") { - let runner = cli.create_runner(cmd)?; - if runner.config().chain_spec.is_statemine() { - runner.sync_run(|config| cmd.run::(config)) - } else if runner.config().chain_spec.is_westmint() { - runner.sync_run(|config| cmd.run::(config)) - } else if runner.config().chain_spec.is_statemint() { - runner.sync_run(|config| cmd.run::(config)) - } else { - Err("Chain doesn't support benchmarking".into()) - } - } else { - Err("Benchmarking wasn't enabled when building the node. \ + Some(Subcommand::Benchmark(cmd)) => { + let runner = cli.create_runner(cmd)?; + + // Switch on the concrete benchmark sub-command- + match cmd { + BenchmarkCmd::Pallet(cmd) => + if cfg!(feature = "runtime-benchmarks") { + runner.sync_run(|config| { + if config.chain_spec.is_statemine() { + cmd.run::(config) + } else if config.chain_spec.is_westmint() { + cmd.run::(config) + } else if config.chain_spec.is_statemint() { + cmd.run::(config) + } else { + Err("Chain doesn't support benchmarking".into()) + } + }) + } else { + Err("Benchmarking wasn't enabled when building the node. \ You can enable it with `--features runtime-benchmarks`." - .into()) - }, + .into()) + }, + BenchmarkCmd::Block(cmd) => runner.sync_run(|config| { + construct_benchmark_partials!(config, |partials| cmd.run(partials.client)) + }), + BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| { + construct_benchmark_partials!(config, |partials| { + let db = partials.backend.expose_db(); + let storage = partials.backend.expose_storage(); + + cmd.run(config, partials.client.clone(), db, storage) + }) + }), + BenchmarkCmd::Overhead(_) => Err("Unsupported benchmarking command".into()), + } + }, Some(Subcommand::TryRuntime(cmd)) => { if cfg!(feature = "try-runtime") { // grab the task manager. diff --git a/polkadot-parachains/src/rpc.rs b/polkadot-parachains/src/rpc.rs index 7b55d75bc5..11e6d0ba0b 100644 --- a/polkadot-parachains/src/rpc.rs +++ b/polkadot-parachains/src/rpc.rs @@ -73,6 +73,7 @@ where pub fn create_canvas_kusama(deps: FullDeps) -> RpcExtension where C: ProvideRuntimeApi + + sc_client_api::BlockBackend + HeaderBackend + AuxStore + HeaderMetadata @@ -93,7 +94,8 @@ where io.extend_with(SystemApi::to_delegate(FullSystem::new(client.clone(), pool, deny_unsafe))); io.extend_with(TransactionPaymentApi::to_delegate(TransactionPayment::new(client.clone()))); - io.extend_with(ContractsApi::to_delegate(Contracts::new(client))); + io.extend_with(ContractsApi::to_delegate(Contracts::new(client.clone()))); + io.extend_with(sc_rpc::dev::DevApi::to_delegate(sc_rpc::dev::Dev::new(client, deny_unsafe))); io } diff --git a/polkadot-parachains/statemine/Cargo.toml b/polkadot-parachains/statemine/Cargo.toml index f7452a39f5..bb048a83ee 100644 --- a/polkadot-parachains/statemine/Cargo.toml +++ b/polkadot-parachains/statemine/Cargo.toml @@ -8,8 +8,8 @@ description = "Kusama variant of Statemint parachain runtime" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } hex-literal = { version = "0.3.4", optional = true } -log = { version = "0.4.14", default-features = false } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +log = { version = "0.4.16", default-features = false } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.132", optional = true, features = ["derive"] } smallvec = "1.6.1" diff --git a/polkadot-parachains/statemine/src/lib.rs b/polkadot-parachains/statemine/src/lib.rs index e93e3a31a1..eb13c6be2d 100644 --- a/polkadot-parachains/statemine/src/lib.rs +++ b/polkadot-parachains/statemine/src/lib.rs @@ -45,7 +45,7 @@ use constants::{currency::*, fee::WeightToFee}; use frame_support::{ construct_runtime, parameter_types, traits::{AsEnsureOriginWithArg, EnsureOneOf, InstanceFilter}, - weights::{DispatchClass, Weight}, + weights::{ConstantMultiplier, DispatchClass, Weight}, PalletId, RuntimeDebug, }; use frame_system::{ @@ -82,10 +82,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("statemine"), impl_name: create_runtime_str!("statemine"), authoring_version: 1, - spec_version: 700, + spec_version: 900, impl_version: 0, apis: RUNTIME_API_VERSIONS, - transaction_version: 5, + transaction_version: 6, state_version: 0, }; @@ -200,8 +200,8 @@ parameter_types! { impl pallet_transaction_payment::Config for Runtime { type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter>; - type TransactionByteFee = TransactionByteFee; type WeightToFee = WeightToFee; + type LengthToFee = ConstantMultiplier; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; type OperationalFeeMultiplier = OperationalFeeMultiplier; } diff --git a/polkadot-parachains/statemine/src/weights/cumulus_pallet_xcmp_queue.rs b/polkadot-parachains/statemine/src/weights/cumulus_pallet_xcmp_queue.rs index 0f9f87a846..72c08c5347 100644 --- a/polkadot-parachains/statemine/src/weights/cumulus_pallet_xcmp_queue.rs +++ b/polkadot-parachains/statemine/src/weights/cumulus_pallet_xcmp_queue.rs @@ -17,7 +17,7 @@ //! Autogenerated weights for `cumulus_pallet_xcmp_queue` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-03-04, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 // Executed Command: @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --json +// --json-file=./bench-statemine.json // --header=./file_header.txt // --output=./polkadot-parachains/statemine/src/weights @@ -46,13 +46,13 @@ pub struct WeightInfo(PhantomData); impl cumulus_pallet_xcmp_queue::WeightInfo for WeightInfo { // Storage: XcmpQueue QueueConfig (r:1 w:1) fn set_config_with_u32() -> Weight { - (2_609_000 as Weight) + (2_591_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: XcmpQueue QueueConfig (r:1 w:1) fn set_config_with_weight() -> Weight { - (2_602_000 as Weight) + (2_529_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } diff --git a/polkadot-parachains/statemine/src/weights/frame_system.rs b/polkadot-parachains/statemine/src/weights/frame_system.rs index c2dc29ca12..353fc66cd0 100644 --- a/polkadot-parachains/statemine/src/weights/frame_system.rs +++ b/polkadot-parachains/statemine/src/weights/frame_system.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `frame_system` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemine-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemine.json // --header=./file_header.txt // --output=./polkadot-parachains/statemine/src/weights @@ -44,18 +44,20 @@ use sp_std::marker::PhantomData; /// Weight functions for `frame_system`. pub struct WeightInfo(PhantomData); impl frame_system::WeightInfo for WeightInfo { - fn remark(_b: u32, ) -> Weight { - (0 as Weight) - } - fn remark_with_event(b: u32, ) -> Weight { + fn remark(b: u32, ) -> Weight { (0 as Weight) // Standard Error: 0 .saturating_add((1_000 as Weight).saturating_mul(b as Weight)) } + fn remark_with_event(b: u32, ) -> Weight { + (231_272_000 as Weight) + // Standard Error: 0 + .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) + } // Storage: System Digest (r:1 w:1) // Storage: unknown [0x3a686561707061676573] (r:0 w:1) fn set_heap_pages() -> Weight { - (4_156_000 as Weight) + (2_466_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -63,21 +65,21 @@ impl frame_system::WeightInfo for WeightInfo { fn set_storage(i: u32, ) -> Weight { (0 as Weight) // Standard Error: 0 - .saturating_add((517_000 as Weight).saturating_mul(i as Weight)) + .saturating_add((407_000 as Weight).saturating_mul(i as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) } // Storage: Skipped Metadata (r:0 w:0) fn kill_storage(i: u32, ) -> Weight { (0 as Weight) // Standard Error: 0 - .saturating_add((372_000 as Weight).saturating_mul(i as Weight)) + .saturating_add((300_000 as Weight).saturating_mul(i as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) } // Storage: Skipped Metadata (r:0 w:0) fn kill_prefix(p: u32, ) -> Weight { - (2_456_000 as Weight) + (0 as Weight) // Standard Error: 0 - .saturating_add((735_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((672_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) } } diff --git a/polkadot-parachains/statemine/src/weights/pallet_assets.rs b/polkadot-parachains/statemine/src/weights/pallet_assets.rs index b3d2312dbe..3b3706edf7 100644 --- a/polkadot-parachains/statemine/src/weights/pallet_assets.rs +++ b/polkadot-parachains/statemine/src/weights/pallet_assets.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_assets` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemine-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemine.json // --header=./file_header.txt // --output=./polkadot-parachains/statemine/src/weights @@ -46,13 +46,13 @@ pub struct WeightInfo(PhantomData); impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Asset (r:1 w:1) fn create() -> Weight { - (28_412_000 as Weight) + (21_739_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) fn force_create() -> Weight { - (15_615_000 as Weight) + (12_261_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -63,12 +63,12 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Approvals (r:501 w:500) fn destroy(c: u32, s: u32, a: u32, ) -> Weight { (0 as Weight) - // Standard Error: 43_000 - .saturating_add((17_671_000 as Weight).saturating_mul(c as Weight)) - // Standard Error: 43_000 - .saturating_add((21_144_000 as Weight).saturating_mul(s as Weight)) - // Standard Error: 430_000 - .saturating_add((19_246_000 as Weight).saturating_mul(a as Weight)) + // Standard Error: 38_000 + .saturating_add((12_675_000 as Weight).saturating_mul(c as Weight)) + // Standard Error: 38_000 + .saturating_add((15_906_000 as Weight).saturating_mul(s as Weight)) + // Standard Error: 380_000 + .saturating_add((13_383_000 as Weight).saturating_mul(a as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight))) .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight))) @@ -81,14 +81,14 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Asset (r:1 w:1) // Storage: Assets Account (r:1 w:1) fn mint() -> Weight { - (31_311_000 as Weight) + (24_951_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Assets Asset (r:1 w:1) // Storage: Assets Account (r:1 w:1) fn burn() -> Weight { - (35_699_000 as Weight) + (28_334_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -96,7 +96,7 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Account (r:2 w:2) // Storage: System Account (r:1 w:1) fn transfer() -> Weight { - (53_109_000 as Weight) + (41_250_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } @@ -104,7 +104,7 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Account (r:2 w:2) // Storage: System Account (r:1 w:1) fn transfer_keep_alive() -> Weight { - (44_544_000 as Weight) + (34_843_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } @@ -112,89 +112,93 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Account (r:2 w:2) // Storage: System Account (r:1 w:1) fn force_transfer() -> Weight { - (53_102_000 as Weight) + (41_377_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } // Storage: Assets Asset (r:1 w:0) // Storage: Assets Account (r:1 w:1) fn freeze() -> Weight { - (20_716_000 as Weight) + (16_794_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:0) // Storage: Assets Account (r:1 w:1) fn thaw() -> Weight { - (20_528_000 as Weight) + (16_600_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) fn freeze_asset() -> Weight { - (16_481_000 as Weight) + (13_729_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) fn thaw_asset() -> Weight { - (16_576_000 as Weight) + (13_749_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) // Storage: Assets Metadata (r:1 w:0) fn transfer_ownership() -> Weight { - (18_510_000 as Weight) + (14_651_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) fn set_team() -> Weight { - (16_486_000 as Weight) + (13_393_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:0) // Storage: Assets Metadata (r:1 w:1) - fn set_metadata(_n: u32, s: u32, ) -> Weight { - (32_925_000 as Weight) + fn set_metadata(n: u32, s: u32, ) -> Weight { + (26_365_000 as Weight) // Standard Error: 0 - .saturating_add((4_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((2_000 as Weight).saturating_mul(n as Weight)) + // Standard Error: 0 + .saturating_add((3_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:0) // Storage: Assets Metadata (r:1 w:1) fn clear_metadata() -> Weight { - (32_058_000 as Weight) + (26_123_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:0) // Storage: Assets Metadata (r:1 w:1) - fn force_set_metadata(_n: u32, _s: u32, ) -> Weight { - (18_056_000 as Weight) + fn force_set_metadata(_n: u32, s: u32, ) -> Weight { + (15_431_000 as Weight) + // Standard Error: 0 + .saturating_add((1_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:0) // Storage: Assets Metadata (r:1 w:1) fn force_clear_metadata() -> Weight { - (32_079_000 as Weight) + (26_658_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) fn force_asset_status() -> Weight { - (15_987_000 as Weight) + (13_875_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) // Storage: Assets Approvals (r:1 w:1) fn approve_transfer() -> Weight { - (36_595_000 as Weight) + (29_797_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -203,21 +207,21 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Account (r:2 w:2) // Storage: System Account (r:1 w:1) fn transfer_approved() -> Weight { - (67_831_000 as Weight) + (53_337_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } // Storage: Assets Asset (r:1 w:1) // Storage: Assets Approvals (r:1 w:1) fn cancel_approval() -> Weight { - (37_717_000 as Weight) + (29_970_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Assets Asset (r:1 w:1) // Storage: Assets Approvals (r:1 w:1) fn force_cancel_approval() -> Weight { - (39_091_000 as Weight) + (31_972_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/polkadot-parachains/statemine/src/weights/pallet_balances.rs b/polkadot-parachains/statemine/src/weights/pallet_balances.rs index 162b4d09c1..cfb8cd23b3 100644 --- a/polkadot-parachains/statemine/src/weights/pallet_balances.rs +++ b/polkadot-parachains/statemine/src/weights/pallet_balances.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_balances` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemine-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemine.json // --header=./file_header.txt // --output=./polkadot-parachains/statemine/src/weights @@ -46,43 +46,43 @@ pub struct WeightInfo(PhantomData); impl pallet_balances::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) fn transfer() -> Weight { - (47_484_000 as Weight) + (34_472_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: System Account (r:1 w:1) fn transfer_keep_alive() -> Weight { - (36_278_000 as Weight) + (26_282_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: System Account (r:1 w:1) fn set_balance_creating() -> Weight { - (21_779_000 as Weight) + (15_707_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: System Account (r:1 w:1) fn set_balance_killing() -> Weight { - (26_046_000 as Weight) + (18_951_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: System Account (r:2 w:2) fn force_transfer() -> Weight { - (47_213_000 as Weight) + (34_740_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: System Account (r:1 w:1) fn transfer_all() -> Weight { - (43_125_000 as Weight) + (31_709_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: System Account (r:1 w:1) fn force_unreserve() -> Weight { - (20_102_000 as Weight) + (14_427_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } diff --git a/polkadot-parachains/statemine/src/weights/pallet_collator_selection.rs b/polkadot-parachains/statemine/src/weights/pallet_collator_selection.rs index e58d220e8e..1137b86ce8 100644 --- a/polkadot-parachains/statemine/src/weights/pallet_collator_selection.rs +++ b/polkadot-parachains/statemine/src/weights/pallet_collator_selection.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_collator_selection` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemine-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemine.json // --header=./file_header.txt // --output=./polkadot-parachains/statemine/src/weights @@ -44,21 +44,23 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_collator_selection`. pub struct WeightInfo(PhantomData); impl pallet_collator_selection::WeightInfo for WeightInfo { + // Storage: Session NextKeys (r:1 w:0) // Storage: CollatorSelection Invulnerables (r:0 w:1) fn set_invulnerables(b: u32, ) -> Weight { - (12_783_000 as Weight) - // Standard Error: 0 - .saturating_add((30_000 as Weight).saturating_mul(b as Weight)) + (10_709_000 as Weight) + // Standard Error: 3_000 + .saturating_add((2_851_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: CollatorSelection DesiredCandidates (r:0 w:1) fn set_desired_candidates() -> Weight { - (11_543_000 as Weight) + (9_173_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: CollatorSelection CandidacyBond (r:0 w:1) fn set_candidacy_bond() -> Weight { - (11_899_000 as Weight) + (9_226_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: CollatorSelection Candidates (r:1 w:1) @@ -68,18 +70,18 @@ impl pallet_collator_selection::WeightInfo for WeightIn // Storage: CollatorSelection CandidacyBond (r:1 w:0) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn register_as_candidate(c: u32, ) -> Weight { - (57_400_000 as Weight) + (47_870_000 as Weight) // Standard Error: 1_000 - .saturating_add((125_000 as Weight).saturating_mul(c as Weight)) + .saturating_add((96_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn leave_intent(c: u32, ) -> Weight { - (60_267_000 as Weight) + (49_602_000 as Weight) // Standard Error: 1_000 - .saturating_add((173_000 as Weight).saturating_mul(c as Weight)) + .saturating_add((105_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -87,7 +89,7 @@ impl pallet_collator_selection::WeightInfo for WeightIn // Storage: System BlockWeight (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn note_author() -> Weight { - (41_880_000 as Weight) + (31_361_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } @@ -98,10 +100,10 @@ impl pallet_collator_selection::WeightInfo for WeightIn // Storage: System BlockWeight (r:1 w:1) fn new_session(r: u32, c: u32, ) -> Weight { (0 as Weight) - // Standard Error: 3_326_000 - .saturating_add((16_801_000 as Weight).saturating_mul(r as Weight)) - // Standard Error: 3_326_000 - .saturating_add((87_237_000 as Weight).saturating_mul(c as Weight)) + // Standard Error: 2_219_000 + .saturating_add((13_259_000 as Weight).saturating_mul(r as Weight)) + // Standard Error: 2_219_000 + .saturating_add((58_670_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight))) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(c as Weight))) diff --git a/polkadot-parachains/statemine/src/weights/pallet_multisig.rs b/polkadot-parachains/statemine/src/weights/pallet_multisig.rs index d865801620..12468f3d6f 100644 --- a/polkadot-parachains/statemine/src/weights/pallet_multisig.rs +++ b/polkadot-parachains/statemine/src/weights/pallet_multisig.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_multisig` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemine-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemine.json // --header=./file_header.txt // --output=./polkadot-parachains/statemine/src/weights @@ -45,18 +45,18 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_multisig::WeightInfo for WeightInfo { fn as_multi_threshold_1(z: u32, ) -> Weight { - (17_130_000 as Weight) + (12_699_000 as Weight) // Standard Error: 0 .saturating_add((1_000 as Weight).saturating_mul(z as Weight)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn as_multi_create(s: u32, z: u32, ) -> Weight { - (38_375_000 as Weight) - // Standard Error: 1_000 - .saturating_add((126_000 as Weight).saturating_mul(s as Weight)) + (27_757_000 as Weight) // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(z as Weight)) + .saturating_add((113_000 as Weight).saturating_mul(s as Weight)) + // Standard Error: 0 + .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -64,9 +64,9 @@ impl pallet_multisig::WeightInfo for WeightInfo { // Storage: Multisig Calls (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn as_multi_create_store(s: u32, z: u32, ) -> Weight { - (42_301_000 as Weight) + (30_855_000 as Weight) // Standard Error: 1_000 - .saturating_add((133_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((112_000 as Weight).saturating_mul(s as Weight)) // Standard Error: 0 .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) @@ -74,20 +74,20 @@ impl pallet_multisig::WeightInfo for WeightInfo { } // Storage: Multisig Multisigs (r:1 w:1) fn as_multi_approve(s: u32, z: u32, ) -> Weight { - (25_889_000 as Weight) - // Standard Error: 1_000 - .saturating_add((122_000 as Weight).saturating_mul(s as Weight)) + (16_828_000 as Weight) // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(z as Weight)) + .saturating_add((120_000 as Weight).saturating_mul(s as Weight)) + // Standard Error: 0 + .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) fn as_multi_approve_store(s: u32, z: u32, ) -> Weight { - (41_808_000 as Weight) + (29_937_000 as Weight) // Standard Error: 1_000 - .saturating_add((128_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((123_000 as Weight).saturating_mul(s as Weight)) // Standard Error: 0 .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) @@ -97,29 +97,29 @@ impl pallet_multisig::WeightInfo for WeightInfo { // Storage: Multisig Calls (r:1 w:1) // Storage: System Account (r:1 w:1) fn as_multi_complete(s: u32, z: u32, ) -> Weight { - (50_788_000 as Weight) - // Standard Error: 1_000 - .saturating_add((214_000 as Weight).saturating_mul(s as Weight)) + (38_564_000 as Weight) // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) + .saturating_add((162_000 as Weight).saturating_mul(s as Weight)) + // Standard Error: 0 + .saturating_add((4_000 as Weight).saturating_mul(z as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn approve_as_multi_create(s: u32, ) -> Weight { - (36_971_000 as Weight) - // Standard Error: 1_000 - .saturating_add((146_000 as Weight).saturating_mul(s as Weight)) + (27_560_000 as Weight) + // Standard Error: 0 + .saturating_add((112_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:0) fn approve_as_multi_approve(s: u32, ) -> Weight { - (23_165_000 as Weight) + (16_925_000 as Weight) // Standard Error: 0 - .saturating_add((143_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((121_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -127,18 +127,18 @@ impl pallet_multisig::WeightInfo for WeightInfo { // Storage: Multisig Calls (r:1 w:1) // Storage: System Account (r:1 w:1) fn approve_as_multi_complete(s: u32, ) -> Weight { - (68_980_000 as Weight) + (71_474_000 as Weight) // Standard Error: 1_000 - .saturating_add((227_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((164_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) fn cancel_as_multi(s: u32, ) -> Weight { - (56_144_000 as Weight) - // Standard Error: 0 - .saturating_add((147_000 as Weight).saturating_mul(s as Weight)) + (49_848_000 as Weight) + // Standard Error: 1_000 + .saturating_add((111_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/polkadot-parachains/statemine/src/weights/pallet_proxy.rs b/polkadot-parachains/statemine/src/weights/pallet_proxy.rs index d5a1d98311..55053fe6ba 100644 --- a/polkadot-parachains/statemine/src/weights/pallet_proxy.rs +++ b/polkadot-parachains/statemine/src/weights/pallet_proxy.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_proxy` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemine-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemine.json // --header=./file_header.txt // --output=./polkadot-parachains/statemine/src/weights @@ -46,42 +46,42 @@ pub struct WeightInfo(PhantomData); impl pallet_proxy::WeightInfo for WeightInfo { // Storage: Proxy Proxies (r:1 w:0) fn proxy(p: u32, ) -> Weight { - (17_911_000 as Weight) - // Standard Error: 1_000 - .saturating_add((104_000 as Weight).saturating_mul(p as Weight)) + (13_530_000 as Weight) + // Standard Error: 2_000 + .saturating_add((91_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) } // Storage: Proxy Proxies (r:1 w:0) // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) fn proxy_announced(a: u32, p: u32, ) -> Weight { - (37_913_000 as Weight) + (29_316_000 as Weight) // Standard Error: 1_000 - .saturating_add((302_000 as Weight).saturating_mul(a as Weight)) + .saturating_add((218_000 as Weight).saturating_mul(a as Weight)) // Standard Error: 1_000 - .saturating_add((121_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((92_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) fn remove_announcement(a: u32, p: u32, ) -> Weight { - (26_169_000 as Weight) + (19_752_000 as Weight) // Standard Error: 1_000 - .saturating_add((317_000 as Weight).saturating_mul(a as Weight)) - // Standard Error: 2_000 - .saturating_add((31_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((230_000 as Weight).saturating_mul(a as Weight)) + // Standard Error: 1_000 + .saturating_add((14_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) fn reject_announcement(a: u32, p: u32, ) -> Weight { - (26_532_000 as Weight) + (19_699_000 as Weight) // Standard Error: 1_000 - .saturating_add((311_000 as Weight).saturating_mul(a as Weight)) + .saturating_add((231_000 as Weight).saturating_mul(a as Weight)) // Standard Error: 1_000 - .saturating_add((25_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((16_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -89,52 +89,52 @@ impl pallet_proxy::WeightInfo for WeightInfo { // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) fn announce(a: u32, p: u32, ) -> Weight { - (36_020_000 as Weight) + (27_298_000 as Weight) // Standard Error: 1_000 - .saturating_add((290_000 as Weight).saturating_mul(a as Weight)) - // Standard Error: 2_000 - .saturating_add((121_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((218_000 as Weight).saturating_mul(a as Weight)) + // Standard Error: 1_000 + .saturating_add((88_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Proxy Proxies (r:1 w:1) fn add_proxy(p: u32, ) -> Weight { - (30_633_000 as Weight) + (22_349_000 as Weight) // Standard Error: 2_000 - .saturating_add((136_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((147_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Proxy Proxies (r:1 w:1) fn remove_proxy(p: u32, ) -> Weight { - (25_833_000 as Weight) + (18_618_000 as Weight) // Standard Error: 2_000 - .saturating_add((153_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((161_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Proxy Proxies (r:1 w:1) fn remove_proxies(p: u32, ) -> Weight { - (25_512_000 as Weight) - // Standard Error: 2_000 - .saturating_add((107_000 as Weight).saturating_mul(p as Weight)) + (18_655_000 as Weight) + // Standard Error: 1_000 + .saturating_add((85_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) // Storage: Proxy Proxies (r:1 w:1) fn anonymous(p: u32, ) -> Weight { - (34_376_000 as Weight) + (25_367_000 as Weight) // Standard Error: 2_000 - .saturating_add((5_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((29_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Proxy Proxies (r:1 w:1) fn kill_anonymous(p: u32, ) -> Weight { - (27_066_000 as Weight) - // Standard Error: 2_000 - .saturating_add((101_000 as Weight).saturating_mul(p as Weight)) + (19_688_000 as Weight) + // Standard Error: 1_000 + .saturating_add((84_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } diff --git a/polkadot-parachains/statemine/src/weights/pallet_session.rs b/polkadot-parachains/statemine/src/weights/pallet_session.rs index 7e5e522458..03504325bf 100644 --- a/polkadot-parachains/statemine/src/weights/pallet_session.rs +++ b/polkadot-parachains/statemine/src/weights/pallet_session.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_session` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemine-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemine.json // --header=./file_header.txt // --output=./polkadot-parachains/statemine/src/weights @@ -47,14 +47,14 @@ impl pallet_session::WeightInfo for WeightInfo { // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:1 w:1) fn set_keys() -> Weight { - (16_852_000 as Weight) + (11_938_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:0 w:1) fn purge_keys() -> Weight { - (13_319_000 as Weight) + (9_197_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/polkadot-parachains/statemine/src/weights/pallet_timestamp.rs b/polkadot-parachains/statemine/src/weights/pallet_timestamp.rs index 903adc8de7..24b7842db9 100644 --- a/polkadot-parachains/statemine/src/weights/pallet_timestamp.rs +++ b/polkadot-parachains/statemine/src/weights/pallet_timestamp.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_timestamp` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemine-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemine.json // --header=./file_header.txt // --output=./polkadot-parachains/statemine/src/weights @@ -46,11 +46,11 @@ pub struct WeightInfo(PhantomData); impl pallet_timestamp::WeightInfo for WeightInfo { // Storage: Timestamp Now (r:1 w:1) fn set() -> Weight { - (5_241_000 as Weight) + (3_420_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn on_finalize() -> Weight { - (3_270_000 as Weight) + (2_265_000 as Weight) } } diff --git a/polkadot-parachains/statemine/src/weights/pallet_uniques.rs b/polkadot-parachains/statemine/src/weights/pallet_uniques.rs index d4cb007c6a..2dd398592e 100644 --- a/polkadot-parachains/statemine/src/weights/pallet_uniques.rs +++ b/polkadot-parachains/statemine/src/weights/pallet_uniques.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_uniques` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemine-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemine.json // --header=./file_header.txt // --output=./polkadot-parachains/statemine/src/weights @@ -47,14 +47,14 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Class (r:1 w:1) // Storage: Uniques ClassAccount (r:0 w:1) fn create() -> Weight { - (31_145_000 as Weight) + (23_105_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Uniques Class (r:1 w:1) // Storage: Uniques ClassAccount (r:0 w:1) fn force_create() -> Weight { - (17_647_000 as Weight) + (13_084_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -67,12 +67,12 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Account (r:0 w:20) fn destroy(n: u32, m: u32, a: u32, ) -> Weight { (0 as Weight) - // Standard Error: 16_000 - .saturating_add((12_479_000 as Weight).saturating_mul(n as Weight)) - // Standard Error: 16_000 - .saturating_add((1_029_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 16_000 - .saturating_add((924_000 as Weight).saturating_mul(a as Weight)) + // Standard Error: 14_000 + .saturating_add((9_091_000 as Weight).saturating_mul(n as Weight)) + // Standard Error: 14_000 + .saturating_add((977_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 14_000 + .saturating_add((864_000 as Weight).saturating_mul(a as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight))) .saturating_add(T::DbWeight::get().writes(3 as Weight)) @@ -84,7 +84,7 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Class (r:1 w:1) // Storage: Uniques Account (r:0 w:1) fn mint() -> Weight { - (39_126_000 as Weight) + (28_885_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } @@ -92,7 +92,7 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Asset (r:1 w:1) // Storage: Uniques Account (r:0 w:1) fn burn() -> Weight { - (40_575_000 as Weight) + (30_093_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } @@ -100,7 +100,7 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Asset (r:1 w:1) // Storage: Uniques Account (r:0 w:2) fn transfer() -> Weight { - (31_171_000 as Weight) + (22_434_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } @@ -108,8 +108,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Asset (r:100 w:100) fn redeposit(i: u32, ) -> Weight { (0 as Weight) - // Standard Error: 16_000 - .saturating_add((16_524_000 as Weight).saturating_mul(i as Weight)) + // Standard Error: 12_000 + .saturating_add((11_849_000 as Weight).saturating_mul(i as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(i as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) @@ -118,26 +118,26 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Asset (r:1 w:1) // Storage: Uniques Class (r:1 w:0) fn freeze() -> Weight { - (23_392_000 as Weight) + (17_567_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Asset (r:1 w:1) // Storage: Uniques Class (r:1 w:0) fn thaw() -> Weight { - (23_316_000 as Weight) + (17_245_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Class (r:1 w:1) fn freeze_class() -> Weight { - (17_780_000 as Weight) + (13_243_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Class (r:1 w:1) fn thaw_class() -> Weight { - (17_612_000 as Weight) + (12_996_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -145,20 +145,20 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: Uniques ClassAccount (r:0 w:2) fn transfer_ownership() -> Weight { - (39_983_000 as Weight) + (29_714_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } // Storage: Uniques Class (r:1 w:1) fn set_team() -> Weight { - (18_496_000 as Weight) + (13_567_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Class (r:1 w:1) // Storage: Uniques ClassAccount (r:0 w:1) fn force_asset_status() -> Weight { - (21_563_000 as Weight) + (16_719_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -166,7 +166,7 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques InstanceMetadataOf (r:1 w:0) // Storage: Uniques Attribute (r:1 w:1) fn set_attribute() -> Weight { - (49_220_000 as Weight) + (36_533_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -174,49 +174,49 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques InstanceMetadataOf (r:1 w:0) // Storage: Uniques Attribute (r:1 w:1) fn clear_attribute() -> Weight { - (46_649_000 as Weight) + (34_897_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Uniques Class (r:1 w:1) // Storage: Uniques InstanceMetadataOf (r:1 w:1) fn set_metadata() -> Weight { - (37_999_000 as Weight) + (28_928_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Uniques Class (r:1 w:1) // Storage: Uniques InstanceMetadataOf (r:1 w:1) fn clear_metadata() -> Weight { - (38_576_000 as Weight) + (28_986_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Uniques Class (r:1 w:1) // Storage: Uniques ClassMetadataOf (r:1 w:1) fn set_class_metadata() -> Weight { - (36_539_000 as Weight) + (28_446_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Uniques Class (r:1 w:0) // Storage: Uniques ClassMetadataOf (r:1 w:1) fn clear_class_metadata() -> Weight { - (34_816_000 as Weight) + (26_425_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Class (r:1 w:0) // Storage: Uniques Asset (r:1 w:1) fn approve_transfer() -> Weight { - (25_707_000 as Weight) + (19_368_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Class (r:1 w:0) // Storage: Uniques Asset (r:1 w:1) fn cancel_approval() -> Weight { - (25_500_000 as Weight) + (19_094_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } diff --git a/polkadot-parachains/statemine/src/weights/pallet_utility.rs b/polkadot-parachains/statemine/src/weights/pallet_utility.rs index 6f26e343bb..0df62fbc03 100644 --- a/polkadot-parachains/statemine/src/weights/pallet_utility.rs +++ b/polkadot-parachains/statemine/src/weights/pallet_utility.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_utility` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemine-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemine.json // --header=./file_header.txt // --output=./polkadot-parachains/statemine/src/weights @@ -45,19 +45,19 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_utility::WeightInfo for WeightInfo { fn batch(c: u32, ) -> Weight { - (19_264_000 as Weight) - // Standard Error: 1_000 - .saturating_add((3_565_000 as Weight).saturating_mul(c as Weight)) + (15_856_000 as Weight) + // Standard Error: 2_000 + .saturating_add((3_602_000 as Weight).saturating_mul(c as Weight)) } fn as_derivative() -> Weight { - (2_847_000 as Weight) + (2_394_000 as Weight) } fn batch_all(c: u32, ) -> Weight { - (20_771_000 as Weight) - // Standard Error: 1_000 - .saturating_add((3_902_000 as Weight).saturating_mul(c as Weight)) + (18_190_000 as Weight) + // Standard Error: 2_000 + .saturating_add((3_901_000 as Weight).saturating_mul(c as Weight)) } fn dispatch_as() -> Weight { - (11_851_000 as Weight) + (8_310_000 as Weight) } } diff --git a/polkadot-parachains/statemint/Cargo.toml b/polkadot-parachains/statemint/Cargo.toml index 4fb5746f98..d81e9f6332 100644 --- a/polkadot-parachains/statemint/Cargo.toml +++ b/polkadot-parachains/statemint/Cargo.toml @@ -8,9 +8,9 @@ description = "Statemint parachain runtime" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } hex-literal = { version = "0.3.4", optional = true } -log = { version = "0.4.14", default-features = false } +log = { version = "0.4.16", default-features = false } serde = { version = "1.0.132", optional = true, features = ["derive"] } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } smallvec = "1.6.1" # Substrate diff --git a/polkadot-parachains/statemint/src/lib.rs b/polkadot-parachains/statemint/src/lib.rs index 81f072ad7e..25fad09936 100644 --- a/polkadot-parachains/statemint/src/lib.rs +++ b/polkadot-parachains/statemint/src/lib.rs @@ -44,8 +44,8 @@ use codec::{Decode, Encode, MaxEncodedLen}; use constants::{currency::*, fee::WeightToFee}; use frame_support::{ construct_runtime, parameter_types, - traits::{AsEnsureOriginWithArg, Contains, EnsureOneOf, InstanceFilter}, - weights::{DispatchClass, Weight}, + traits::{AsEnsureOriginWithArg, EnsureOneOf, InstanceFilter}, + weights::{ConstantMultiplier, DispatchClass, Weight}, PalletId, RuntimeDebug, }; use frame_system::{ @@ -83,10 +83,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("statemint"), impl_name: create_runtime_str!("statemint"), authoring_version: 1, - spec_version: 700, + spec_version: 900, impl_version: 0, apis: RUNTIME_API_VERSIONS, - transaction_version: 5, + transaction_version: 6, state_version: 0, }; @@ -121,21 +121,9 @@ parameter_types! { pub const SS58Prefix: u8 = 0; } -pub struct BaseFilter; -impl Contains for BaseFilter { - fn contains(c: &Call) -> bool { - // Disable permissionless asset creation. - !matches!( - c, - Call::Assets(pallet_assets::Call::create { .. }) | - Call::Uniques(pallet_uniques::Call::create { .. }) - ) - } -} - // Configure FRAME pallets to include in runtime. impl frame_system::Config for Runtime { - type BaseCallFilter = BaseFilter; + type BaseCallFilter = frame_support::traits::Everything; type BlockWeights = RuntimeBlockWeights; type BlockLength = RuntimeBlockLength; type AccountId = AccountId; @@ -213,8 +201,8 @@ parameter_types! { impl pallet_transaction_payment::Config for Runtime { type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter>; - type TransactionByteFee = TransactionByteFee; type WeightToFee = WeightToFee; + type LengthToFee = ConstantMultiplier; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; type OperationalFeeMultiplier = OperationalFeeMultiplier; } diff --git a/polkadot-parachains/statemint/src/weights/cumulus_pallet_xcmp_queue.rs b/polkadot-parachains/statemint/src/weights/cumulus_pallet_xcmp_queue.rs index 1be5a92cb8..0d322f742d 100644 --- a/polkadot-parachains/statemint/src/weights/cumulus_pallet_xcmp_queue.rs +++ b/polkadot-parachains/statemint/src/weights/cumulus_pallet_xcmp_queue.rs @@ -17,7 +17,7 @@ //! Autogenerated weights for `cumulus_pallet_xcmp_queue` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-03-04, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 // Executed Command: @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --json +// --json-file=./bench-statemint.json // --header=./file_header.txt // --output=./polkadot-parachains/statemint/src/weights @@ -46,13 +46,13 @@ pub struct WeightInfo(PhantomData); impl cumulus_pallet_xcmp_queue::WeightInfo for WeightInfo { // Storage: XcmpQueue QueueConfig (r:1 w:1) fn set_config_with_u32() -> Weight { - (2_587_000 as Weight) + (2_711_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: XcmpQueue QueueConfig (r:1 w:1) fn set_config_with_weight() -> Weight { - (2_540_000 as Weight) + (2_627_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } diff --git a/polkadot-parachains/statemint/src/weights/frame_system.rs b/polkadot-parachains/statemint/src/weights/frame_system.rs index 6c1eebb8be..89a63ce760 100644 --- a/polkadot-parachains/statemint/src/weights/frame_system.rs +++ b/polkadot-parachains/statemint/src/weights/frame_system.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `frame_system` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemint.json // --header=./file_header.txt // --output=./polkadot-parachains/statemint/src/weights @@ -44,18 +44,20 @@ use sp_std::marker::PhantomData; /// Weight functions for `frame_system`. pub struct WeightInfo(PhantomData); impl frame_system::WeightInfo for WeightInfo { - fn remark(_b: u32, ) -> Weight { - (0 as Weight) - } - fn remark_with_event(b: u32, ) -> Weight { + fn remark(b: u32, ) -> Weight { (0 as Weight) // Standard Error: 0 .saturating_add((1_000 as Weight).saturating_mul(b as Weight)) } + fn remark_with_event(b: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 0 + .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) + } // Storage: System Digest (r:1 w:1) // Storage: unknown [0x3a686561707061676573] (r:0 w:1) fn set_heap_pages() -> Weight { - (4_036_000 as Weight) + (2_470_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -63,21 +65,21 @@ impl frame_system::WeightInfo for WeightInfo { fn set_storage(i: u32, ) -> Weight { (0 as Weight) // Standard Error: 0 - .saturating_add((530_000 as Weight).saturating_mul(i as Weight)) + .saturating_add((403_000 as Weight).saturating_mul(i as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) } // Storage: Skipped Metadata (r:0 w:0) fn kill_storage(i: u32, ) -> Weight { - (1_120_000 as Weight) + (0 as Weight) // Standard Error: 0 - .saturating_add((366_000 as Weight).saturating_mul(i as Weight)) + .saturating_add((304_000 as Weight).saturating_mul(i as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) } // Storage: Skipped Metadata (r:0 w:0) fn kill_prefix(p: u32, ) -> Weight { - (374_000 as Weight) - // Standard Error: 0 - .saturating_add((743_000 as Weight).saturating_mul(p as Weight)) + (0 as Weight) + // Standard Error: 1_000 + .saturating_add((677_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) } } diff --git a/polkadot-parachains/statemint/src/weights/pallet_assets.rs b/polkadot-parachains/statemint/src/weights/pallet_assets.rs index ff77a42205..f7964cfa7f 100644 --- a/polkadot-parachains/statemint/src/weights/pallet_assets.rs +++ b/polkadot-parachains/statemint/src/weights/pallet_assets.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_assets` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemint.json // --header=./file_header.txt // --output=./polkadot-parachains/statemint/src/weights @@ -46,13 +46,13 @@ pub struct WeightInfo(PhantomData); impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Asset (r:1 w:1) fn create() -> Weight { - (28_806_000 as Weight) + (21_863_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) fn force_create() -> Weight { - (15_830_000 as Weight) + (12_397_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -63,12 +63,12 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Approvals (r:501 w:500) fn destroy(c: u32, s: u32, a: u32, ) -> Weight { (0 as Weight) - // Standard Error: 38_000 - .saturating_add((17_805_000 as Weight).saturating_mul(c as Weight)) - // Standard Error: 38_000 - .saturating_add((21_592_000 as Weight).saturating_mul(s as Weight)) - // Standard Error: 381_000 - .saturating_add((23_465_000 as Weight).saturating_mul(a as Weight)) + // Standard Error: 33_000 + .saturating_add((13_738_000 as Weight).saturating_mul(c as Weight)) + // Standard Error: 33_000 + .saturating_add((16_229_000 as Weight).saturating_mul(s as Weight)) + // Standard Error: 333_000 + .saturating_add((16_128_000 as Weight).saturating_mul(a as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight))) .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight))) @@ -81,14 +81,14 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Asset (r:1 w:1) // Storage: Assets Account (r:1 w:1) fn mint() -> Weight { - (33_392_000 as Weight) + (25_048_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Assets Asset (r:1 w:1) // Storage: Assets Account (r:1 w:1) fn burn() -> Weight { - (38_194_000 as Weight) + (28_836_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -96,7 +96,7 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Account (r:2 w:2) // Storage: System Account (r:1 w:1) fn transfer() -> Weight { - (55_829_000 as Weight) + (41_618_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } @@ -104,7 +104,7 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Account (r:2 w:2) // Storage: System Account (r:1 w:1) fn transfer_keep_alive() -> Weight { - (46_927_000 as Weight) + (34_970_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } @@ -112,71 +112,55 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Account (r:2 w:2) // Storage: System Account (r:1 w:1) fn force_transfer() -> Weight { - (55_752_000 as Weight) + (41_599_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } // Storage: Assets Asset (r:1 w:0) // Storage: Assets Account (r:1 w:1) fn freeze() -> Weight { - (22_687_000 as Weight) + (17_589_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:0) // Storage: Assets Account (r:1 w:1) fn thaw() -> Weight { - (22_899_000 as Weight) + (17_125_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) fn freeze_asset() -> Weight { - (18_806_000 as Weight) + (14_462_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) fn thaw_asset() -> Weight { - (18_756_000 as Weight) + (14_305_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) // Storage: Assets Metadata (r:1 w:0) fn transfer_ownership() -> Weight { - (20_394_000 as Weight) + (14_822_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) fn set_team() -> Weight { - (18_709_000 as Weight) + (13_671_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:0) // Storage: Assets Metadata (r:1 w:1) - fn set_metadata(_n: u32, s: u32, ) -> Weight { - (34_854_000 as Weight) + fn set_metadata(n: u32, s: u32, ) -> Weight { + (26_785_000 as Weight) // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - // Storage: Assets Asset (r:1 w:0) - // Storage: Assets Metadata (r:1 w:1) - fn clear_metadata() -> Weight { - (36_206_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - // Storage: Assets Asset (r:1 w:0) - // Storage: Assets Metadata (r:1 w:1) - fn force_set_metadata(n: u32, s: u32, ) -> Weight { - (19_698_000 as Weight) - // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(n as Weight)) + .saturating_add((3_000 as Weight).saturating_mul(n as Weight)) // Standard Error: 0 .saturating_add((3_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) @@ -184,21 +168,37 @@ impl pallet_assets::WeightInfo for WeightInfo { } // Storage: Assets Asset (r:1 w:0) // Storage: Assets Metadata (r:1 w:1) + fn clear_metadata() -> Weight { + (26_324_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + // Storage: Assets Asset (r:1 w:0) + // Storage: Assets Metadata (r:1 w:1) + fn force_set_metadata(_n: u32, s: u32, ) -> Weight { + (15_401_000 as Weight) + // Standard Error: 0 + .saturating_add((2_000 as Weight).saturating_mul(s as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } + // Storage: Assets Asset (r:1 w:0) + // Storage: Assets Metadata (r:1 w:1) fn force_clear_metadata() -> Weight { - (34_564_000 as Weight) + (27_105_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) fn force_asset_status() -> Weight { - (17_726_000 as Weight) + (13_699_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) // Storage: Assets Approvals (r:1 w:1) fn approve_transfer() -> Weight { - (38_783_000 as Weight) + (29_677_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -207,21 +207,21 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Account (r:2 w:2) // Storage: System Account (r:1 w:1) fn transfer_approved() -> Weight { - (70_548_000 as Weight) + (53_717_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } // Storage: Assets Asset (r:1 w:1) // Storage: Assets Approvals (r:1 w:1) fn cancel_approval() -> Weight { - (39_947_000 as Weight) + (30_229_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Assets Asset (r:1 w:1) // Storage: Assets Approvals (r:1 w:1) fn force_cancel_approval() -> Weight { - (41_476_000 as Weight) + (32_073_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/polkadot-parachains/statemint/src/weights/pallet_balances.rs b/polkadot-parachains/statemint/src/weights/pallet_balances.rs index 1107f6ab79..e9e8231286 100644 --- a/polkadot-parachains/statemint/src/weights/pallet_balances.rs +++ b/polkadot-parachains/statemint/src/weights/pallet_balances.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_balances` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemint.json // --header=./file_header.txt // --output=./polkadot-parachains/statemint/src/weights @@ -46,43 +46,43 @@ pub struct WeightInfo(PhantomData); impl pallet_balances::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) fn transfer() -> Weight { - (48_345_000 as Weight) + (35_007_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: System Account (r:1 w:1) fn transfer_keep_alive() -> Weight { - (37_265_000 as Weight) + (26_281_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: System Account (r:1 w:1) fn set_balance_creating() -> Weight { - (22_148_000 as Weight) + (15_471_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: System Account (r:1 w:1) fn set_balance_killing() -> Weight { - (25_976_000 as Weight) + (19_057_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: System Account (r:2 w:2) fn force_transfer() -> Weight { - (49_363_000 as Weight) + (35_036_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: System Account (r:1 w:1) fn transfer_all() -> Weight { - (44_934_000 as Weight) + (31_988_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: System Account (r:1 w:1) fn force_unreserve() -> Weight { - (20_594_000 as Weight) + (14_337_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } diff --git a/polkadot-parachains/statemint/src/weights/pallet_collator_selection.rs b/polkadot-parachains/statemint/src/weights/pallet_collator_selection.rs index 28548748e1..a55a2f8b7c 100644 --- a/polkadot-parachains/statemint/src/weights/pallet_collator_selection.rs +++ b/polkadot-parachains/statemint/src/weights/pallet_collator_selection.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_collator_selection` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemint.json // --header=./file_header.txt // --output=./polkadot-parachains/statemint/src/weights @@ -44,21 +44,23 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_collator_selection`. pub struct WeightInfo(PhantomData); impl pallet_collator_selection::WeightInfo for WeightInfo { + // Storage: Session NextKeys (r:1 w:0) // Storage: CollatorSelection Invulnerables (r:0 w:1) fn set_invulnerables(b: u32, ) -> Weight { - (13_144_000 as Weight) - // Standard Error: 0 - .saturating_add((31_000 as Weight).saturating_mul(b as Weight)) + (8_883_000 as Weight) + // Standard Error: 3_000 + .saturating_add((2_927_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: CollatorSelection DesiredCandidates (r:0 w:1) fn set_desired_candidates() -> Weight { - (11_782_000 as Weight) + (9_058_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: CollatorSelection CandidacyBond (r:0 w:1) fn set_candidacy_bond() -> Weight { - (12_277_000 as Weight) + (9_102_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: CollatorSelection Candidates (r:1 w:1) @@ -68,18 +70,18 @@ impl pallet_collator_selection::WeightInfo for WeightIn // Storage: CollatorSelection CandidacyBond (r:1 w:0) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn register_as_candidate(c: u32, ) -> Weight { - (60_875_000 as Weight) + (52_247_000 as Weight) // Standard Error: 1_000 - .saturating_add((123_000 as Weight).saturating_mul(c as Weight)) + .saturating_add((94_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn leave_intent(c: u32, ) -> Weight { - (49_901_000 as Weight) - // Standard Error: 0 - .saturating_add((188_000 as Weight).saturating_mul(c as Weight)) + (42_428_000 as Weight) + // Standard Error: 1_000 + .saturating_add((117_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -87,7 +89,7 @@ impl pallet_collator_selection::WeightInfo for WeightIn // Storage: System BlockWeight (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn note_author() -> Weight { - (42_225_000 as Weight) + (30_722_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } @@ -98,10 +100,10 @@ impl pallet_collator_selection::WeightInfo for WeightIn // Storage: System BlockWeight (r:1 w:1) fn new_session(r: u32, c: u32, ) -> Weight { (0 as Weight) - // Standard Error: 3_403_000 - .saturating_add((17_040_000 as Weight).saturating_mul(r as Weight)) - // Standard Error: 3_403_000 - .saturating_add((89_169_000 as Weight).saturating_mul(c as Weight)) + // Standard Error: 2_230_000 + .saturating_add((13_222_000 as Weight).saturating_mul(r as Weight)) + // Standard Error: 2_230_000 + .saturating_add((58_957_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight))) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(c as Weight))) diff --git a/polkadot-parachains/statemint/src/weights/pallet_multisig.rs b/polkadot-parachains/statemint/src/weights/pallet_multisig.rs index 23b6e49191..11297f2356 100644 --- a/polkadot-parachains/statemint/src/weights/pallet_multisig.rs +++ b/polkadot-parachains/statemint/src/weights/pallet_multisig.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_multisig` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemint.json // --header=./file_header.txt // --output=./polkadot-parachains/statemint/src/weights @@ -45,18 +45,18 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_multisig::WeightInfo for WeightInfo { fn as_multi_threshold_1(z: u32, ) -> Weight { - (16_978_000 as Weight) + (13_015_000 as Weight) // Standard Error: 0 .saturating_add((1_000 as Weight).saturating_mul(z as Weight)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn as_multi_create(s: u32, z: u32, ) -> Weight { - (39_131_000 as Weight) + (27_696_000 as Weight) // Standard Error: 1_000 - .saturating_add((131_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((111_000 as Weight).saturating_mul(s as Weight)) // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(z as Weight)) + .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -64,9 +64,9 @@ impl pallet_multisig::WeightInfo for WeightInfo { // Storage: Multisig Calls (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn as_multi_create_store(s: u32, z: u32, ) -> Weight { - (44_133_000 as Weight) + (31_594_000 as Weight) // Standard Error: 1_000 - .saturating_add((132_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((110_000 as Weight).saturating_mul(s as Weight)) // Standard Error: 0 .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) @@ -74,20 +74,20 @@ impl pallet_multisig::WeightInfo for WeightInfo { } // Storage: Multisig Multisigs (r:1 w:1) fn as_multi_approve(s: u32, z: u32, ) -> Weight { - (27_000_000 as Weight) - // Standard Error: 1_000 - .saturating_add((116_000 as Weight).saturating_mul(s as Weight)) + (18_129_000 as Weight) // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(z as Weight)) + .saturating_add((117_000 as Weight).saturating_mul(s as Weight)) + // Standard Error: 0 + .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) fn as_multi_approve_store(s: u32, z: u32, ) -> Weight { - (41_807_000 as Weight) + (30_517_000 as Weight) // Standard Error: 1_000 - .saturating_add((136_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((123_000 as Weight).saturating_mul(s as Weight)) // Standard Error: 0 .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) @@ -97,29 +97,29 @@ impl pallet_multisig::WeightInfo for WeightInfo { // Storage: Multisig Calls (r:1 w:1) // Storage: System Account (r:1 w:1) fn as_multi_complete(s: u32, z: u32, ) -> Weight { - (51_670_000 as Weight) - // Standard Error: 1_000 - .saturating_add((212_000 as Weight).saturating_mul(s as Weight)) + (38_882_000 as Weight) // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) + .saturating_add((170_000 as Weight).saturating_mul(s as Weight)) + // Standard Error: 0 + .saturating_add((4_000 as Weight).saturating_mul(z as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn approve_as_multi_create(s: u32, ) -> Weight { - (36_945_000 as Weight) + (27_825_000 as Weight) // Standard Error: 0 - .saturating_add((158_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((117_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:0) fn approve_as_multi_approve(s: u32, ) -> Weight { - (23_330_000 as Weight) + (17_556_000 as Weight) // Standard Error: 0 - .saturating_add((148_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((118_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -127,18 +127,18 @@ impl pallet_multisig::WeightInfo for WeightInfo { // Storage: Multisig Calls (r:1 w:1) // Storage: System Account (r:1 w:1) fn approve_as_multi_complete(s: u32, ) -> Weight { - (71_434_000 as Weight) + (72_797_000 as Weight) // Standard Error: 1_000 - .saturating_add((229_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((166_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) fn cancel_as_multi(s: u32, ) -> Weight { - (57_483_000 as Weight) - // Standard Error: 1_000 - .saturating_add((149_000 as Weight).saturating_mul(s as Weight)) + (50_955_000 as Weight) + // Standard Error: 0 + .saturating_add((112_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/polkadot-parachains/statemint/src/weights/pallet_proxy.rs b/polkadot-parachains/statemint/src/weights/pallet_proxy.rs index 15f5f797e3..163e7f85df 100644 --- a/polkadot-parachains/statemint/src/weights/pallet_proxy.rs +++ b/polkadot-parachains/statemint/src/weights/pallet_proxy.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_proxy` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemint.json // --header=./file_header.txt // --output=./polkadot-parachains/statemint/src/weights @@ -46,42 +46,42 @@ pub struct WeightInfo(PhantomData); impl pallet_proxy::WeightInfo for WeightInfo { // Storage: Proxy Proxies (r:1 w:0) fn proxy(p: u32, ) -> Weight { - (17_903_000 as Weight) - // Standard Error: 2_000 - .saturating_add((112_000 as Weight).saturating_mul(p as Weight)) + (13_697_000 as Weight) + // Standard Error: 1_000 + .saturating_add((92_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) } // Storage: Proxy Proxies (r:1 w:0) // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) fn proxy_announced(a: u32, p: u32, ) -> Weight { - (37_635_000 as Weight) - // Standard Error: 2_000 - .saturating_add((303_000 as Weight).saturating_mul(a as Weight)) - // Standard Error: 2_000 - .saturating_add((137_000 as Weight).saturating_mul(p as Weight)) + (29_761_000 as Weight) + // Standard Error: 1_000 + .saturating_add((225_000 as Weight).saturating_mul(a as Weight)) + // Standard Error: 1_000 + .saturating_add((90_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) fn remove_announcement(a: u32, p: u32, ) -> Weight { - (26_220_000 as Weight) + (20_197_000 as Weight) // Standard Error: 1_000 - .saturating_add((306_000 as Weight).saturating_mul(a as Weight)) + .saturating_add((235_000 as Weight).saturating_mul(a as Weight)) // Standard Error: 1_000 - .saturating_add((25_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((13_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) fn reject_announcement(a: u32, p: u32, ) -> Weight { - (26_413_000 as Weight) + (20_483_000 as Weight) // Standard Error: 1_000 - .saturating_add((303_000 as Weight).saturating_mul(a as Weight)) + .saturating_add((227_000 as Weight).saturating_mul(a as Weight)) // Standard Error: 1_000 - .saturating_add((16_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((10_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -89,50 +89,52 @@ impl pallet_proxy::WeightInfo for WeightInfo { // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) fn announce(a: u32, p: u32, ) -> Weight { - (35_438_000 as Weight) - // Standard Error: 1_000 - .saturating_add((302_000 as Weight).saturating_mul(a as Weight)) - // Standard Error: 1_000 - .saturating_add((128_000 as Weight).saturating_mul(p as Weight)) + (27_439_000 as Weight) + // Standard Error: 2_000 + .saturating_add((222_000 as Weight).saturating_mul(a as Weight)) + // Standard Error: 2_000 + .saturating_add((98_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Proxy Proxies (r:1 w:1) fn add_proxy(p: u32, ) -> Weight { - (30_235_000 as Weight) - // Standard Error: 3_000 - .saturating_add((134_000 as Weight).saturating_mul(p as Weight)) + (22_789_000 as Weight) + // Standard Error: 2_000 + .saturating_add((148_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Proxy Proxies (r:1 w:1) fn remove_proxy(p: u32, ) -> Weight { - (25_590_000 as Weight) + (19_009_000 as Weight) // Standard Error: 2_000 - .saturating_add((147_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((163_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Proxy Proxies (r:1 w:1) fn remove_proxies(p: u32, ) -> Weight { - (25_246_000 as Weight) - // Standard Error: 2_000 - .saturating_add((101_000 as Weight).saturating_mul(p as Weight)) + (18_810_000 as Weight) + // Standard Error: 1_000 + .saturating_add((102_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) // Storage: Proxy Proxies (r:1 w:1) - fn anonymous(_p: u32, ) -> Weight { - (34_122_000 as Weight) + fn anonymous(p: u32, ) -> Weight { + (25_779_000 as Weight) + // Standard Error: 1_000 + .saturating_add((33_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Proxy Proxies (r:1 w:1) fn kill_anonymous(p: u32, ) -> Weight { - (26_737_000 as Weight) + (19_961_000 as Weight) // Standard Error: 2_000 - .saturating_add((97_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((90_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } diff --git a/polkadot-parachains/statemint/src/weights/pallet_session.rs b/polkadot-parachains/statemint/src/weights/pallet_session.rs index 74e75e11e2..1f08fb458a 100644 --- a/polkadot-parachains/statemint/src/weights/pallet_session.rs +++ b/polkadot-parachains/statemint/src/weights/pallet_session.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_session` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemint.json // --header=./file_header.txt // --output=./polkadot-parachains/statemint/src/weights @@ -47,14 +47,14 @@ impl pallet_session::WeightInfo for WeightInfo { // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:1 w:1) fn set_keys() -> Weight { - (16_754_000 as Weight) + (12_325_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:0 w:1) fn purge_keys() -> Weight { - (13_041_000 as Weight) + (9_910_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/polkadot-parachains/statemint/src/weights/pallet_timestamp.rs b/polkadot-parachains/statemint/src/weights/pallet_timestamp.rs index 28fef56539..c2497125b5 100644 --- a/polkadot-parachains/statemint/src/weights/pallet_timestamp.rs +++ b/polkadot-parachains/statemint/src/weights/pallet_timestamp.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_timestamp` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemint.json // --header=./file_header.txt // --output=./polkadot-parachains/statemint/src/weights @@ -46,11 +46,11 @@ pub struct WeightInfo(PhantomData); impl pallet_timestamp::WeightInfo for WeightInfo { // Storage: Timestamp Now (r:1 w:1) fn set() -> Weight { - (5_364_000 as Weight) + (3_509_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn on_finalize() -> Weight { - (3_304_000 as Weight) + (2_157_000 as Weight) } } diff --git a/polkadot-parachains/statemint/src/weights/pallet_uniques.rs b/polkadot-parachains/statemint/src/weights/pallet_uniques.rs index 794f34ab9d..3b383f96a1 100644 --- a/polkadot-parachains/statemint/src/weights/pallet_uniques.rs +++ b/polkadot-parachains/statemint/src/weights/pallet_uniques.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_uniques` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemint.json // --header=./file_header.txt // --output=./polkadot-parachains/statemint/src/weights @@ -47,14 +47,14 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Class (r:1 w:1) // Storage: Uniques ClassAccount (r:0 w:1) fn create() -> Weight { - (31_395_000 as Weight) + (23_032_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Uniques Class (r:1 w:1) // Storage: Uniques ClassAccount (r:0 w:1) fn force_create() -> Weight { - (18_120_000 as Weight) + (13_321_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -67,12 +67,12 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Account (r:0 w:20) fn destroy(n: u32, m: u32, a: u32, ) -> Weight { (0 as Weight) - // Standard Error: 16_000 - .saturating_add((12_391_000 as Weight).saturating_mul(n as Weight)) - // Standard Error: 16_000 - .saturating_add((982_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 16_000 - .saturating_add((886_000 as Weight).saturating_mul(a as Weight)) + // Standard Error: 14_000 + .saturating_add((8_952_000 as Weight).saturating_mul(n as Weight)) + // Standard Error: 14_000 + .saturating_add((859_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 14_000 + .saturating_add((698_000 as Weight).saturating_mul(a as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight))) .saturating_add(T::DbWeight::get().writes(3 as Weight)) @@ -84,7 +84,7 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Class (r:1 w:1) // Storage: Uniques Account (r:0 w:1) fn mint() -> Weight { - (38_165_000 as Weight) + (29_716_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } @@ -92,7 +92,7 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Asset (r:1 w:1) // Storage: Uniques Account (r:0 w:1) fn burn() -> Weight { - (39_341_000 as Weight) + (29_977_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } @@ -100,7 +100,7 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Asset (r:1 w:1) // Storage: Uniques Account (r:0 w:2) fn transfer() -> Weight { - (30_327_000 as Weight) + (22_807_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } @@ -108,8 +108,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Asset (r:100 w:100) fn redeposit(i: u32, ) -> Weight { (0 as Weight) - // Standard Error: 13_000 - .saturating_add((15_998_000 as Weight).saturating_mul(i as Weight)) + // Standard Error: 14_000 + .saturating_add((11_919_000 as Weight).saturating_mul(i as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(i as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) @@ -118,26 +118,26 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Asset (r:1 w:1) // Storage: Uniques Class (r:1 w:0) fn freeze() -> Weight { - (23_021_000 as Weight) + (17_684_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Asset (r:1 w:1) // Storage: Uniques Class (r:1 w:0) fn thaw() -> Weight { - (22_556_000 as Weight) + (17_465_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Class (r:1 w:1) fn freeze_class() -> Weight { - (17_432_000 as Weight) + (13_259_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Class (r:1 w:1) fn thaw_class() -> Weight { - (17_650_000 as Weight) + (13_207_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -145,20 +145,20 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: Uniques ClassAccount (r:0 w:2) fn transfer_ownership() -> Weight { - (39_027_000 as Weight) + (29_501_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } // Storage: Uniques Class (r:1 w:1) fn set_team() -> Weight { - (18_391_000 as Weight) + (13_808_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Class (r:1 w:1) // Storage: Uniques ClassAccount (r:0 w:1) fn force_asset_status() -> Weight { - (21_298_000 as Weight) + (16_812_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -166,7 +166,7 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques InstanceMetadataOf (r:1 w:0) // Storage: Uniques Attribute (r:1 w:1) fn set_attribute() -> Weight { - (48_200_000 as Weight) + (36_347_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -174,49 +174,49 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques InstanceMetadataOf (r:1 w:0) // Storage: Uniques Attribute (r:1 w:1) fn clear_attribute() -> Weight { - (45_903_000 as Weight) + (34_931_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Uniques Class (r:1 w:1) // Storage: Uniques InstanceMetadataOf (r:1 w:1) fn set_metadata() -> Weight { - (37_448_000 as Weight) + (29_234_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Uniques Class (r:1 w:1) // Storage: Uniques InstanceMetadataOf (r:1 w:1) fn clear_metadata() -> Weight { - (37_761_000 as Weight) + (28_822_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Uniques Class (r:1 w:1) // Storage: Uniques ClassMetadataOf (r:1 w:1) fn set_class_metadata() -> Weight { - (36_623_000 as Weight) + (28_613_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Uniques Class (r:1 w:0) // Storage: Uniques ClassMetadataOf (r:1 w:1) fn clear_class_metadata() -> Weight { - (34_162_000 as Weight) + (26_273_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Class (r:1 w:0) // Storage: Uniques Asset (r:1 w:1) fn approve_transfer() -> Weight { - (25_022_000 as Weight) + (19_537_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Class (r:1 w:0) // Storage: Uniques Asset (r:1 w:1) fn cancel_approval() -> Weight { - (25_298_000 as Weight) + (19_292_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } diff --git a/polkadot-parachains/statemint/src/weights/pallet_utility.rs b/polkadot-parachains/statemint/src/weights/pallet_utility.rs index 23dc506809..185a7d0e2d 100644 --- a/polkadot-parachains/statemint/src/weights/pallet_utility.rs +++ b/polkadot-parachains/statemint/src/weights/pallet_utility.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_utility` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=statemint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-statemint.json // --header=./file_header.txt // --output=./polkadot-parachains/statemint/src/weights @@ -45,19 +45,19 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_utility::WeightInfo for WeightInfo { fn batch(c: u32, ) -> Weight { - (17_024_000 as Weight) - // Standard Error: 1_000 - .saturating_add((3_606_000 as Weight).saturating_mul(c as Weight)) + (19_538_000 as Weight) + // Standard Error: 2_000 + .saturating_add((3_650_000 as Weight).saturating_mul(c as Weight)) } fn as_derivative() -> Weight { - (2_837_000 as Weight) + (2_477_000 as Weight) } fn batch_all(c: u32, ) -> Weight { - (19_012_000 as Weight) + (22_204_000 as Weight) // Standard Error: 2_000 - .saturating_add((3_859_000 as Weight).saturating_mul(c as Weight)) + .saturating_add((3_957_000 as Weight).saturating_mul(c as Weight)) } fn dispatch_as() -> Weight { - (11_749_000 as Weight) + (8_834_000 as Weight) } } diff --git a/polkadot-parachains/statemint/src/xcm_config.rs b/polkadot-parachains/statemint/src/xcm_config.rs index fe80356967..479667ebd4 100644 --- a/polkadot-parachains/statemint/src/xcm_config.rs +++ b/polkadot-parachains/statemint/src/xcm_config.rs @@ -199,8 +199,8 @@ impl pallet_xcm::Config for Runtime { // ... but disallow generic XCM execution. As a result only teleports and reserve transfers are allowed. type XcmExecuteFilter = Nothing; type XcmExecutor = XcmExecutor; - type XcmTeleportFilter = Nothing; - type XcmReserveTransferFilter = Nothing; + type XcmTeleportFilter = Everything; + type XcmReserveTransferFilter = Everything; type Weigher = FixedWeightBounds; type UniversalLocation = UniversalLocation; type Origin = Origin; diff --git a/polkadot-parachains/tests/benchmark_storage_works.rs b/polkadot-parachains/tests/benchmark_storage_works.rs new file mode 100644 index 0000000000..f2cf691953 --- /dev/null +++ b/polkadot-parachains/tests/benchmark_storage_works.rs @@ -0,0 +1,42 @@ +use assert_cmd::cargo::cargo_bin; +use std::{ + path::Path, + process::{Command, ExitStatus}, +}; +use tempfile::tempdir; + +/// The runtimes that this command supports. +static RUNTIMES: [&'static str; 3] = ["westmint", "statemine", "statemint"]; + +/// The `benchmark storage` command works for the dev runtimes. +#[test] +#[ignore] +fn benchmark_storage_works() { + for runtime in RUNTIMES { + let tmp_dir = tempdir().expect("could not create a temp dir"); + let base_path = tmp_dir.path(); + let runtime = format!("{}-dev", runtime); + + // Benchmarking the storage works and creates the weight file. + assert!(benchmark_storage("rocksdb", &runtime, base_path).success()); + assert!(base_path.join("rocksdb_weights.rs").exists()); + + assert!(benchmark_storage("paritydb", &runtime, base_path).success()); + assert!(base_path.join("paritydb_weights.rs").exists()); + } +} + +/// Invoke the `benchmark storage` sub-command for the given database and runtime. +fn benchmark_storage(db: &str, runtime: &str, base_path: &Path) -> ExitStatus { + Command::new(cargo_bin("polkadot-collator")) + .args(&["benchmark", "storage", "--chain", runtime]) + .arg("--db") + .arg(db) + .arg("--weight-path") + .arg(base_path) + .args(["--state-version", "0"]) + .args(["--warmups", "0"]) + .args(["--add", "100", "--mul", "1.2", "--metric", "p75"]) + .status() + .unwrap() +} diff --git a/polkadot-parachains/westmint/Cargo.toml b/polkadot-parachains/westmint/Cargo.toml index 873725cf53..e74c98999d 100644 --- a/polkadot-parachains/westmint/Cargo.toml +++ b/polkadot-parachains/westmint/Cargo.toml @@ -8,8 +8,8 @@ description = "Westend variant of Statemint parachain runtime" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } hex-literal = { version = "0.3.4", optional = true } -log = { version = "0.4.14", default-features = false } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +log = { version = "0.4.16", default-features = false } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.132", optional = true, features = ["derive"] } smallvec = "1.6.1" diff --git a/polkadot-parachains/westmint/src/lib.rs b/polkadot-parachains/westmint/src/lib.rs index 4a6aba4bfa..e1d74bfce4 100644 --- a/polkadot-parachains/westmint/src/lib.rs +++ b/polkadot-parachains/westmint/src/lib.rs @@ -45,7 +45,7 @@ use constants::{currency::*, fee::WeightToFee}; use frame_support::{ construct_runtime, parameter_types, traits::{AsEnsureOriginWithArg, InstanceFilter}, - weights::{DispatchClass, Weight}, + weights::{ConstantMultiplier, DispatchClass, Weight}, PalletId, RuntimeDebug, }; use frame_system::{ @@ -80,10 +80,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("westmint"), impl_name: create_runtime_str!("westmint"), authoring_version: 1, - spec_version: 700, + spec_version: 900, impl_version: 0, apis: RUNTIME_API_VERSIONS, - transaction_version: 5, + transaction_version: 6, state_version: 0, }; @@ -198,8 +198,8 @@ parameter_types! { impl pallet_transaction_payment::Config for Runtime { type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter>; - type TransactionByteFee = TransactionByteFee; type WeightToFee = WeightToFee; + type LengthToFee = ConstantMultiplier; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; type OperationalFeeMultiplier = OperationalFeeMultiplier; } diff --git a/polkadot-parachains/westmint/src/weights/cumulus_pallet_xcmp_queue.rs b/polkadot-parachains/westmint/src/weights/cumulus_pallet_xcmp_queue.rs index 78f4a2c7b7..6bce6bbb44 100644 --- a/polkadot-parachains/westmint/src/weights/cumulus_pallet_xcmp_queue.rs +++ b/polkadot-parachains/westmint/src/weights/cumulus_pallet_xcmp_queue.rs @@ -17,7 +17,7 @@ //! Autogenerated weights for `cumulus_pallet_xcmp_queue` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-03-04, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 // Executed Command: @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --json +// --json-file=./bench-westmint.json // --header=./file_header.txt // --output=./polkadot-parachains/westmint/src/weights @@ -46,13 +46,13 @@ pub struct WeightInfo(PhantomData); impl cumulus_pallet_xcmp_queue::WeightInfo for WeightInfo { // Storage: XcmpQueue QueueConfig (r:1 w:1) fn set_config_with_u32() -> Weight { - (2_617_000 as Weight) + (2_598_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: XcmpQueue QueueConfig (r:1 w:1) fn set_config_with_weight() -> Weight { - (2_505_000 as Weight) + (2_647_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } diff --git a/polkadot-parachains/westmint/src/weights/frame_system.rs b/polkadot-parachains/westmint/src/weights/frame_system.rs index 65eba711a4..450967b7f2 100644 --- a/polkadot-parachains/westmint/src/weights/frame_system.rs +++ b/polkadot-parachains/westmint/src/weights/frame_system.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `frame_system` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=westmint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-westmint.json // --header=./file_header.txt // --output=./polkadot-parachains/westmint/src/weights @@ -44,18 +44,20 @@ use sp_std::marker::PhantomData; /// Weight functions for `frame_system`. pub struct WeightInfo(PhantomData); impl frame_system::WeightInfo for WeightInfo { - fn remark(_b: u32, ) -> Weight { - (0 as Weight) - } - fn remark_with_event(b: u32, ) -> Weight { + fn remark(b: u32, ) -> Weight { (0 as Weight) // Standard Error: 0 .saturating_add((1_000 as Weight).saturating_mul(b as Weight)) } + fn remark_with_event(b: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 0 + .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) + } // Storage: System Digest (r:1 w:1) // Storage: unknown [0x3a686561707061676573] (r:0 w:1) fn set_heap_pages() -> Weight { - (4_085_000 as Weight) + (2_664_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -63,21 +65,21 @@ impl frame_system::WeightInfo for WeightInfo { fn set_storage(i: u32, ) -> Weight { (0 as Weight) // Standard Error: 0 - .saturating_add((519_000 as Weight).saturating_mul(i as Weight)) + .saturating_add((410_000 as Weight).saturating_mul(i as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) } // Storage: Skipped Metadata (r:0 w:0) fn kill_storage(i: u32, ) -> Weight { (0 as Weight) - // Standard Error: 1_000 - .saturating_add((372_000 as Weight).saturating_mul(i as Weight)) + // Standard Error: 0 + .saturating_add((310_000 as Weight).saturating_mul(i as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) } // Storage: Skipped Metadata (r:0 w:0) fn kill_prefix(p: u32, ) -> Weight { - (217_000 as Weight) + (0 as Weight) // Standard Error: 0 - .saturating_add((732_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((667_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) } } diff --git a/polkadot-parachains/westmint/src/weights/pallet_assets.rs b/polkadot-parachains/westmint/src/weights/pallet_assets.rs index 2745bb31d8..4e3ed82c8d 100644 --- a/polkadot-parachains/westmint/src/weights/pallet_assets.rs +++ b/polkadot-parachains/westmint/src/weights/pallet_assets.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_assets` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=westmint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-westmint.json // --header=./file_header.txt // --output=./polkadot-parachains/westmint/src/weights @@ -46,13 +46,13 @@ pub struct WeightInfo(PhantomData); impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Asset (r:1 w:1) fn create() -> Weight { - (28_488_000 as Weight) + (21_200_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) fn force_create() -> Weight { - (15_242_000 as Weight) + (11_195_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -63,12 +63,12 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Approvals (r:501 w:500) fn destroy(c: u32, s: u32, a: u32, ) -> Weight { (0 as Weight) - // Standard Error: 41_000 - .saturating_add((17_712_000 as Weight).saturating_mul(c as Weight)) - // Standard Error: 41_000 - .saturating_add((21_241_000 as Weight).saturating_mul(s as Weight)) - // Standard Error: 411_000 - .saturating_add((21_327_000 as Weight).saturating_mul(a as Weight)) + // Standard Error: 35_000 + .saturating_add((13_500_000 as Weight).saturating_mul(c as Weight)) + // Standard Error: 35_000 + .saturating_add((16_261_000 as Weight).saturating_mul(s as Weight)) + // Standard Error: 354_000 + .saturating_add((15_962_000 as Weight).saturating_mul(a as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight))) .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight))) @@ -81,14 +81,14 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Asset (r:1 w:1) // Storage: Assets Account (r:1 w:1) fn mint() -> Weight { - (32_607_000 as Weight) + (24_295_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Assets Asset (r:1 w:1) // Storage: Assets Account (r:1 w:1) fn burn() -> Weight { - (38_207_000 as Weight) + (28_157_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -96,7 +96,7 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Account (r:2 w:2) // Storage: System Account (r:1 w:1) fn transfer() -> Weight { - (54_283_000 as Weight) + (39_882_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } @@ -104,7 +104,7 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Account (r:2 w:2) // Storage: System Account (r:1 w:1) fn transfer_keep_alive() -> Weight { - (46_178_000 as Weight) + (34_294_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } @@ -112,91 +112,93 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Account (r:2 w:2) // Storage: System Account (r:1 w:1) fn force_transfer() -> Weight { - (54_475_000 as Weight) + (41_000_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } // Storage: Assets Asset (r:1 w:0) // Storage: Assets Account (r:1 w:1) fn freeze() -> Weight { - (22_055_000 as Weight) + (16_904_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:0) // Storage: Assets Account (r:1 w:1) fn thaw() -> Weight { - (21_979_000 as Weight) + (16_618_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) fn freeze_asset() -> Weight { - (18_163_000 as Weight) + (13_786_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) fn thaw_asset() -> Weight { - (18_233_000 as Weight) + (13_482_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) // Storage: Assets Metadata (r:1 w:0) fn transfer_ownership() -> Weight { - (19_964_000 as Weight) + (14_502_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) fn set_team() -> Weight { - (18_023_000 as Weight) + (13_035_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:0) // Storage: Assets Metadata (r:1 w:1) - fn set_metadata(_n: u32, s: u32, ) -> Weight { - (34_316_000 as Weight) + fn set_metadata(n: u32, s: u32, ) -> Weight { + (26_316_000 as Weight) // Standard Error: 0 - .saturating_add((4_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((1_000 as Weight).saturating_mul(n as Weight)) + // Standard Error: 0 + .saturating_add((3_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:0) // Storage: Assets Metadata (r:1 w:1) fn clear_metadata() -> Weight { - (34_260_000 as Weight) + (25_683_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:0) // Storage: Assets Metadata (r:1 w:1) fn force_set_metadata(_n: u32, s: u32, ) -> Weight { - (19_100_000 as Weight) + (14_517_000 as Weight) // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((2_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:0) // Storage: Assets Metadata (r:1 w:1) fn force_clear_metadata() -> Weight { - (33_848_000 as Weight) + (26_239_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) fn force_asset_status() -> Weight { - (17_005_000 as Weight) + (13_044_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Assets Asset (r:1 w:1) // Storage: Assets Approvals (r:1 w:1) fn approve_transfer() -> Weight { - (38_009_000 as Weight) + (28_954_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -205,21 +207,21 @@ impl pallet_assets::WeightInfo for WeightInfo { // Storage: Assets Account (r:2 w:2) // Storage: System Account (r:1 w:1) fn transfer_approved() -> Weight { - (69_596_000 as Weight) + (52_533_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } // Storage: Assets Asset (r:1 w:1) // Storage: Assets Approvals (r:1 w:1) fn cancel_approval() -> Weight { - (39_273_000 as Weight) + (29_980_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Assets Asset (r:1 w:1) // Storage: Assets Approvals (r:1 w:1) fn force_cancel_approval() -> Weight { - (40_271_000 as Weight) + (30_987_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/polkadot-parachains/westmint/src/weights/pallet_balances.rs b/polkadot-parachains/westmint/src/weights/pallet_balances.rs index 8205e28c67..6ce47ca46d 100644 --- a/polkadot-parachains/westmint/src/weights/pallet_balances.rs +++ b/polkadot-parachains/westmint/src/weights/pallet_balances.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_balances` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=westmint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-westmint.json // --header=./file_header.txt // --output=./polkadot-parachains/westmint/src/weights @@ -46,43 +46,43 @@ pub struct WeightInfo(PhantomData); impl pallet_balances::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) fn transfer() -> Weight { - (46_560_000 as Weight) + (34_518_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: System Account (r:1 w:1) fn transfer_keep_alive() -> Weight { - (35_723_000 as Weight) + (26_614_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: System Account (r:1 w:1) fn set_balance_creating() -> Weight { - (22_015_000 as Weight) + (15_226_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: System Account (r:1 w:1) fn set_balance_killing() -> Weight { - (25_789_000 as Weight) + (18_785_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: System Account (r:2 w:2) fn force_transfer() -> Weight { - (47_063_000 as Weight) + (34_624_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: System Account (r:1 w:1) fn transfer_all() -> Weight { - (42_148_000 as Weight) + (32_020_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: System Account (r:1 w:1) fn force_unreserve() -> Weight { - (20_237_000 as Weight) + (14_463_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } diff --git a/polkadot-parachains/westmint/src/weights/pallet_collator_selection.rs b/polkadot-parachains/westmint/src/weights/pallet_collator_selection.rs index 456ee56d3a..7b82cb670e 100644 --- a/polkadot-parachains/westmint/src/weights/pallet_collator_selection.rs +++ b/polkadot-parachains/westmint/src/weights/pallet_collator_selection.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_collator_selection` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=westmint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-westmint.json // --header=./file_header.txt // --output=./polkadot-parachains/westmint/src/weights @@ -44,21 +44,23 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_collator_selection`. pub struct WeightInfo(PhantomData); impl pallet_collator_selection::WeightInfo for WeightInfo { + // Storage: Session NextKeys (r:1 w:0) // Storage: CollatorSelection Invulnerables (r:0 w:1) fn set_invulnerables(b: u32, ) -> Weight { - (12_605_000 as Weight) - // Standard Error: 0 - .saturating_add((29_000 as Weight).saturating_mul(b as Weight)) + (9_558_000 as Weight) + // Standard Error: 3_000 + .saturating_add((2_853_000 as Weight).saturating_mul(b as Weight)) + .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: CollatorSelection DesiredCandidates (r:0 w:1) fn set_desired_candidates() -> Weight { - (11_496_000 as Weight) + (8_576_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: CollatorSelection CandidacyBond (r:0 w:1) fn set_candidacy_bond() -> Weight { - (11_803_000 as Weight) + (8_576_000 as Weight) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: CollatorSelection Candidates (r:1 w:1) @@ -68,18 +70,18 @@ impl pallet_collator_selection::WeightInfo for WeightIn // Storage: CollatorSelection CandidacyBond (r:1 w:0) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn register_as_candidate(c: u32, ) -> Weight { - (60_030_000 as Weight) + (47_896_000 as Weight) // Standard Error: 1_000 - .saturating_add((120_000 as Weight).saturating_mul(c as Weight)) + .saturating_add((98_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: CollatorSelection Candidates (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn leave_intent(c: u32, ) -> Weight { - (56_817_000 as Weight) + (51_772_000 as Weight) // Standard Error: 1_000 - .saturating_add((177_000 as Weight).saturating_mul(c as Weight)) + .saturating_add((105_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -87,7 +89,7 @@ impl pallet_collator_selection::WeightInfo for WeightIn // Storage: System BlockWeight (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn note_author() -> Weight { - (42_651_000 as Weight) + (30_967_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } @@ -98,10 +100,10 @@ impl pallet_collator_selection::WeightInfo for WeightIn // Storage: System BlockWeight (r:1 w:1) fn new_session(r: u32, c: u32, ) -> Weight { (0 as Weight) - // Standard Error: 3_382_000 - .saturating_add((16_847_000 as Weight).saturating_mul(r as Weight)) - // Standard Error: 3_382_000 - .saturating_add((88_597_000 as Weight).saturating_mul(c as Weight)) + // Standard Error: 2_210_000 + .saturating_add((13_171_000 as Weight).saturating_mul(r as Weight)) + // Standard Error: 2_210_000 + .saturating_add((58_460_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight))) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(c as Weight))) diff --git a/polkadot-parachains/westmint/src/weights/pallet_multisig.rs b/polkadot-parachains/westmint/src/weights/pallet_multisig.rs index c6b4bffdb7..3e0bdd1596 100644 --- a/polkadot-parachains/westmint/src/weights/pallet_multisig.rs +++ b/polkadot-parachains/westmint/src/weights/pallet_multisig.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_multisig` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=westmint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-westmint.json // --header=./file_header.txt // --output=./polkadot-parachains/westmint/src/weights @@ -45,18 +45,18 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_multisig::WeightInfo for WeightInfo { fn as_multi_threshold_1(z: u32, ) -> Weight { - (17_312_000 as Weight) + (12_779_000 as Weight) // Standard Error: 0 .saturating_add((1_000 as Weight).saturating_mul(z as Weight)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn as_multi_create(s: u32, z: u32, ) -> Weight { - (39_212_000 as Weight) - // Standard Error: 1_000 - .saturating_add((131_000 as Weight).saturating_mul(s as Weight)) + (27_921_000 as Weight) // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(z as Weight)) + .saturating_add((108_000 as Weight).saturating_mul(s as Weight)) + // Standard Error: 0 + .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -64,9 +64,9 @@ impl pallet_multisig::WeightInfo for WeightInfo { // Storage: Multisig Calls (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn as_multi_create_store(s: u32, z: u32, ) -> Weight { - (44_813_000 as Weight) + (31_493_000 as Weight) // Standard Error: 1_000 - .saturating_add((125_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((111_000 as Weight).saturating_mul(s as Weight)) // Standard Error: 0 .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) @@ -74,20 +74,20 @@ impl pallet_multisig::WeightInfo for WeightInfo { } // Storage: Multisig Multisigs (r:1 w:1) fn as_multi_approve(s: u32, z: u32, ) -> Weight { - (26_141_000 as Weight) + (17_965_000 as Weight) // Standard Error: 1_000 - .saturating_add((121_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((110_000 as Weight).saturating_mul(s as Weight)) // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(z as Weight)) + .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) fn as_multi_approve_store(s: u32, z: u32, ) -> Weight { - (41_959_000 as Weight) + (31_632_000 as Weight) // Standard Error: 1_000 - .saturating_add((130_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((115_000 as Weight).saturating_mul(s as Weight)) // Standard Error: 0 .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) @@ -97,29 +97,29 @@ impl pallet_multisig::WeightInfo for WeightInfo { // Storage: Multisig Calls (r:1 w:1) // Storage: System Account (r:1 w:1) fn as_multi_complete(s: u32, z: u32, ) -> Weight { - (50_028_000 as Weight) - // Standard Error: 1_000 - .saturating_add((218_000 as Weight).saturating_mul(s as Weight)) + (38_352_000 as Weight) // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(z as Weight)) + .saturating_add((162_000 as Weight).saturating_mul(s as Weight)) + // Standard Error: 0 + .saturating_add((4_000 as Weight).saturating_mul(z as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) fn approve_as_multi_create(s: u32, ) -> Weight { - (37_062_000 as Weight) - // Standard Error: 1_000 - .saturating_add((148_000 as Weight).saturating_mul(s as Weight)) + (27_503_000 as Weight) + // Standard Error: 0 + .saturating_add((105_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:0) fn approve_as_multi_approve(s: u32, ) -> Weight { - (23_541_000 as Weight) + (17_138_000 as Weight) // Standard Error: 0 - .saturating_add((140_000 as Weight).saturating_mul(s as Weight)) + .saturating_add((109_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -127,18 +127,18 @@ impl pallet_multisig::WeightInfo for WeightInfo { // Storage: Multisig Calls (r:1 w:1) // Storage: System Account (r:1 w:1) fn approve_as_multi_complete(s: u32, ) -> Weight { - (68_887_000 as Weight) - // Standard Error: 1_000 - .saturating_add((231_000 as Weight).saturating_mul(s as Weight)) + (71_044_000 as Weight) + // Standard Error: 0 + .saturating_add((165_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: Multisig Calls (r:1 w:1) fn cancel_as_multi(s: u32, ) -> Weight { - (56_570_000 as Weight) - // Standard Error: 1_000 - .saturating_add((148_000 as Weight).saturating_mul(s as Weight)) + (49_662_000 as Weight) + // Standard Error: 0 + .saturating_add((108_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/polkadot-parachains/westmint/src/weights/pallet_proxy.rs b/polkadot-parachains/westmint/src/weights/pallet_proxy.rs index 26811b67c5..86fdf795e0 100644 --- a/polkadot-parachains/westmint/src/weights/pallet_proxy.rs +++ b/polkadot-parachains/westmint/src/weights/pallet_proxy.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_proxy` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=westmint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-westmint.json // --header=./file_header.txt // --output=./polkadot-parachains/westmint/src/weights @@ -46,42 +46,42 @@ pub struct WeightInfo(PhantomData); impl pallet_proxy::WeightInfo for WeightInfo { // Storage: Proxy Proxies (r:1 w:0) fn proxy(p: u32, ) -> Weight { - (18_078_000 as Weight) + (13_531_000 as Weight) // Standard Error: 2_000 - .saturating_add((111_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((89_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) } // Storage: Proxy Proxies (r:1 w:0) // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) fn proxy_announced(a: u32, p: u32, ) -> Weight { - (37_659_000 as Weight) - // Standard Error: 2_000 - .saturating_add((307_000 as Weight).saturating_mul(a as Weight)) - // Standard Error: 2_000 - .saturating_add((130_000 as Weight).saturating_mul(p as Weight)) + (28_971_000 as Weight) + // Standard Error: 1_000 + .saturating_add((217_000 as Weight).saturating_mul(a as Weight)) + // Standard Error: 1_000 + .saturating_add((94_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) fn remove_announcement(a: u32, p: u32, ) -> Weight { - (26_643_000 as Weight) + (19_617_000 as Weight) // Standard Error: 1_000 - .saturating_add((310_000 as Weight).saturating_mul(a as Weight)) + .saturating_add((230_000 as Weight).saturating_mul(a as Weight)) // Standard Error: 1_000 - .saturating_add((24_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((20_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) fn reject_announcement(a: u32, p: u32, ) -> Weight { - (26_449_000 as Weight) + (19_839_000 as Weight) // Standard Error: 1_000 - .saturating_add((315_000 as Weight).saturating_mul(a as Weight)) + .saturating_add((226_000 as Weight).saturating_mul(a as Weight)) // Standard Error: 1_000 - .saturating_add((25_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((13_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -89,52 +89,52 @@ impl pallet_proxy::WeightInfo for WeightInfo { // Storage: Proxy Announcements (r:1 w:1) // Storage: System Account (r:1 w:1) fn announce(a: u32, p: u32, ) -> Weight { - (35_740_000 as Weight) - // Standard Error: 2_000 - .saturating_add((301_000 as Weight).saturating_mul(a as Weight)) - // Standard Error: 2_000 - .saturating_add((133_000 as Weight).saturating_mul(p as Weight)) + (26_993_000 as Weight) + // Standard Error: 1_000 + .saturating_add((214_000 as Weight).saturating_mul(a as Weight)) + // Standard Error: 1_000 + .saturating_add((87_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Proxy Proxies (r:1 w:1) fn add_proxy(p: u32, ) -> Weight { - (30_326_000 as Weight) + (22_458_000 as Weight) // Standard Error: 2_000 - .saturating_add((147_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((142_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Proxy Proxies (r:1 w:1) fn remove_proxy(p: u32, ) -> Weight { - (25_867_000 as Weight) - // Standard Error: 3_000 - .saturating_add((149_000 as Weight).saturating_mul(p as Weight)) + (18_739_000 as Weight) + // Standard Error: 2_000 + .saturating_add((164_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Proxy Proxies (r:1 w:1) fn remove_proxies(p: u32, ) -> Weight { - (25_701_000 as Weight) + (18_824_000 as Weight) // Standard Error: 2_000 - .saturating_add((102_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((88_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) // Storage: Proxy Proxies (r:1 w:1) fn anonymous(p: u32, ) -> Weight { - (34_356_000 as Weight) - // Standard Error: 2_000 - .saturating_add((6_000 as Weight).saturating_mul(p as Weight)) + (24_943_000 as Weight) + // Standard Error: 1_000 + .saturating_add((31_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Proxy Proxies (r:1 w:1) fn kill_anonymous(p: u32, ) -> Weight { - (26_927_000 as Weight) + (19_465_000 as Weight) // Standard Error: 2_000 - .saturating_add((112_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((88_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } diff --git a/polkadot-parachains/westmint/src/weights/pallet_session.rs b/polkadot-parachains/westmint/src/weights/pallet_session.rs index 6663ff2a60..79f8fdfb43 100644 --- a/polkadot-parachains/westmint/src/weights/pallet_session.rs +++ b/polkadot-parachains/westmint/src/weights/pallet_session.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_session` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=westmint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-westmint.json // --header=./file_header.txt // --output=./polkadot-parachains/westmint/src/weights @@ -47,14 +47,14 @@ impl pallet_session::WeightInfo for WeightInfo { // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:1 w:1) fn set_keys() -> Weight { - (17_393_000 as Weight) + (12_155_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Session NextKeys (r:1 w:1) // Storage: Session KeyOwner (r:0 w:1) fn purge_keys() -> Weight { - (13_118_000 as Weight) + (9_352_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/polkadot-parachains/westmint/src/weights/pallet_timestamp.rs b/polkadot-parachains/westmint/src/weights/pallet_timestamp.rs index 748fceea1f..c0b1314135 100644 --- a/polkadot-parachains/westmint/src/weights/pallet_timestamp.rs +++ b/polkadot-parachains/westmint/src/weights/pallet_timestamp.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_timestamp` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=westmint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-westmint.json // --header=./file_header.txt // --output=./polkadot-parachains/westmint/src/weights @@ -46,11 +46,11 @@ pub struct WeightInfo(PhantomData); impl pallet_timestamp::WeightInfo for WeightInfo { // Storage: Timestamp Now (r:1 w:1) fn set() -> Weight { - (5_316_000 as Weight) + (3_578_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn on_finalize() -> Weight { - (3_205_000 as Weight) + (2_260_000 as Weight) } } diff --git a/polkadot-parachains/westmint/src/weights/pallet_uniques.rs b/polkadot-parachains/westmint/src/weights/pallet_uniques.rs index 36aa43061b..a1346573f2 100644 --- a/polkadot-parachains/westmint/src/weights/pallet_uniques.rs +++ b/polkadot-parachains/westmint/src/weights/pallet_uniques.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_uniques` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=westmint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-westmint.json // --header=./file_header.txt // --output=./polkadot-parachains/westmint/src/weights @@ -47,14 +47,14 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Class (r:1 w:1) // Storage: Uniques ClassAccount (r:0 w:1) fn create() -> Weight { - (31_101_000 as Weight) + (23_292_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Uniques Class (r:1 w:1) // Storage: Uniques ClassAccount (r:0 w:1) fn force_create() -> Weight { - (17_191_000 as Weight) + (12_580_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -67,12 +67,12 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Account (r:0 w:20) fn destroy(n: u32, m: u32, a: u32, ) -> Weight { (0 as Weight) - // Standard Error: 14_000 - .saturating_add((12_190_000 as Weight).saturating_mul(n as Weight)) - // Standard Error: 14_000 - .saturating_add((943_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 14_000 - .saturating_add((848_000 as Weight).saturating_mul(a as Weight)) + // Standard Error: 15_000 + .saturating_add((9_064_000 as Weight).saturating_mul(n as Weight)) + // Standard Error: 15_000 + .saturating_add((958_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 15_000 + .saturating_add((865_000 as Weight).saturating_mul(a as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(n as Weight))) .saturating_add(T::DbWeight::get().writes(3 as Weight)) @@ -84,7 +84,7 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Class (r:1 w:1) // Storage: Uniques Account (r:0 w:1) fn mint() -> Weight { - (38_302_000 as Weight) + (28_805_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } @@ -92,7 +92,7 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Asset (r:1 w:1) // Storage: Uniques Account (r:0 w:1) fn burn() -> Weight { - (39_582_000 as Weight) + (30_339_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } @@ -100,7 +100,7 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Asset (r:1 w:1) // Storage: Uniques Account (r:0 w:2) fn transfer() -> Weight { - (30_597_000 as Weight) + (22_566_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } @@ -108,8 +108,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Asset (r:100 w:100) fn redeposit(i: u32, ) -> Weight { (0 as Weight) - // Standard Error: 13_000 - .saturating_add((16_084_000 as Weight).saturating_mul(i as Weight)) + // Standard Error: 10_000 + .saturating_add((11_708_000 as Weight).saturating_mul(i as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(i as Weight))) .saturating_add(T::DbWeight::get().writes(1 as Weight)) @@ -118,26 +118,26 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Asset (r:1 w:1) // Storage: Uniques Class (r:1 w:0) fn freeze() -> Weight { - (22_884_000 as Weight) + (17_405_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Asset (r:1 w:1) // Storage: Uniques Class (r:1 w:0) fn thaw() -> Weight { - (23_190_000 as Weight) + (17_724_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Class (r:1 w:1) fn freeze_class() -> Weight { - (17_414_000 as Weight) + (13_277_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Class (r:1 w:1) fn thaw_class() -> Weight { - (17_507_000 as Weight) + (12_984_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -145,20 +145,20 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) // Storage: Uniques ClassAccount (r:0 w:2) fn transfer_ownership() -> Weight { - (39_010_000 as Weight) + (29_717_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } // Storage: Uniques Class (r:1 w:1) fn set_team() -> Weight { - (18_179_000 as Weight) + (13_830_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Class (r:1 w:1) // Storage: Uniques ClassAccount (r:0 w:1) fn force_asset_status() -> Weight { - (21_116_000 as Weight) + (16_252_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -166,7 +166,7 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques InstanceMetadataOf (r:1 w:0) // Storage: Uniques Attribute (r:1 w:1) fn set_attribute() -> Weight { - (48_250_000 as Weight) + (35_708_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -174,49 +174,49 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques InstanceMetadataOf (r:1 w:0) // Storage: Uniques Attribute (r:1 w:1) fn clear_attribute() -> Weight { - (45_055_000 as Weight) + (34_426_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Uniques Class (r:1 w:1) // Storage: Uniques InstanceMetadataOf (r:1 w:1) fn set_metadata() -> Weight { - (37_670_000 as Weight) + (28_270_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Uniques Class (r:1 w:1) // Storage: Uniques InstanceMetadataOf (r:1 w:1) fn clear_metadata() -> Weight { - (37_371_000 as Weight) + (27_983_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Uniques Class (r:1 w:1) // Storage: Uniques ClassMetadataOf (r:1 w:1) fn set_class_metadata() -> Weight { - (36_472_000 as Weight) + (28_141_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: Uniques Class (r:1 w:0) // Storage: Uniques ClassMetadataOf (r:1 w:1) fn clear_class_metadata() -> Weight { - (33_794_000 as Weight) + (26_122_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Class (r:1 w:0) // Storage: Uniques Asset (r:1 w:1) fn approve_transfer() -> Weight { - (24_739_000 as Weight) + (18_738_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } // Storage: Uniques Class (r:1 w:0) // Storage: Uniques Asset (r:1 w:1) fn cancel_approval() -> Weight { - (25_018_000 as Weight) + (18_879_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } diff --git a/polkadot-parachains/westmint/src/weights/pallet_utility.rs b/polkadot-parachains/westmint/src/weights/pallet_utility.rs index 1995240fef..90673fd8db 100644 --- a/polkadot-parachains/westmint/src/weights/pallet_utility.rs +++ b/polkadot-parachains/westmint/src/weights/pallet_utility.rs @@ -17,11 +17,11 @@ //! Autogenerated weights for `pallet_utility` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-02-02, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("westmint-dev"), DB CACHE: 1024 // Executed Command: -// ./target/release/polkadot-collator +// ./target/production/polkadot-collator // benchmark // --chain=westmint-dev // --execution=wasm @@ -30,7 +30,7 @@ // --extrinsic=* // --steps=50 // --repeat=20 -// --raw +// --json-file=./bench-westmint.json // --header=./file_header.txt // --output=./polkadot-parachains/westmint/src/weights @@ -45,19 +45,19 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_utility::WeightInfo for WeightInfo { fn batch(c: u32, ) -> Weight { - (17_852_000 as Weight) - // Standard Error: 1_000 - .saturating_add((3_564_000 as Weight).saturating_mul(c as Weight)) + (17_310_000 as Weight) + // Standard Error: 2_000 + .saturating_add((3_675_000 as Weight).saturating_mul(c as Weight)) } fn as_derivative() -> Weight { - (2_784_000 as Weight) + (2_522_000 as Weight) } fn batch_all(c: u32, ) -> Weight { - (21_568_000 as Weight) - // Standard Error: 1_000 - .saturating_add((3_860_000 as Weight).saturating_mul(c as Weight)) + (18_929_000 as Weight) + // Standard Error: 2_000 + .saturating_add((4_001_000 as Weight).saturating_mul(c as Weight)) } fn dispatch_as() -> Weight { - (11_680_000 as Weight) + (8_891_000 as Weight) } } diff --git a/primitives/core/src/lib.rs b/primitives/core/src/lib.rs index c6b85e7da6..516ff817dc 100644 --- a/primitives/core/src/lib.rs +++ b/primitives/core/src/lib.rs @@ -35,7 +35,7 @@ pub use polkadot_primitives::v2::{ /// A module that re-exports relevant relay chain definitions. pub mod relay_chain { pub use polkadot_core_primitives::*; - pub use polkadot_primitives::{v2, v2::well_known_keys}; + pub use polkadot_primitives::{runtime_api, v2, v2::well_known_keys}; } /// An inbound HRMP message. diff --git a/primitives/parachain-inherent/Cargo.toml b/primitives/parachain-inherent/Cargo.toml index fd661b5a1f..eb99e5b88d 100644 --- a/primitives/parachain-inherent/Cargo.toml +++ b/primitives/parachain-inherent/Cargo.toml @@ -5,10 +5,10 @@ authors = ["Parity Technologies "] edition = "2021" [dependencies] -async-trait = { version = "0.1.42", optional = true } +async-trait = { version = "0.1.53", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive" ] } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } -tracing = { version = "0.1.32", optional = true } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } +tracing = { version = "0.1.33", optional = true } # Substrate sc-client-api = { git = "https://github.com/paritytech/substrate", optional = true, branch = "master" } diff --git a/scripts/benchmarks-ci.sh b/scripts/benchmarks-ci.sh new file mode 100755 index 0000000000..91d24bb5dc --- /dev/null +++ b/scripts/benchmarks-ci.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +steps=50 +repeat=20 +chainName=$1 + +benhcmarkOutput=./polkadot-parachains/$chainName/src/weights +benhcmarkChainName="$chainName-dev" + +pallets=( + pallet_assets + pallet_balances + pallet_collator_selection + pallet_multisig + pallet_proxy + pallet_session + pallet_timestamp + pallet_utility + pallet_uniques + cumulus_pallet_xcmp_queue + frame_system +) + +for p in ${pallets[@]} +do + ./artifacts/polkadot-collator benchmark \ + --chain=$benhcmarkChainName \ + --execution=wasm \ + --wasm-execution=compiled \ + --pallet=$p \ + --extrinsic='*' \ + --steps=$steps \ + --repeat=$repeat \ + --json \ + --header=./file_header.txt \ + --output=$benhcmarkOutput +done diff --git a/scripts/changelog/.gitignore b/scripts/ci/changelog/.gitignore similarity index 100% rename from scripts/changelog/.gitignore rename to scripts/ci/changelog/.gitignore diff --git a/scripts/changelog/Gemfile b/scripts/ci/changelog/Gemfile similarity index 100% rename from scripts/changelog/Gemfile rename to scripts/ci/changelog/Gemfile diff --git a/scripts/changelog/Gemfile.lock b/scripts/ci/changelog/Gemfile.lock similarity index 100% rename from scripts/changelog/Gemfile.lock rename to scripts/ci/changelog/Gemfile.lock diff --git a/scripts/changelog/README.md b/scripts/ci/changelog/README.md similarity index 84% rename from scripts/changelog/README.md rename to scripts/ci/changelog/README.md index 7226530c42..478e0b56d9 100644 --- a/scripts/changelog/README.md +++ b/scripts/ci/changelog/README.md @@ -7,7 +7,7 @@ For now, a bit of preparation is required before you can run the script: - store them under the `digests` folder as `-srtool-digest.json` - ensure the `.env` file is up to date with correct information -The content of the release notes is generated from the template files under the `scripts/changelog/templates` folder. For readability and maintenance, the template is split into several small snippets. +The content of the release notes is generated from the template files under the `scripts/ci/changelog/templates` folder. For readability and maintenance, the template is split into several small snippets. Run: ``` @@ -16,7 +16,7 @@ Run: For instance: ``` -./bin/changelog statemine-v5.0.0 +./bin/changelog parachains-v7.0.0-rc8 ``` A file called `release-notes.md` will be generated and can be used for the release. @@ -36,6 +36,13 @@ REF2=HEAD DEBUG=1 NO_CACHE=1 ``` + +By default, the template will include all the information, including the runtime data. +For clients releases, we don't need those and they can be skipped by setting the following env: +``` +RELEASE_TYPE=client +``` + ## Considered labels The following list will likely evolve over time and it will be hard to keep it in sync. diff --git a/scripts/changelog/bin/changelog b/scripts/ci/changelog/bin/changelog similarity index 67% rename from scripts/changelog/bin/changelog rename to scripts/ci/changelog/bin/changelog index 33650787e1..85044f8022 100755 --- a/scripts/changelog/bin/changelog +++ b/scripts/ci/changelog/bin/changelog @@ -81,34 +81,56 @@ WESTMINT_DIGEST = ENV['WESTMINT_DIGEST'] || 'digests/westmint-srtool-digest.json STATEMINE_DIGEST = ENV['STATEMINE_DIGEST'] || 'digests/statemine-srtool-digest.json' STATEMINT_DIGEST = ENV['STATEMINT_DIGEST'] || 'digests/statemint-srtool-digest.json' ROCOCO_PARA_DIGEST = ENV['ROCOCO_PARA_DIGEST'] || 'digests/rococo-parachain-srtool-digest.json' +CANVAS_KUSAMA_DIGEST = ENV['CANVAS_KUSAMA_DIGEST'] || 'digests/canvas-kusama-srtool-digest.json' -# Here we compose all the pieces together into one -# single big json file. -cmd = format('jq \ +logger.debug("Release type: #{ENV['RELEASE_TYPE']}") + +if ENV['RELEASE_TYPE'] && ENV['RELEASE_TYPE'] == 'client' + logger.debug("Building changelog without runtimes") + cmd = format('jq \ --slurpfile cumulus %s \ --slurpfile substrate %s \ --slurpfile polkadot %s \ - --slurpfile srtool_shell %s \ - --slurpfile srtool_westmint %s \ - --slurpfile srtool_statemine %s \ - --slurpfile srtool_statemint %s \ - --slurpfile srtool_rococo_parachain %s \ -n \'{ cumulus: $cumulus[0], substrate: $substrate[0], polkadot: $polkadot[0], - srtool: [ - { name: "rococo", data: $srtool_rococo_parachain[0] }, - { name: "shell", data: $srtool_shell[0] }, - { name: "westmint", data: $srtool_westmint[0] }, - { name: "statemint", data: $srtool_statemint[0] }, - { name: "statemine", data: $srtool_statemine[0] } - ] }\' > context.json', cumulus_data, substrate_data, polkadot_data, - SHELL_DIGEST, - WESTMINT_DIGEST, - STATEMINE_DIGEST, - STATEMINT_DIGEST, - ROCOCO_PARA_DIGEST) + }\' > context.json', cumulus_data, substrate_data, polkadot_data, + ) +else + logger.debug("Building changelog with runtimes") + + # Here we compose all the pieces together into one + # single big json file. + cmd = format('jq \ + --slurpfile cumulus %s \ + --slurpfile substrate %s \ + --slurpfile polkadot %s \ + --slurpfile srtool_shell %s \ + --slurpfile srtool_westmint %s \ + --slurpfile srtool_statemine %s \ + --slurpfile srtool_statemint %s \ + --slurpfile srtool_rococo_parachain %s \ + --slurpfile srtool_canvas_kusama %s \ + -n \'{ + cumulus: $cumulus[0], + substrate: $substrate[0], + polkadot: $polkadot[0], + srtool: [ + { name: "rococo", data: $srtool_rococo_parachain[0] }, + { name: "shell", data: $srtool_shell[0] }, + { name: "westmint", data: $srtool_westmint[0] }, + { name: "statemint", data: $srtool_statemint[0] }, + { name: "statemine", data: $srtool_statemine[0] }, + { name: "canvas", data: $srtool_canvas_kusama[0] } + ] }\' > context.json', cumulus_data, substrate_data, polkadot_data, + SHELL_DIGEST, + WESTMINT_DIGEST, + STATEMINE_DIGEST, + STATEMINT_DIGEST, + ROCOCO_PARA_DIGEST, + CANVAS_KUSAMA_DIGEST) +end system(cmd) cmd = format('tera --env --env-key env --include-path templates \ diff --git a/scripts/changelog/digests/.gitignore b/scripts/ci/changelog/digests/.gitignore similarity index 100% rename from scripts/changelog/digests/.gitignore rename to scripts/ci/changelog/digests/.gitignore diff --git a/scripts/changelog/digests/.gitkeep b/scripts/ci/changelog/digests/.gitkeep similarity index 100% rename from scripts/changelog/digests/.gitkeep rename to scripts/ci/changelog/digests/.gitkeep diff --git a/scripts/changelog/lib/changelog.rb b/scripts/ci/changelog/lib/changelog.rb similarity index 100% rename from scripts/changelog/lib/changelog.rb rename to scripts/ci/changelog/lib/changelog.rb diff --git a/scripts/changelog/templates/change.md.tera b/scripts/ci/changelog/templates/change.md.tera similarity index 97% rename from scripts/changelog/templates/change.md.tera rename to scripts/ci/changelog/templates/change.md.tera index 7a4c9a357c..b02b1d513c 100644 --- a/scripts/changelog/templates/change.md.tera +++ b/scripts/ci/changelog/templates/change.md.tera @@ -25,7 +25,6 @@ {%- set audit = "" -%} {%- endif -%} #} - {%- if c.html_url is containing("polkadot") -%} {%- set repo = dot -%} {%- elif c.html_url is containing("cumulus") -%} @@ -35,11 +34,11 @@ {%- else -%} {%- set repo = " " -%} {%- endif -%} - +{# #} {%- if c.meta.T and c.meta.T.value == 6 -%} {%- set xcm = " [✉ī¸ XCM]" -%} {%- else -%} {%- set xcm = "" -%} {%- endif -%} {{- repo }} {{ audit }}[`#{{c.number}}`]({{c.html_url}}) {{- prio }} - {{ c.title | capitalize | truncate(length=60, end="â€Ļ") }}{{xcm }} -{%- endmacro change -%} +{%- endmacro change %} diff --git a/scripts/changelog/templates/changes.md.tera b/scripts/ci/changelog/templates/changes.md.tera similarity index 100% rename from scripts/changelog/templates/changes.md.tera rename to scripts/ci/changelog/templates/changes.md.tera diff --git a/scripts/changelog/templates/changes_client.md.tera b/scripts/ci/changelog/templates/changes_client.md.tera similarity index 100% rename from scripts/changelog/templates/changes_client.md.tera rename to scripts/ci/changelog/templates/changes_client.md.tera diff --git a/scripts/changelog/templates/changes_misc.md.tera b/scripts/ci/changelog/templates/changes_misc.md.tera similarity index 100% rename from scripts/changelog/templates/changes_misc.md.tera rename to scripts/ci/changelog/templates/changes_misc.md.tera diff --git a/scripts/changelog/templates/changes_runtime.md.tera b/scripts/ci/changelog/templates/changes_runtime.md.tera similarity index 100% rename from scripts/changelog/templates/changes_runtime.md.tera rename to scripts/ci/changelog/templates/changes_runtime.md.tera diff --git a/scripts/changelog/templates/compiler.md.tera b/scripts/ci/changelog/templates/compiler.md.tera similarity index 100% rename from scripts/changelog/templates/compiler.md.tera rename to scripts/ci/changelog/templates/compiler.md.tera diff --git a/scripts/changelog/templates/debug.md.tera b/scripts/ci/changelog/templates/debug.md.tera similarity index 99% rename from scripts/changelog/templates/debug.md.tera rename to scripts/ci/changelog/templates/debug.md.tera index 29ac673a39..43eb52a84d 100644 --- a/scripts/changelog/templates/debug.md.tera +++ b/scripts/ci/changelog/templates/debug.md.tera @@ -1,5 +1,4 @@ {%- set to_ignore = changes | filter(attribute="meta.B.value", value=0) %} - -{# todo: show high prio list here #} +{# We show the result #} +{{ m_p::high_priority(p=global_prio, changes=changes) }} diff --git a/scripts/changelog/templates/high_priority.md.tera b/scripts/ci/changelog/templates/high_priority.md.tera similarity index 58% rename from scripts/changelog/templates/high_priority.md.tera rename to scripts/ci/changelog/templates/high_priority.md.tera index f773fa7a9e..501b75bdce 100644 --- a/scripts/changelog/templates/high_priority.md.tera +++ b/scripts/ci/changelog/templates/high_priority.md.tera @@ -3,7 +3,23 @@ {# This macro convert a priority level into readable output #} {%- macro high_priority(p, changes) -%} -{%- if p >= 7 -%} +{# real globals don't work so we count the number of host functions here as well #} +{# unfortunately, the next snippet is duplicated in the host_functions.md.tera template #} +{# as well #} +{%- set_global host_fn_count = 0 -%} + +{# We loop first to count the number of host functions but we do not display anything yet #} +{%- for pr in changes -%} +{%- if pr.meta.B and pr.meta.B.value == 0 -%} +{#- We skip silent ones -#} +{%- else -%} + {%- if pr.meta.E and pr.meta.E.value == 4 -%} + {%- set_global host_fn_count = host_fn_count + 1 -%} + {%- endif -%} +{%- endif -%} +{%- endfor -%} + +{%- if p >= 7 or host_fn_count > 0 -%} {%- set prio = "â€ŧī¸ HIGH" -%} {%- set text = "This is a **high priority** release and you must upgrade as as soon as possible." -%} {%- elif p >= 5 -%} @@ -12,16 +28,17 @@ {%- elif p >= 3 -%} {%- set prio = "Low" -%} {%- set text = "This is a low priority release and you may upgrade at your convenience." -%} -{%- endif %} +{%- endif -%} -{%- if prio %} +{%- if prio -%} {{prio}}: {{text}} {%- else -%} -{% endif %} +{%- endif %} +{# We only show details if Medium or High #} +{%- if p >= 5 -%} The changes motivating this priority level are: - {% for pr in changes | sort(attribute="merged_at") -%} {%- if pr.meta.C -%} {%- if pr.meta.C.value == p %} @@ -29,9 +46,10 @@ The changes motivating this priority level are: {%- if pr.meta.B and pr.meta.B.value == 7 %} (RUNTIME) {% endif %} + {%- endif -%} {%- endif -%} {%- endfor %} - +{%- endif %} {%- endmacro priority -%} diff --git a/scripts/changelog/templates/host_functions.md.tera b/scripts/ci/changelog/templates/host_functions.md.tera similarity index 73% rename from scripts/changelog/templates/host_functions.md.tera rename to scripts/ci/changelog/templates/host_functions.md.tera index 6cc4c7581a..fc84c09028 100644 --- a/scripts/changelog/templates/host_functions.md.tera +++ b/scripts/ci/changelog/templates/host_functions.md.tera @@ -1,30 +1,38 @@ {%- import "change.md.tera" as m_c -%} + {%- set_global host_fn_count = 0 -%} +{# We loop first to count the number of host functions but we do not display anything yet #} +{%- for pr in changes -%} +{%- if pr.meta.B and pr.meta.B.value == 0 -%} +{#- We skip silent ones -#} +{%- else -%} + {%- if pr.meta.E and pr.meta.E.value == 4 -%} + {%- set_global host_fn_count = host_fn_count + 1 -%} + {% endif -%} +{%- endif -%} +{%- endfor -%} + + + +{% if host_fn_count == 0 -%} + +{%- else -%} +## Host functions + +⚠ī¸ The runtimes in this release contain {{ host_fn_count }} new **host function{{ host_fn_count | pluralize }}**. + +⚠ī¸ It is critical that you update your client before the chain switches to the new runtimes. + {% for pr in changes | sort(attribute="merged_at") -%} {%- if pr.meta.B and pr.meta.B.value == 0 -%} {#- We skip silent ones -#} {%- else -%} {%- if pr.meta.E and pr.meta.E.value == 4 -%} - {%- set_global host_fn_count = host_fn_count + 1 -%} - {{ m_c::change(c=pr) }} {% endif -%} {% endif -%} {%- endfor -%} - - -{% if host_fn_count == 0 -%} - -{% elif host_fn_count == 1 -%} -## Host functions - -⚠ī¸ The runtimes in this release contain one new **host function**. - -⚠ī¸ It is critical that you update your client before the chain switches to the new runtimes. -{%- else -%} -⚠ī¸ The runtimes in this release contain {{ host_fn_count }} new **host function{{ host_fn_count | pluralize }}**. - -⚠ī¸ It is critical that you update your client before the chain switches to the new runtimes. {%- endif %} diff --git a/scripts/ci/changelog/templates/migrations-db.md.tera b/scripts/ci/changelog/templates/migrations-db.md.tera new file mode 100644 index 0000000000..d2fd8105e4 --- /dev/null +++ b/scripts/ci/changelog/templates/migrations-db.md.tera @@ -0,0 +1,26 @@ +{%- import "change.md.tera" as m_c %} +{%- set_global db_migration_count = 0 -%} + +## Database Migrations + +{% for pr in changes | sort(attribute="merged_at") -%} + +{%- if pr.meta.B and pr.meta.B.value == 0 %} +{#- We skip silent ones -#} +{%- else -%} +{%- if pr.meta.E and pr.meta.E.value == 2 -%} +{%- set_global db_migration_count = db_migration_count + 1 -%} +- {{ m_c::change(c=pr) }} +{% endif -%} +{% endif -%} +{% endfor -%} + +{%- if db_migration_count == 0 -%} +No Database migration detected in this release. +{% else %} + +There is {{ db_migration_count }} database migration(s) in this release. + +Database migrations are operations bringing your database to the latest stand. +Some migrations may break compatibility and making a backup of your database is highly recommended. +{%- endif %} diff --git a/scripts/changelog/templates/migrations.md.tera b/scripts/ci/changelog/templates/migrations-runtime.md.tera similarity index 93% rename from scripts/changelog/templates/migrations.md.tera rename to scripts/ci/changelog/templates/migrations-runtime.md.tera index af04821a2e..6c7bd287c9 100644 --- a/scripts/changelog/templates/migrations.md.tera +++ b/scripts/ci/changelog/templates/migrations-runtime.md.tera @@ -1,6 +1,6 @@ {%- import "change.md.tera" as m_c %} -## Migrations +## Runtime Migrations {% for pr in changes | sort(attribute="merged_at") -%} diff --git a/scripts/changelog/templates/pre_release.md.tera b/scripts/ci/changelog/templates/pre_release.md.tera similarity index 100% rename from scripts/changelog/templates/pre_release.md.tera rename to scripts/ci/changelog/templates/pre_release.md.tera diff --git a/scripts/changelog/templates/runtime.md.tera b/scripts/ci/changelog/templates/runtime.md.tera similarity index 71% rename from scripts/changelog/templates/runtime.md.tera rename to scripts/ci/changelog/templates/runtime.md.tera index f4afa78972..782d782bbe 100644 --- a/scripts/changelog/templates/runtime.md.tera +++ b/scripts/ci/changelog/templates/runtime.md.tera @@ -10,18 +10,18 @@ {%- endif %} {%- set comp_ratio = 100 - (runtime.data.runtimes.compressed.subwasm.compression.size_compressed / runtime.data.runtimes.compressed.subwasm.compression.size_decompressed *100) %} - - - - + + + + + + ``` 🏋ī¸ Runtime Size: {{ runtime.data.runtimes.compressed.subwasm.size | filesizeformat }} ({{ runtime.data.runtimes.compressed.subwasm.size }} bytes) đŸ”Ĩ Core Version: {{ runtime.data.runtimes.compressed.subwasm.core_version }} 🗜 Compressed: {{ compressed }}: {{ comp_ratio | round(method="ceil", precision=2) }}% 🎁 Metadata version: V{{ runtime.data.runtimes.compressed.subwasm.metadata_version }} -đŸ—ŗī¸ system.setCode hash: {{ runtime.data.runtimes.compressed.subwasm.proposal_hash }} -đŸ—ŗī¸ authorizeUpgrade hash: {{ runtime.data.runtimes.compressed.subwasm.parachain_authorize_upgrade_hash }} #ī¸âƒŖ Blake2-256 hash: {{ runtime.data.runtimes.compressed.subwasm.blake2_256 }} đŸ“Ļ IPFS: {{ runtime.data.runtimes.compressed.subwasm.ipfs_hash }} ``` diff --git a/scripts/changelog/templates/runtimes.md.tera b/scripts/ci/changelog/templates/runtimes.md.tera similarity index 100% rename from scripts/changelog/templates/runtimes.md.tera rename to scripts/ci/changelog/templates/runtimes.md.tera diff --git a/scripts/changelog/templates/template.md.tera b/scripts/ci/changelog/templates/template.md.tera similarity index 62% rename from scripts/changelog/templates/template.md.tera rename to scripts/ci/changelog/templates/template.md.tera index 5a1542e876..1545951993 100644 --- a/scripts/changelog/templates/template.md.tera +++ b/scripts/ci/changelog/templates/template.md.tera @@ -1,4 +1,4 @@ -{# This is the entry point of the template -#} +{# This is the entry point of the template for the parachains-* releases-#} {% include "pre_release.md.tera" -%} @@ -16,17 +16,21 @@ This release contains the changes from `{{ env.REF1 }}` to `{{ env.REF2 }}`. {%- set DOT = "[P]" -%} {%- set SUB = "[S]" -%} - -{% include "global_priority.md.tera" -%} +{# We check for host function first because no matter what the priority is, #} +{# we will force it to HIGH if at least one host function was detected. #} {% include "host_functions.md.tera" -%} - +{% include "global_priority.md.tera" -%} {% include "compiler.md.tera" -%} +{% include "migrations-db.md.tera" -%} -{% include "migrations.md.tera" -%} +{% if env.RELEASE_TYPE and env.RELEASE_TYPE == "client" %} + +{% else %} +{% include "migrations-runtime.md.tera" -%} {% include "runtimes.md.tera" -%} +{% endif %} {% include "changes.md.tera" -%} - {% include "docker_image.md.tera" -%} diff --git a/scripts/changelog/test/test_basic.rb b/scripts/ci/changelog/test/test_basic.rb similarity index 100% rename from scripts/changelog/test/test_basic.rb rename to scripts/ci/changelog/test/test_basic.rb diff --git a/scripts/common/lib.sh b/scripts/ci/common/lib.sh similarity index 100% rename from scripts/common/lib.sh rename to scripts/ci/common/lib.sh diff --git a/scripts/extrinsic-ordering-filter.sh b/scripts/ci/extrinsic-ordering-filter.sh similarity index 100% rename from scripts/extrinsic-ordering-filter.sh rename to scripts/ci/extrinsic-ordering-filter.sh diff --git a/scripts/github/check_labels.sh b/scripts/ci/github/check_labels.sh similarity index 100% rename from scripts/github/check_labels.sh rename to scripts/ci/github/check_labels.sh diff --git a/scripts/github/runtime-version.rb b/scripts/ci/github/runtime-version.rb similarity index 100% rename from scripts/github/runtime-version.rb rename to scripts/ci/github/runtime-version.rb diff --git a/scripts/ci/pre_cache.sh b/scripts/ci/pre_cache.sh deleted file mode 100755 index c25d73587b..0000000000 --- a/scripts/ci/pre_cache.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -set -u - -# if there is no directory for this $CI_COMMIT_REF_NAME/$CI_JOB_NAME -# create such directory and -# copy recursively all the files from the newest dir which has $CI_JOB_NAME, if it exists - -# cache lives in /ci-cache/${CI_PROJECT_NAME}/${2}/${CI_COMMIT_REF_NAME}/${CI_JOB_NAME} - -function prepopulate { - if [[ ! -d $1 ]]; then - mkdir -p "/ci-cache/$CI_PROJECT_NAME/$2/$CI_COMMIT_REF_NAME"; - FRESH_CACHE=$(find "/ci-cache/$CI_PROJECT_NAME/$2" -mindepth 2 -maxdepth 2 \ - -type d -name "$CI_JOB_NAME" -exec stat --printf="%Y\t%n\n" {} \; |sort -n -r |head -1 |cut -f2); - if [[ -d $FRESH_CACHE ]]; then - echo "____Using" "$FRESH_CACHE" "to prepopulate the cache____"; - time cp -r "$FRESH_CACHE" "$1"; - else - echo "_____No such $2 dir, proceeding from scratch_____"; - fi - else - echo "____No need to prepopulate $2 cache____"; - fi -} - -# CARGO_HOME cache is still broken so would be handled some other way. -prepopulate "$CARGO_TARGET_DIR" targets diff --git a/test/runtime/Cargo.toml b/test/runtime/Cargo.toml index 84ba37dae9..66a6e7472b 100644 --- a/test/runtime/Cargo.toml +++ b/test/runtime/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.0", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0.132", optional = true, features = ["derive"] } # Substrate diff --git a/test/runtime/src/lib.rs b/test/runtime/src/lib.rs index 4a3814a5c3..bfa8db3289 100644 --- a/test/runtime/src/lib.rs +++ b/test/runtime/src/lib.rs @@ -49,7 +49,7 @@ pub use frame_support::{ traits::Randomness, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, - DispatchClass, IdentityFee, Weight, + ConstantMultiplier, DispatchClass, IdentityFee, Weight, }, StorageValue, }; @@ -245,8 +245,8 @@ parameter_types! { impl pallet_transaction_payment::Config for Runtime { type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter; - type TransactionByteFee = TransactionByteFee; type WeightToFee = IdentityFee; + type LengthToFee = ConstantMultiplier; type FeeMultiplierUpdate = (); type OperationalFeeMultiplier = OperationalFeeMultiplier; } diff --git a/test/service/Cargo.toml b/test/service/Cargo.toml index 85bbf4075e..5d27ad1542 100644 --- a/test/service/Cargo.toml +++ b/test/service/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2021" [dependencies] -async-trait = "0.1.42" +async-trait = "0.1.53" codec = { package = "parity-scale-codec", version = "3.0.0" } criterion = { version = "0.3.5", features = [ "async_tokio" ] } jsonrpc-core = "18.0.0"