From 76ae882f128eb2731a64e1f6e3ce9abd35bd9ce4 Mon Sep 17 00:00:00 2001 From: nakul1010 Date: Tue, 5 Sep 2023 12:27:29 +0530 Subject: [PATCH 1/7] fix: benachmarking, test cases, imports --- .github/ISSUE_TEMPLATE/roadmap.md | 49 + .github/workflows/benchmark.yml | 100 - .github/workflows/cargo-test.yml | 4 +- .github/workflows/draft-release.yml | 3 +- .github/workflows/notify-breaking.yml | 10 +- .github/workflows/projects.yml | 8 + Cargo.lock | 3724 ++++++++++------- Cargo.toml | 523 +-- README.md | 10 + crates/annuity/Cargo.toml | 4 +- crates/annuity/src/lib.rs | 11 +- crates/annuity/src/mock.rs | 38 +- crates/annuity/src/tests.rs | 25 +- crates/bitcoin/Cargo.toml | 12 +- crates/bitcoin/src/address.rs | 9 +- crates/bitcoin/src/compat.rs | 119 + crates/bitcoin/src/formatter.rs | 12 +- crates/bitcoin/src/lib.rs | 3 + crates/bitcoin/src/parser.rs | 120 +- crates/bitcoin/src/pow.rs | 7 +- crates/bitcoin/src/script.rs | 19 + crates/bitcoin/src/types.rs | 8 +- crates/btc-relay/src/ext.rs | 9 +- crates/btc-relay/src/lib.rs | 69 +- crates/btc-relay/src/mock.rs | 20 +- crates/btc-relay/src/tests.rs | 46 + crates/clients-info/Cargo.toml | 4 +- crates/clients-info/src/mock.rs | 20 +- crates/collator-selection/src/benchmarking.rs | 7 +- crates/collator-selection/src/lib.rs | 28 +- crates/collator-selection/src/mock.rs | 26 +- crates/collator-selection/src/tests.rs | 6 +- crates/currency/Cargo.toml | 4 +- crates/currency/src/mock.rs | 20 +- crates/democracy/Cargo.toml | 4 +- crates/democracy/src/lib.rs | 64 +- crates/democracy/src/migrations.rs | 13 +- crates/democracy/src/tests.rs | 22 +- crates/democracy/src/vote_threshold.rs | 16 +- crates/dex-general/Cargo.toml | 4 +- crates/dex-general/rpc/Cargo.toml | 2 +- crates/dex-general/src/fee/mock.rs | 41 +- crates/dex-general/src/lib.rs | 56 +- crates/dex-general/src/rpc.rs | 6 +- crates/dex-general/src/swap/mock.rs | 38 +- crates/dex-general/src/swap/mod.rs | 5 +- crates/dex-stable/Cargo.toml | 4 +- crates/dex-stable/rpc/Cargo.toml | 2 +- crates/dex-stable/src/lib.rs | 22 +- crates/dex-stable/src/mock.rs | 79 +- crates/dex-swap-router/Cargo.toml | 4 +- crates/dex-swap-router/src/lib.rs | 2 +- crates/dex-swap-router/src/mock.rs | 76 +- crates/escrow/Cargo.toml | 4 +- crates/escrow/src/lib.rs | 57 +- crates/escrow/src/mock.rs | 38 +- crates/escrow/src/tests.rs | 14 +- crates/farming/Cargo.toml | 4 +- crates/farming/src/lib.rs | 6 +- crates/farming/src/mock.rs | 23 +- crates/fee/Cargo.toml | 4 +- crates/fee/src/lib.rs | 25 +- crates/fee/src/mock.rs | 20 +- crates/issue/Cargo.toml | 4 +- crates/issue/src/ext.rs | 8 +- crates/issue/src/lib.rs | 23 +- crates/issue/src/migration.rs | 10 +- crates/issue/src/mock.rs | 30 +- crates/issue/src/types.rs | 9 +- crates/loans/Cargo.toml | 2 +- crates/loans/rpc/Cargo.toml | 2 +- crates/loans/src/farming.rs | 2 +- crates/loans/src/lib.rs | 20 +- crates/loans/src/mock.rs | 48 +- crates/loans/src/rate_model.rs | 47 +- crates/loans/src/types.rs | 29 +- crates/multi-transaction-payment/Cargo.toml | 4 +- crates/multi-transaction-payment/src/mock.rs | 21 +- crates/nomination/Cargo.toml | 4 +- crates/nomination/src/ext.rs | 4 +- crates/nomination/src/lib.rs | 21 +- crates/nomination/src/mock.rs | 38 +- crates/oracle/src/lib.rs | 21 +- crates/oracle/src/mock.rs | 21 +- crates/redeem/Cargo.toml | 4 +- crates/redeem/src/ext.rs | 8 +- crates/redeem/src/lib.rs | 24 +- crates/redeem/src/mock.rs | 45 +- crates/redeem/src/types.rs | 11 +- crates/replace/Cargo.toml | 4 +- crates/replace/src/ext.rs | 8 +- crates/replace/src/lib.rs | 23 +- crates/replace/src/mock.rs | 30 +- crates/replace/src/types.rs | 9 +- crates/reward/Cargo.toml | 4 +- crates/reward/src/lib.rs | 4 +- crates/reward/src/mock.rs | 19 +- crates/security/Cargo.toml | 4 +- crates/security/src/lib.rs | 17 +- crates/security/src/mock.rs | 19 +- crates/staking/Cargo.toml | 6 +- crates/staking/src/lib.rs | 75 +- crates/staking/src/mock.rs | 19 +- crates/supply/Cargo.toml | 6 +- crates/supply/src/lib.rs | 30 +- crates/supply/src/mock.rs | 26 +- crates/traits/Cargo.toml | 2 +- crates/tx-pause/src/lib.rs | 15 +- crates/tx-pause/src/mock.rs | 30 +- crates/vault-registry/Cargo.toml | 4 +- crates/vault-registry/src/ext.rs | 6 +- crates/vault-registry/src/lib.rs | 25 +- crates/vault-registry/src/mock.rs | 43 +- crates/vault-registry/src/pool_manager.rs | 2 +- crates/vault-registry/src/types.rs | 9 +- parachain/Cargo.toml | 4 +- .../common/src/benchmarking/orml_vesting.rs | 4 +- parachain/runtime/common/src/evm/mod.rs | 6 +- parachain/runtime/common/src/lib.rs | 16 +- parachain/runtime/interlay/Cargo.toml | 7 +- parachain/runtime/interlay/src/dex.rs | 4 +- parachain/runtime/interlay/src/lib.rs | 85 +- .../src/weights/annuity_escrow_annuity.rs | 28 +- .../src/weights/annuity_vault_annuity.rs | 20 +- .../runtime/interlay/src/weights/btc_relay.rs | 62 +- .../interlay/src/weights/clients_info.rs | 28 +- .../src/weights/collator_selection.rs | 92 +- .../src/weights/cumulus_pallet_xcmp_queue.rs | 14 +- .../runtime/interlay/src/weights/democracy.rs | 126 +- .../interlay/src/weights/dex_general.rs | 148 +- .../interlay/src/weights/dex_stable.rs | 162 +- .../interlay/src/weights/dex_swap_router.rs | 14 +- .../runtime/interlay/src/weights/escrow.rs | 142 +- .../runtime/interlay/src/weights/farming.rs | 72 +- parachain/runtime/interlay/src/weights/fee.rs | 51 +- .../interlay/src/weights/frame_system.rs | 68 +- .../runtime/interlay/src/weights/issue.rs | 168 +- .../runtime/interlay/src/weights/loans.rs | 168 +- .../interlay/src/weights/nomination.rs | 117 +- .../runtime/interlay/src/weights/oracle.rs | 51 +- .../src/weights/orml_asset_registry.rs | 22 +- .../interlay/src/weights/orml_tokens.rs | 46 +- .../interlay/src/weights/orml_vesting.rs | 30 +- .../interlay/src/weights/pallet_collective.rs | 180 +- .../interlay/src/weights/pallet_identity.rs | 222 +- .../interlay/src/weights/pallet_membership.rs | 84 +- .../interlay/src/weights/pallet_multisig.rs | 90 +- .../interlay/src/weights/pallet_preimage.rs | 74 +- .../interlay/src/weights/pallet_proxy.rs | 140 +- .../interlay/src/weights/pallet_scheduler.rs | 84 +- .../interlay/src/weights/pallet_timestamp.rs | 22 +- .../interlay/src/weights/pallet_utility.rs | 38 +- .../interlay/src/weights/pallet_xcm.rs | 95 +- .../weights/pallet_xcm_benchmarks_fungible.rs | 54 +- .../weights/pallet_xcm_benchmarks_generic.rs | 146 +- .../runtime/interlay/src/weights/redeem.rs | 94 +- .../runtime/interlay/src/weights/replace.rs | 106 +- .../runtime/interlay/src/weights/security.rs | 27 +- .../runtime/interlay/src/weights/supply.rs | 18 +- .../runtime/interlay/src/weights/tx_pause.rs | 14 +- .../interlay/src/weights/vault_registry.rs | 92 +- parachain/runtime/interlay/src/xcm_config.rs | 8 + parachain/runtime/kintsugi/Cargo.toml | 9 +- parachain/runtime/kintsugi/src/contracts.rs | 12 +- parachain/runtime/kintsugi/src/lib.rs | 200 +- .../src/weights/annuity_escrow_annuity.rs | 28 +- .../src/weights/annuity_vault_annuity.rs | 20 +- .../runtime/kintsugi/src/weights/btc_relay.rs | 62 +- .../kintsugi/src/weights/clients_info.rs | 30 +- .../src/weights/collator_selection.rs | 92 +- .../src/weights/cumulus_pallet_xcmp_queue.rs | 14 +- .../runtime/kintsugi/src/weights/democracy.rs | 126 +- .../kintsugi/src/weights/dex_general.rs | 148 +- .../kintsugi/src/weights/dex_stable.rs | 158 +- .../kintsugi/src/weights/dex_swap_router.rs | 14 +- .../runtime/kintsugi/src/weights/escrow.rs | 136 +- .../runtime/kintsugi/src/weights/farming.rs | 72 +- parachain/runtime/kintsugi/src/weights/fee.rs | 51 +- .../kintsugi/src/weights/frame_system.rs | 69 +- .../runtime/kintsugi/src/weights/issue.rs | 180 +- .../runtime/kintsugi/src/weights/loans.rs | 160 +- .../kintsugi/src/weights/nomination.rs | 117 +- .../runtime/kintsugi/src/weights/oracle.rs | 51 +- .../src/weights/orml_asset_registry.rs | 22 +- .../kintsugi/src/weights/orml_tokens.rs | 46 +- .../kintsugi/src/weights/orml_vesting.rs | 30 +- .../kintsugi/src/weights/pallet_collective.rs | 182 +- .../kintsugi/src/weights/pallet_identity.rs | 222 +- .../kintsugi/src/weights/pallet_membership.rs | 84 +- .../kintsugi/src/weights/pallet_multisig.rs | 90 +- .../kintsugi/src/weights/pallet_preimage.rs | 74 +- .../kintsugi/src/weights/pallet_proxy.rs | 136 +- .../kintsugi/src/weights/pallet_scheduler.rs | 84 +- .../kintsugi/src/weights/pallet_timestamp.rs | 22 +- .../kintsugi/src/weights/pallet_utility.rs | 38 +- .../kintsugi/src/weights/pallet_xcm.rs | 95 +- .../weights/pallet_xcm_benchmarks_fungible.rs | 54 +- .../weights/pallet_xcm_benchmarks_generic.rs | 146 +- .../runtime/kintsugi/src/weights/redeem.rs | 94 +- .../runtime/kintsugi/src/weights/replace.rs | 106 +- .../runtime/kintsugi/src/weights/security.rs | 26 +- .../runtime/kintsugi/src/weights/supply.rs | 18 +- .../runtime/kintsugi/src/weights/tx_pause.rs | 14 +- .../kintsugi/src/weights/vault_registry.rs | 92 +- parachain/runtime/kintsugi/src/xcm_config.rs | 10 +- parachain/runtime/runtime-tests/Cargo.toml | 126 +- parachain/runtime/runtime-tests/src/lib.rs | 1 - .../runtime-tests/src/parachain/contracts.rs | 23 +- .../relaychain/kusama_cross_chain_transfer.rs | 693 --- .../src/relaychain/kusama_test_net.rs | 242 -- .../runtime-tests/src/relaychain/mod.rs | 4 - .../polkadot_cross_chain_transfer.rs | 736 ---- .../src/relaychain/polkadot_test_net.rs | 245 -- parachain/runtime/runtime-tests/src/setup.rs | 35 +- parachain/src/chain_spec/interlay.rs | 23 +- parachain/src/chain_spec/kintsugi.rs | 23 +- parachain/src/chain_spec/testnet_kintsugi.rs | 1 + parachain/src/cli.rs | 6 +- parachain/src/command.rs | 67 +- parachain/src/eth.rs | 57 +- parachain/src/service.rs | 132 +- primitives/Cargo.toml | 5 +- primitives/src/lib.rs | 96 +- rpc/Cargo.toml | 3 +- rpc/src/eth.rs | 6 +- rust-toolchain.toml | 2 +- scripts/benchmark.sh | 6 +- 227 files changed, 7522 insertions(+), 8418 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/roadmap.md delete mode 100644 .github/workflows/benchmark.yml create mode 100644 crates/bitcoin/src/compat.rs delete mode 100644 parachain/runtime/runtime-tests/src/relaychain/kusama_cross_chain_transfer.rs delete mode 100644 parachain/runtime/runtime-tests/src/relaychain/kusama_test_net.rs delete mode 100644 parachain/runtime/runtime-tests/src/relaychain/mod.rs delete mode 100644 parachain/runtime/runtime-tests/src/relaychain/polkadot_cross_chain_transfer.rs delete mode 100644 parachain/runtime/runtime-tests/src/relaychain/polkadot_test_net.rs diff --git a/.github/ISSUE_TEMPLATE/roadmap.md b/.github/ISSUE_TEMPLATE/roadmap.md new file mode 100644 index 0000000000..b55df6d288 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/roadmap.md @@ -0,0 +1,49 @@ +--- +name: Roadmap +about: Add a new item to the roadmap +title: '' +labels: 'roadmap' +assignees: '' + +--- + +# Abstract + +[ADD HERE] + +A 2-3 sentence description of the proposal. + +# Motivation + +[ADD HERE] + +Provide a motivation for including this proposal. + +# Specification + +[ADD HERE] + +Provide a high-level, functional specification. The specification should be focussed on what the proposal is trying to achieve. + +## [OPTIONAL]Extensions + +[OPTIONAL][ADD HERE] + +### [OPTIONAL][TITLE] + +[OPTIONAL][ADD HERE] + +# Reference Implementation + +[OPTIONAL][ADD HERE] + +Provide a reference implementation, proof of concept, or basic pseudo-code for a better grounds to discuss the suggested implementation. The reference implementation focusses on the how. + +# Security Considerations + +[ADD HERE] + +Provide reasoning around security implications: + +- The proposal itself +- The propsals implications to the existing system diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml deleted file mode 100644 index eac8af5e78..0000000000 --- a/.github/workflows/benchmark.yml +++ /dev/null @@ -1,100 +0,0 @@ -# Original source: https://github.com/AcalaNetwork/Acala/blob/master/.github/workflows/benchmark.yml - -name: Benchmark -on: - issue_comment: - types: [created] -permissions: - pull-requests: write - contents: write -jobs: - benchmark: - name: Benchmark - if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/run_benchmarks') }} - runs-on: [self-hosted, linux] - steps: - - uses: actions/github-script@v6 - name: Get PR branch - id: issue - with: - script: | - const pr = context.payload.issue.number - const data = await github.rest.pulls.get({ - owner: context.repo.owner, - repo: context.repo.repo, - pull_number: pr - }) - return { - ref: data.data.head.ref, - sha: data.data.head.sha, - } - - uses: actions/checkout@v3 - with: - submodules: recursive - ref: ${{ fromJson(steps.issue.outputs.result).sha }} - - uses: actions/github-script@v6 - name: Prepare command - id: command - with: - result-encoding: string - script: | - const [, , cmd, ...args] = context.payload.comment.body.split(/\W+/) - const [runtime, pallet] = args - return `bash ./scripts/benchmark.sh -r ${runtime ?? "*"} -p ${pallet ?? "*"}` - - uses: actions/github-script@v6 - name: Post comment - id: comment - with: - script: | - const data = await github.rest.issues.createComment({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - body: ` - **Request**: \`${context.payload.comment.body}\` - **Command**: \`${{steps.command.outputs.result}}\` - - Running... - ` - }) - return data.data.id - - name: Set variables - run: | - echo "TOOLCHAIN=$(rustup show active-toolchain | cut -d " " -f1)" >> $GITHUB_ENV - - name: Install toolchain - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ env.TOOLCHAIN }} - components: rustfmt - target: wasm32-unknown-unknown - - name: Run benchmarks - run: ${{steps.command.outputs.result}} > ${{runner.temp}}/out.txt - - name: Commit new weights - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Automated weights - - - uses: actions/github-script@v6 - name: Update comment - with: - script: | - const fs = require('fs') - const id = `${{steps.comment.outputs.result}}` - const body = fs.readFileSync('${{runner.temp}}/out.txt').toString() - github.rest.issues.updateComment({ - comment_id: id, - owner: context.repo.owner, - repo: context.repo.repo, - body: ` - **Request**: \`${context.payload.comment.body}\` - **Command**: \`${{steps.command.outputs.result}}\` - -
- Results - - \`\`\` - ${body.trim()} - \`\`\` -
- ` - }) diff --git a/.github/workflows/cargo-test.yml b/.github/workflows/cargo-test.yml index 8dab6e6053..972aeeb096 100644 --- a/.github/workflows/cargo-test.yml +++ b/.github/workflows/cargo-test.yml @@ -12,6 +12,8 @@ jobs: steps: - uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.head.sha }} - run: git fetch --prune --unshallow - name: Install System Dependencies run: | @@ -47,7 +49,6 @@ jobs: ./target/release/interbtc-parachain benchmark pallet \ --pallet '*' \ --extrinsic '*' \ - --execution=wasm \ --wasm-execution=compiled \ --steps 2 --repeat 1 \ --template .deploy/runtime-weight-template.hbs \ @@ -55,7 +56,6 @@ jobs: ./target/release/interbtc-parachain benchmark pallet \ --pallet '*' \ --extrinsic '*' \ - --execution=wasm \ --wasm-execution=compiled \ --steps 2 --repeat 1 \ --template .deploy/runtime-weight-template.hbs \ diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index dd851ba8eb..4006d38552 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -18,13 +18,14 @@ jobs: - name: Build ${{ matrix.runtime }} runtime id: srtool_build - uses: chevdor/srtool-actions@v0.7.0 + uses: chevdor/srtool-actions@v0.8.0 with: image: docker.io/interlayhq/srtool tag: nightly-2022-12-15 package: ${{ matrix.runtime }}-runtime-parachain runtime_dir: ./parachain/runtime/${{ matrix.runtime }} chain: ${{ matrix.runtime }} + workdir: ${{ github.workspace }} - name: Store srtool digest to disk run: | echo '${{ steps.srtool_build.outputs.json }}' | jq > ${{ matrix.runtime }}_srtool_output.json diff --git a/.github/workflows/notify-breaking.yml b/.github/workflows/notify-breaking.yml index 5c124b7487..aedff146f4 100644 --- a/.github/workflows/notify-breaking.yml +++ b/.github/workflows/notify-breaking.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 @@ -23,8 +23,8 @@ jobs: fi - name: Send Discord Notification - uses: Ilshidur/action-discord@master - with: - args: "Breaking change detected in PR: ${{ github.event.pull_request.html_url }}" - webhook: ${{ secrets.DISCORD_RELEASE_WEBHOOK_URL }} + run: | + curl -X POST -H "Content-Type: application/json" \ + --data '{"content": "Breaking change detected in PR: ${{ github.event.pull_request.html_url }}"}' \ + "${{ secrets.DISCORD_RELEASE_WEBHOOK_URL }}" if: env.BREAKING_CHANGE_DETECTED == 'true' diff --git a/.github/workflows/projects.yml b/.github/workflows/projects.yml index 79ef63c9b4..af4deb91e2 100644 --- a/.github/workflows/projects.yml +++ b/.github/workflows/projects.yml @@ -14,3 +14,11 @@ jobs: with: project-url: https://github.com/orgs/interlay/projects/3 github-token: ${{ secrets.PROJECTS }} + label: roadmap + label-operator: NOT + - uses: actions/add-to-project@v0.5.0 + with: + project-url: https://github.com/orgs/interlay/projects/4 + github-token: ${{ secrets.PROJECTS }} + label: roadmap + label-operator: OR diff --git a/Cargo.lock b/Cargo.lock index 44f1949205..7fb70758e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,20 +14,20 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ - "gimli 0.26.2", + "gimli 0.27.3", ] [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "gimli 0.27.3", + "gimli 0.28.0", ] [[package]] @@ -172,18 +172,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -215,6 +206,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + [[package]] name = "annuity" version = "1.0.0" @@ -263,9 +260,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" @@ -287,9 +284,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -297,9 +294,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "approx" @@ -316,12 +313,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" -[[package]] -name = "array-bytes" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" - [[package]] name = "array-bytes" version = "6.1.0" @@ -359,7 +350,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.22", + "time 0.3.27", ] [[package]] @@ -375,7 +366,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.22", + "time 0.3.27", ] [[package]] @@ -413,12 +404,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "asn1_der" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247" - [[package]] name = "assert_matches" version = "1.5.0" @@ -427,9 +412,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -450,7 +435,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.20", + "rustix 0.37.23", "slab", "socket2 0.4.9", "waker-fn", @@ -458,9 +443,9 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -473,31 +458,31 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "asynchronous-codec" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06a0daa378f5fd10634e44b0a29b2a87b890657658e072a30d6f26e57ddee182" +checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568" dependencies = [ "bytes", "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", ] [[package]] @@ -555,16 +540,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ - "addr2line 0.19.0", + "addr2line 0.21.0", "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", - "object 0.30.4", + "miniz_oxide", + "object 0.32.0", "rustc-demangle", ] @@ -610,6 +595,12 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "bech32" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" + [[package]] name = "beef" version = "0.5.2" @@ -622,7 +613,7 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "hash-db 0.16.0", "log", @@ -639,22 +630,23 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.64.0" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", "lazycell", "peeking_take_while", + "prettyplease 0.2.12", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] @@ -672,11 +664,26 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[package]] +name = "bitcoin" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e99ff7289b20a7385f66a0feda78af2fc119d28fb56aea8886a9cd0a4abdd75" +dependencies = [ + "bech32", + "bitcoin-private", + "bitcoin_hashes 0.12.0", + "core2 0.3.3", + "hex_lit", + "secp256k1 0.27.0", +] + [[package]] name = "bitcoin" version = "1.2.0" dependencies = [ - "bitcoin_hashes", + "bitcoin 0.30.1", + "bitcoin_hashes 0.7.6", "frame-support", "hex", "impl-serde 0.3.2", @@ -690,18 +697,40 @@ dependencies = [ "spin 0.7.1", ] +[[package]] +name = "bitcoin-private" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57" + [[package]] name = "bitcoin_hashes" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b375d62f341cef9cd9e77793ec8f1db3fc9ce2e4d57e982c8fe697a2c16af3b6" +[[package]] +name = "bitcoin_hashes" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d7066118b13d4b20b23645932dfb3a81ce7e29f95726c2036fa33cd7b092501" +dependencies = [ + "bitcoin-private", + "core2 0.3.3", +] + [[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + [[package]] name = "bitvec" version = "1.0.1" @@ -731,7 +760,7 @@ checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" dependencies = [ "arrayref", "arrayvec 0.7.4", - "constant_time_eq", + "constant_time_eq 0.2.6", ] [[package]] @@ -742,20 +771,20 @@ checksum = "6637f448b9e61dfadbdcbae9a885fadee1f3eaffb1f8d3c1965d3ade8bdfd44f" dependencies = [ "arrayref", "arrayvec 0.7.4", - "constant_time_eq", + "constant_time_eq 0.2.6", ] [[package]] name = "blake3" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b71f35bd3fa1a4c86b85d32c8b9069ea7fe14f7a53cfabb65f62d4265b888" +checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" dependencies = [ "arrayref", "arrayvec 0.7.4", "cc", "cfg-if", - "constant_time_eq", + "constant_time_eq 0.3.0", "digest 0.10.7", ] @@ -843,9 +872,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", "serde", @@ -861,7 +890,7 @@ checksum = "bd769563b4ea2953e2825c9e6b7470a5f55f67e0be00030bf3e390a2a6071f64" name = "btc-relay" version = "1.2.0" dependencies = [ - "bitcoin", + "bitcoin 1.2.0", "frame-benchmarking", "frame-support", "frame-system", @@ -959,18 +988,18 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.4" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" dependencies = [ "serde", ] @@ -983,19 +1012,35 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.17", + "semver 1.0.18", "serde", "serde_json", "thiserror", ] +[[package]] +name = "casey" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614586263949597dcc18675da12ef9b429135e13628d92eb8b8c6fa50ca5656b" +dependencies = [ + "syn 1.0.109", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -1020,9 +1065,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.10.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", ] @@ -1079,15 +1124,42 @@ dependencies = [ "winapi", ] +[[package]] +name = "ciborium" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" + +[[package]] +name = "ciborium-ll" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +dependencies = [ + "ciborium-io", + "half", +] + [[package]] name = "cid" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2" +checksum = "b9b68e3193982cd54187d71afdb2a271ad4cf8af157858e9cb911b91321de143" dependencies = [ - "core2", + "core2 0.4.0", "multibase", - "multihash 0.16.3", + "multihash", "serde", "unsigned-varint", ] @@ -1142,9 +1214,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.9" +version = "4.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bba77a07e4489fb41bd90e8d4201c3eb246b3c2c9ea2ba0bddd6c1d1df87db7d" +checksum = "fb690e81c7840c0d7aade59f242ea3b41b9bc27bcd5997890e7702ae4b32e487" dependencies = [ "clap_builder", "clap_derive", @@ -1153,27 +1225,26 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.9" +version = "4.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9b4a88bb4bc35d3d6f65a21b0f0bafe9c894fa00978de242c555ec28bea1c0" +checksum = "5ed2e96bc16d8d740f6f48d663eddf4b8a0983e79210fd55479b7bcd0a69860e" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "4.3.2" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -1208,7 +1279,7 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1267,15 +1338,21 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "comfy-table" -version = "6.2.0" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba" +checksum = "9ab77dbd8adecaf3f0db40581631b995f312a8a5ae3aa9993188bb8f23d83a5b" dependencies = [ "strum", "strum_macros", "unicode-width", ] +[[package]] +name = "common-path" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101" + [[package]] name = "concurrent-queue" version = "2.2.0" @@ -1300,9 +1377,31 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.2" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" + +[[package]] +name = "const-random" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" +checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +dependencies = [ + "getrandom 0.2.10", + "once_cell", + "proc-macro-hack", + "tiny-keccak", +] [[package]] name = "constant_time_eq" @@ -1310,6 +1409,12 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + [[package]] name = "convert_case" version = "0.4.0" @@ -1332,6 +1437,15 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +[[package]] +name = "core2" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239fa3ae9b63c2dc74bd3fa852d4792b8b305ae64eeede946265b6af62f1fff3" +dependencies = [ + "memchr", +] + [[package]] name = "core2" version = "0.4.0" @@ -1362,37 +1476,36 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] [[package]] name = "cranelift-bforest" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc42ba2e232e5b20ff7dc299a812d53337dadce9a7e39a238e6a5cb82d2e57b" +checksum = "1277fbfa94bc82c8ec4af2ded3e639d49ca5f7f3c7eeab2c66accd135ece4e70" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "253531aca9b6f56103c9420369db3263e784df39aa1c90685a1f69cfbba0623e" +checksum = "c6e8c31ad3b2270e9aeec38723888fe1b0ace3bea2b06b3f749ccf46661d3220" dependencies = [ - "arrayvec 0.7.4", "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", "cranelift-isle", - "gimli 0.26.2", - "hashbrown 0.12.3", + "gimli 0.27.3", + "hashbrown 0.13.2", "log", "regalloc2", "smallvec", @@ -1401,33 +1514,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f2154365e2bff1b1b8537a7181591fdff50d8e27fa6e40d5c69c3bad0ca7c8" +checksum = "c8ac5ac30d62b2d66f12651f6b606dbdfd9c2cfd0908de6b387560a277c5c9da" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687e14e3f5775248930e0d5a84195abef8b829958e9794bf8d525104993612b4" +checksum = "dd82b8b376247834b59ed9bdc0ddeb50f517452827d4a11bccf5937b213748b8" [[package]] name = "cranelift-entity" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f42ea692c7b450ad18b8c9889661505d51c09ec4380cf1c2d278dbb2da22cae1" +checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8483c2db6f45fe9ace984e5adc5d058102227e4c62e5aa2054e16b0275fd3a6e" +checksum = "64a25d9d0a0ae3079c463c34115ec59507b4707175454f0eee0891e83e30e82d" dependencies = [ "cranelift-codegen", "log", @@ -1437,15 +1550,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9793158837678902446c411741d87b43f57dadfb944f2440db4287cda8cbd59" +checksum = "80de6a7d0486e4acbd5f9f87ec49912bf4c8fb6aea00087b989685460d4469ba" [[package]] name = "cranelift-native" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72668c7755f2b880665cb422c8ad2d56db58a88b9bebfef0b73edc2277c13c49" +checksum = "bb6b03e0e03801c4b3fd8ce0758a94750c07a44e7944cc0ffbf0d3f2e7c79b00" dependencies = [ "cranelift-codegen", "libc", @@ -1454,9 +1567,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.93.2" +version = "0.95.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3852ce4b088b44ac4e29459573943009a70d1b192c8d77ef949b4e814f656fc1" +checksum = "ff3220489a3d928ad91e59dd7aeaa8b3de18afb554a6211213673a71c90737ac" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1492,6 +1605,44 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "futures", + "is-terminal", + "itertools", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "tokio", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools", +] + [[package]] name = "crossbeam-channel" version = "0.5.8" @@ -1637,12 +1788,13 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "clap", "parity-scale-codec", "sc-chain-spec", "sc-cli", + "sc-client-api", "sc-service", "sp-core", "sp-runtime", @@ -1652,7 +1804,7 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -1675,16 +1827,26 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", + "cumulus-client-collator", "cumulus-client-consensus-common", + "cumulus-client-consensus-proposer", + "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-interface", "futures", + "lru 0.10.1", "parity-scale-codec", + "polkadot-node-primitives", + "polkadot-overseer", + "polkadot-primitives", "sc-client-api", "sc-consensus", "sc-consensus-aura", + "sc-consensus-babe", "sc-consensus-slots", "sc-telemetry", "sp-api", @@ -1697,6 +1859,8 @@ dependencies = [ "sp-inherents", "sp-keystore", "sp-runtime", + "sp-state-machine", + "sp-timestamp", "substrate-prometheus-endpoint", "tracing", ] @@ -1704,7 +1868,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", "cumulus-client-pov-recovery", @@ -1717,18 +1881,38 @@ dependencies = [ "polkadot-primitives", "sc-client-api", "sc-consensus", + "sc-consensus-babe", "schnellru", "sp-blockchain", "sp-consensus", + "sp-consensus-slots", + "sp-core", "sp-runtime", + "sp-timestamp", "sp-trie", + "substrate-prometheus-endpoint", "tracing", ] +[[package]] +name = "cumulus-client-consensus-proposer" +version = "0.1.0" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +dependencies = [ + "anyhow", + "async-trait", + "cumulus-primitives-parachain-inherent", + "sp-consensus", + "sp-inherents", + "sp-runtime", + "sp-state-machine", + "thiserror", +] + [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -1751,7 +1935,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -1774,7 +1958,7 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1798,7 +1982,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -1833,7 +2017,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "frame-support", "frame-system", @@ -1849,7 +2033,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1866,7 +2050,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", @@ -1895,18 +2079,18 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1922,7 +2106,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-primitives-core", "frame-benchmarking", @@ -1940,10 +2124,24 @@ dependencies = [ "xcm-executor", ] +[[package]] +name = "cumulus-primitives-aura" +version = "0.1.0" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +dependencies = [ + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-primitives", + "sp-api", + "sp-consensus-aura", + "sp-runtime", + "sp-std", +] + [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", @@ -1960,7 +2158,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1983,7 +2181,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-primitives-core", "futures", @@ -1996,7 +2194,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2014,7 +2212,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2022,7 +2220,6 @@ dependencies = [ "futures", "futures-timer", "polkadot-cli", - "polkadot-client", "polkadot-service", "sc-cli", "sc-client-api", @@ -2039,7 +2236,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2057,9 +2254,9 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-minimal-node" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", @@ -2095,7 +2292,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-rpc-interface" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2125,7 +2322,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -2136,42 +2333,155 @@ dependencies = [ ] [[package]] -name = "currency" -version = "1.2.0" +name = "cumulus-test-relay-validation-worker-provider" +version = "0.1.0" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +dependencies = [ + "polkadot-node-core-pvf", + "toml 0.7.6", +] + +[[package]] +name = "cumulus-test-runtime" +version = "0.1.0" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ + "cumulus-pallet-parachain-system", + "cumulus-primitives-core", + "cumulus-primitives-timestamp", + "frame-executive", "frame-support", "frame-system", - "interbtc-primitives", - "mocktopus", - "orml-tokens", - "orml-traits", + "frame-system-rpc-runtime-api", + "pallet-balances", + "pallet-glutton", + "pallet-sudo", + "pallet-timestamp", "pallet-transaction-payment", "parity-scale-codec", "scale-info", - "serde", - "sp-arithmetic", + "sp-api", + "sp-block-builder", "sp-core", + "sp-inherents", "sp-io", + "sp-offchain", "sp-runtime", + "sp-session", "sp-std", - "traits", + "sp-transaction-pool", + "sp-version", + "substrate-wasm-builder", ] [[package]] -name = "curve25519-dalek" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216" +name = "cumulus-test-service" +version = "0.1.0" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ - "byteorder", - "digest 0.8.1", - "rand_core 0.5.1", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek" + "async-trait", + "clap", + "criterion", + "cumulus-client-cli", + "cumulus-client-consensus-common", + "cumulus-client-consensus-relay-chain", + "cumulus-client-pov-recovery", + "cumulus-client-service", + "cumulus-pallet-parachain-system", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-inprocess-interface", + "cumulus-relay-chain-interface", + "cumulus-relay-chain-minimal-node", + "cumulus-test-relay-sproof-builder", + "cumulus-test-relay-validation-worker-provider", + "cumulus-test-runtime", + "frame-system", + "frame-system-rpc-runtime-api", + "jsonrpsee", + "pallet-timestamp", + "pallet-transaction-payment", + "parachains-common", + "parity-scale-codec", + "polkadot-cli", + "polkadot-node-subsystem", + "polkadot-overseer", + "polkadot-primitives", + "polkadot-service", + "polkadot-test-service", + "rand 0.8.5", + "sc-basic-authorship", + "sc-block-builder", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sc-executor", + "sc-executor-common", + "sc-executor-wasmtime", + "sc-network", + "sc-service", + "sc-telemetry", + "sc-tracing", + "sc-transaction-pool", + "sc-transaction-pool-api", + "serde", + "sp-api", + "sp-arithmetic", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-io", + "sp-keyring", + "sp-runtime", + "sp-state-machine", + "sp-timestamp", + "sp-tracing", + "sp-trie", + "substrate-test-client", + "tempfile", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "currency" +version = "1.2.0" +dependencies = [ + "frame-support", + "frame-system", + "interbtc-primitives", + "mocktopus", + "orml-tokens", + "orml-traits", + "pallet-transaction-payment", + "parity-scale-codec", + "scale-info", + "serde", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "traits", +] + +[[package]] +name = "curve25519-dalek" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216" +dependencies = [ + "byteorder", + "digest 0.8.1", + "rand_core 0.5.1", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek" version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" @@ -2185,23 +2495,37 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-rc.1" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d4ba9852b42210c7538b75484f9daa0655e9a3ac04f693747bb0f02cf3cfe16" +checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2" dependencies = [ "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", "fiat-crypto", - "packed_simd_2", - "platforms 3.0.2", + "platforms", + "rustc_version", "subtle", "zeroize", ] +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + [[package]] name = "cxx" -version = "1.0.97" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88abab2f5abbe4c56e8f1fb431b784d710b709888f35755a160e62e33fe38e8" +checksum = "28403c86fc49e3401fdf45499ba37fad6493d9329449d6449d7f0e10f4654d28" dependencies = [ "cc", "cxxbridge-flags", @@ -2211,9 +2535,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.97" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0c11acd0e63bae27dcd2afced407063312771212b7a823b4fd72d633be30fb" +checksum = "78da94fef01786dc3e0c76eafcd187abcaa9972c78e05ff4041e24fdf059c285" dependencies = [ "cc", "codespan-reporting", @@ -2221,24 +2545,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "cxxbridge-flags" -version = "1.0.97" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3816ed957c008ccd4728485511e3d9aaf7db419aa321e3d2c5a2f3411e36c8" +checksum = "e2a6f5e1dfb4b34292ad4ea1facbfdaa1824705b231610087b00b17008641809" [[package]] name = "cxxbridge-macro" -version = "1.0.97" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26acccf6f445af85ea056362561a24ef56cdc15fcc685f03aec50b9c702cb6d" +checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -2337,9 +2661,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56acb310e15652100da43d130af8d97b509e95af61aab1c5a7939ef24337ee17" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", "zeroize", @@ -2373,6 +2697,12 @@ dependencies = [ "rusticata-macros", ] +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" + [[package]] name = "derivative" version = "2.2.0" @@ -2646,7 +2976,33 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", +] + +[[package]] +name = "docify" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1b04e6ef3d21119d3eb7b032bca17f99fe041e9c072f30f32cc0e1a2b1f3c4" +dependencies = [ + "docify_macros", +] + +[[package]] +name = "docify_macros" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b5610df7f2acf89a1bb5d1a66ae56b1c7fcdcfe3948856fb3ace3f644d70eb7" +dependencies = [ + "common-path", + "derive-syn-parse", + "lazy_static", + "proc-macro2", + "quote", + "regex", + "syn 2.0.29", + "termcolor", + "walkdir", ] [[package]] @@ -2669,9 +3025,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65d09067bfacaa79114679b279d7f5885b53295b1e2cfb4e79c8e4bd3d633169" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" [[package]] name = "dyn-clonable" @@ -2696,9 +3052,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" +checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" [[package]] name = "ecdsa" @@ -2714,11 +3070,11 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.16.7" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ - "der 0.7.6", + "der 0.7.8", "digest 0.10.7", "elliptic-curve 0.13.5", "rfc6979 0.4.0", @@ -2735,6 +3091,16 @@ dependencies = [ "signature 1.6.4", ] +[[package]] +name = "ed25519" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" +dependencies = [ + "pkcs8 0.10.2", + "signature 2.1.0", +] + [[package]] name = "ed25519-dalek" version = "1.0.1" @@ -2742,13 +3108,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ "curve25519-dalek 3.2.0", - "ed25519", - "rand 0.7.3", - "serde", + "ed25519 1.5.3", "sha2 0.9.9", "zeroize", ] +[[package]] +name = "ed25519-dalek" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +dependencies = [ + "curve25519-dalek 4.0.0", + "ed25519 2.2.2", + "rand_core 0.6.4", + "serde", + "sha2 0.10.7", + "zeroize", +] + [[package]] name = "ed25519-zebra" version = "3.1.0" @@ -2765,9 +3143,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" dependencies = [ "serde", ] @@ -2808,7 +3186,7 @@ dependencies = [ "group 0.13.0", "pkcs8 0.10.2", "rand_core 0.6.4", - "sec1 0.7.2", + "sec1 0.7.3", "subtle", "zeroize", ] @@ -2848,18 +3226,18 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "enumn" -version = "0.1.8" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48016319042fb7c87b78d2993084a831793a897a5cd1a2a67cab9d1eeb4b7d76" +checksum = "b893c4eb2dc092c811165f84dc7447fae16fb66521717968c34c509b39b1a5c5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -2896,15 +3274,15 @@ checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -3107,19 +3485,6 @@ dependencies = [ "quote", ] -[[package]] -name = "expander" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f360349150728553f92e4c997a16af8915f418d3a0f21b440d34c5632f16ed84" -dependencies = [ - "blake2", - "fs-err", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "expander" version = "2.0.0" @@ -3130,7 +3495,7 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -3178,6 +3543,12 @@ dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + [[package]] name = "fatality" version = "0.0.6" @@ -3206,7 +3577,7 @@ dependencies = [ [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "async-trait", "fp-consensus", @@ -3222,7 +3593,7 @@ dependencies = [ [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "async-trait", "ethereum", @@ -3242,7 +3613,7 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-core", - "sp-database 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42)", + "sp-database", "sp-runtime", "sp-storage", "sqlx", @@ -3252,7 +3623,7 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "fc-db", "fc-storage", @@ -3275,7 +3646,7 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "ethereum", "ethereum-types", @@ -3293,7 +3664,6 @@ dependencies = [ "jsonrpsee", "libsecp256k1 0.7.1", "log", - "lru 0.8.1", "pallet-evm", "parity-scale-codec", "prometheus", @@ -3308,6 +3678,7 @@ dependencies = [ "sc-transaction-pool", "sc-transaction-pool-api", "sc-utils", + "schnellru", "serde", "sp-api", "sp-block-builder", @@ -3325,7 +3696,7 @@ dependencies = [ [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "ethereum", "ethereum-types", @@ -3338,7 +3709,7 @@ dependencies = [ [[package]] name = "fc-storage" version = "1.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "ethereum", "ethereum-types", @@ -3428,13 +3799,13 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] @@ -3484,13 +3855,13 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "libz-sys", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -3538,7 +3909,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", ] @@ -3555,7 +3926,7 @@ dependencies = [ [[package]] name = "fp-account" version = "1.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "hex", "impl-serde 0.4.0", @@ -3574,7 +3945,7 @@ dependencies = [ [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "ethereum", "parity-scale-codec", @@ -3586,7 +3957,7 @@ dependencies = [ [[package]] name = "fp-ethereum" version = "1.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "ethereum", "ethereum-types", @@ -3600,7 +3971,7 @@ dependencies = [ [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "evm", "frame-support", @@ -3615,7 +3986,7 @@ dependencies = [ [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "ethereum", "ethereum-types", @@ -3632,7 +4003,7 @@ dependencies = [ [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "frame-support", "parity-scale-codec", @@ -3644,7 +4015,7 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "parity-scale-codec", "serde", @@ -3659,7 +4030,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-support-procedural", @@ -3684,10 +4055,10 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "Inflector", - "array-bytes 4.2.0", + "array-bytes", "chrono", "clap", "comfy-table", @@ -3715,15 +4086,16 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-core", - "sp-database 4.0.0-dev (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42)", + "sp-database", "sp-externalities", "sp-inherents", + "sp-io", "sp-keystore", "sp-runtime", "sp-state-machine", - "sp-std", "sp-storage", "sp-trie", + "sp-wasm-interface", "thiserror", "thousands", ] @@ -3731,18 +4103,18 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -3759,7 +4131,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -3775,9 +4147,9 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "15.1.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c" +checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692" dependencies = [ "cfg-if", "parity-scale-codec", @@ -3788,7 +4160,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-recursion", "futures", @@ -3803,21 +4175,22 @@ dependencies = [ "spinners", "substrate-rpc-client", "tokio", + "tokio-retry", ] [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "environmental", "frame-metadata", "frame-support-procedural", "impl-trait-for-tuples", "k256", "log", - "once_cell", + "macro_magic", "parity-scale-codec", "paste", "scale-info", @@ -3827,6 +4200,7 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-core-hashing-proc-macro", + "sp-debug-derive", "sp-inherents", "sp-io", "sp-runtime", @@ -3841,46 +4215,49 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "Inflector", "cfg-expr", "derive-syn-parse", + "expander 2.0.0", "frame-support-procedural-tools", "itertools", + "macro_magic", "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ + "cfg-if", "frame-support", "log", "parity-scale-codec", @@ -3897,7 +4274,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -3912,7 +4289,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "sp-api", @@ -3921,7 +4298,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "parity-scale-codec", @@ -3948,11 +4325,11 @@ dependencies = [ [[package]] name = "fs4" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7672706608ecb74ab2e055c68327ffc25ae4cac1e12349204fd5fb0f3487cce2" +checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" dependencies = [ - "rustix 0.37.20", + "rustix 0.38.8", "windows-sys 0.48.0", ] @@ -4034,12 +4411,12 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", "parking", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "waker-fn", ] @@ -4051,7 +4428,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -4096,7 +4473,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "pin-utils", "slab", ] @@ -4184,9 +4561,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" dependencies = [ "fallible-iterator", "indexmap 1.9.3", @@ -4195,9 +4572,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glob" @@ -4207,11 +4584,11 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", "bstr", "fnv", "log", @@ -4242,9 +4619,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -4259,6 +4636,12 @@ dependencies = [ "tracing", ] +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + [[package]] name = "handlebars" version = "4.3.7" @@ -4351,18 +4734,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -4401,6 +4775,12 @@ dependencies = [ "proc-macro-hack", ] +[[package]] +name = "hex_lit" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd" + [[package]] name = "hkdf" version = "0.12.3" @@ -4480,14 +4860,14 @@ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", ] [[package]] name = "http-range-header" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" [[package]] name = "httparse" @@ -4497,9 +4877,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -4523,7 +4903,7 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "socket2 0.4.9", "tokio", "tower-service", @@ -4533,18 +4913,19 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", "http", "hyper", "log", - "rustls 0.20.8", + "rustls 0.21.6", "rustls-native-certs", "tokio", "tokio-rustls", - "webpki-roots", + "webpki-roots 0.23.1", ] [[package]] @@ -4702,9 +5083,9 @@ checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" [[package]] name = "indicatif" -version = "0.17.5" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" +checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" dependencies = [ "console", "instant", @@ -4751,7 +5132,7 @@ name = "interbtc-parachain" version = "1.2.0" dependencies = [ "async-trait", - "bitcoin", + "bitcoin 1.2.0", "btc-relay-rpc-runtime-api", "clap", "cumulus-client-cli", @@ -4818,11 +5199,13 @@ dependencies = [ "sc-executor", "sc-network", "sc-network-sync", + "sc-offchain", "sc-rpc", "sc-service", "sc-telemetry", "sc-tracing", "sc-transaction-pool", + "sc-transaction-pool-api", "serde", "serde_json", "sp-api", @@ -4852,7 +5235,7 @@ dependencies = [ name = "interbtc-primitives" version = "1.2.0" dependencies = [ - "bitcoin", + "bitcoin 1.2.0", "bstringify", "parity-scale-codec", "primitive-types", @@ -4930,7 +5313,7 @@ name = "interlay-runtime-parachain" version = "1.2.0" dependencies = [ "annuity", - "bitcoin", + "bitcoin 1.2.0", "btc-relay", "btc-relay-rpc-runtime-api", "clients-info", @@ -5046,13 +5429,19 @@ dependencies = [ "xcm-executor", ] +[[package]] +name = "intx" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f38a50a899dc47a6d0ed5508e7f601a2e34c3a85303514b5d137f3c10a0c75" + [[package]] name = "io-lifetimes" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.2", "libc", "windows-sys 0.48.0", ] @@ -5083,13 +5472,12 @@ checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix 0.37.20", + "hermit-abi 0.3.2", + "rustix 0.38.8", "windows-sys 0.48.0", ] @@ -5097,7 +5485,7 @@ dependencies = [ name = "issue" version = "1.2.0" dependencies = [ - "bitcoin", + "bitcoin 1.2.0", "btc-relay", "currency", "fee", @@ -5160,9 +5548,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" @@ -5184,9 +5572,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" +checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", @@ -5199,9 +5587,9 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" +checksum = "c8b3815d9f5d5de348e5f162b316dc9cdf4548305ebb15b4eb9328e66cf27d7a" dependencies = [ "futures-util", "http", @@ -5215,14 +5603,14 @@ dependencies = [ "tokio-rustls", "tokio-util", "tracing", - "webpki-roots", + "webpki-roots 0.25.2", ] [[package]] name = "jsonrpsee-core" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" +checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803" dependencies = [ "anyhow", "arrayvec 0.7.4", @@ -5248,9 +5636,9 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc345b0a43c6bc49b947ebeb936e886a419ee3d894421790c969cc56040542ad" +checksum = "7e5f9fabdd5d79344728521bb65e3106b49ec405a78b66fbff073b72b389fa43" dependencies = [ "async-trait", "hyper", @@ -5267,9 +5655,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa6da1e4199c10d7b1d0a6e5e8bd8e55f351163b6f4b3cbb044672a69bd4c1c" +checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a" dependencies = [ "heck", "proc-macro-crate", @@ -5280,9 +5668,9 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb69dad85df79527c019659a992498d03f8495390496da2f07e6c24c2b356fc" +checksum = "cf4d945a6008c9b03db3354fb3c83ee02d2faa9f2e755ec1dfb69c3551b8f4ba" dependencies = [ "futures-channel", "futures-util", @@ -5302,9 +5690,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c" +checksum = "245ba8e5aa633dd1c1e4fae72bce06e71f42d34c14a2767c6b4d173b57bee5e5" dependencies = [ "anyhow", "beef", @@ -5316,9 +5704,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b83daeecfc6517cfe210df24e570fb06213533dfb990318fae781f4c7119dd9" +checksum = "4e1b3975ed5d73f456478681a417128597acd6a2487855fdb7b4a3d4d195bf5e" dependencies = [ "http", "jsonrpsee-client-transport", @@ -5333,7 +5721,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" dependencies = [ "cfg-if", - "ecdsa 0.16.7", + "ecdsa 0.16.8", "elliptic-curve 0.13.5", "once_cell", "sha2 0.10.7", @@ -5353,7 +5741,7 @@ name = "kintsugi-runtime-parachain" version = "1.2.0" dependencies = [ "annuity", - "bitcoin", + "bitcoin 1.2.0", "btc-relay", "btc-relay-rpc-runtime-api", "clients-info", @@ -5474,8 +5862,8 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "frame-benchmarking", @@ -5508,6 +5896,7 @@ dependencies = [ "pallet-im-online", "pallet-indices", "pallet-membership", + "pallet-message-queue", "pallet-multisig", "pallet-nis", "pallet-nomination-pools", @@ -5526,6 +5915,7 @@ dependencies = [ "pallet-society", "pallet-staking", "pallet-staking-runtime-api", + "pallet-state-trie-migration", "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", @@ -5572,8 +5962,8 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "frame-support", "polkadot-primitives", @@ -5605,9 +5995,9 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe7a749456510c45f795e8b04a6a3e0976d0139213ecbf465843830ad55e2217" +checksum = "b644c70b92285f66bfc2032922a79000ea30af7bc2ab31902992a5dcb9b434f6" dependencies = [ "kvdb", "num_cpus", @@ -5617,6 +6007,17 @@ dependencies = [ "smallvec", ] +[[package]] +name = "landlock" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520baa32708c4e957d2fc3a186bc5bd8d26637c33137f399ddfc202adb240068" +dependencies = [ + "enumflags2", + "libc", + "thiserror", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -5645,12 +6046,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "libm" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" - [[package]] name = "libm" version = "0.2.7" @@ -5659,22 +6054,24 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libp2p" -version = "0.50.1" +version = "0.51.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7b0104790be871edcf97db9bd2356604984e623a08d825c3f27852290266b8" +checksum = "f210d259724eae82005b5c48078619b7745edb7b76de370b03f8ba59ea103097" dependencies = [ "bytes", "futures", "futures-timer", "getrandom 0.2.10", "instant", - "libp2p-core 0.38.0", + "libp2p-allow-block-list", + "libp2p-connection-limits", + "libp2p-core", "libp2p-dns", "libp2p-identify", + "libp2p-identity", "libp2p-kad", "libp2p-mdns", "libp2p-metrics", - "libp2p-mplex", "libp2p-noise", "libp2p-ping", "libp2p-quic", @@ -5685,44 +6082,32 @@ dependencies = [ "libp2p-webrtc", "libp2p-websocket", "libp2p-yamux", - "multiaddr 0.16.0", - "parking_lot 0.12.1", + "multiaddr", "pin-project", - "smallvec", ] [[package]] -name = "libp2p-core" -version = "0.38.0" +name = "libp2p-allow-block-list" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a8fcd392ff67af6cc3f03b1426c41f7f26b6b9aff2dc632c1c56dd649e571f" +checksum = "510daa05efbc25184458db837f6f9a5143888f1caa742426d92e1833ddd38a50" dependencies = [ - "asn1_der", - "bs58", - "ed25519-dalek", - "either", - "fnv", - "futures", - "futures-timer", - "instant", - "log", - "multiaddr 0.16.0", - "multihash 0.16.3", - "multistream-select", - "once_cell", - "parking_lot 0.12.1", - "pin-project", - "prost", - "prost-build", - "rand 0.8.5", - "rw-stream-sink", - "sec1 0.3.0", - "sha2 0.10.7", - "smallvec", - "thiserror", - "unsigned-varint", + "libp2p-core", + "libp2p-identity", + "libp2p-swarm", + "void", +] + +[[package]] +name = "libp2p-connection-limits" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4caa33f1d26ed664c4fe2cca81a08c8e07d4c1c04f2f4ac7655c2dd85467fda0" +dependencies = [ + "libp2p-core", + "libp2p-identity", + "libp2p-swarm", "void", - "zeroize", ] [[package]] @@ -5738,8 +6123,8 @@ dependencies = [ "instant", "libp2p-identity", "log", - "multiaddr 0.17.1", - "multihash 0.17.0", + "multiaddr", + "multihash", "multistream-select", "once_cell", "parking_lot 0.12.1", @@ -5755,12 +6140,12 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e42a271c1b49f789b92f7fc87749fa79ce5c7bdc88cbdfacb818a4bca47fec5" +checksum = "146ff7034daae62077c415c2376b8057368042df6ab95f5432ad5e88568b1554" dependencies = [ "futures", - "libp2p-core 0.38.0", + "libp2p-core", "log", "parking_lot 0.12.1", "smallvec", @@ -5769,20 +6154,21 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.41.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c052d0026f4817b44869bfb6810f4e1112f43aec8553f2cb38881c524b563abf" +checksum = "5455f472243e63b9c497ff320ded0314254a9eb751799a39c283c6f20b793f3c" dependencies = [ "asynchronous-codec", + "either", "futures", "futures-timer", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "libp2p-swarm", "log", - "lru 0.8.1", - "prost", - "prost-build", - "prost-codec", + "lru 0.10.1", + "quick-protobuf", + "quick-protobuf-codec", "smallvec", "thiserror", "void", @@ -5790,15 +6176,15 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2d584751cecb2aabaa56106be6be91338a60a0f4e420cf2af639204f596fc1" +checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ "bs58", - "ed25519-dalek", + "ed25519-dalek 2.0.0", "log", - "multiaddr 0.17.1", - "multihash 0.17.0", + "multiaddr", + "multihash", "quick-protobuf", "rand 0.8.5", "sha2 0.10.7", @@ -5808,9 +6194,9 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.42.1" +version = "0.43.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2766dcd2be8c87d5e1f35487deb22d765f49c6ae1251b3633efe3b25698bd3d2" +checksum = "39d5ef876a2b2323d63c258e63c2f8e36f205fe5a11f0b3095d59635650790ff" dependencies = [ "arrayvec 0.7.4", "asynchronous-codec", @@ -5820,11 +6206,11 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "libp2p-swarm", "log", - "prost", - "prost-build", + "quick-protobuf", "rand 0.8.5", "sha2 0.10.7", "smallvec", @@ -5836,14 +6222,15 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.42.0" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f378264aade9872d6ccd315c0accc18be3a35d15fc1b9c36e5b6f983b62b5b" +checksum = "19983e1f949f979a928f2c603de1cf180cc0dc23e4ac93a62651ccb18341460b" dependencies = [ "data-encoding", "futures", "if-watch", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "libp2p-swarm", "log", "rand 0.8.5", @@ -5856,11 +6243,11 @@ dependencies = [ [[package]] name = "libp2p-metrics" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad8a64f29da86005c86a4d2728b8a0719e9b192f4092b609fd8790acb9dec55" +checksum = "a42ec91e227d7d0dafa4ce88b333cdf5f277253873ab087555c92798db2ddd46" dependencies = [ - "libp2p-core 0.38.0", + "libp2p-core", "libp2p-identify", "libp2p-kad", "libp2p-ping", @@ -5868,38 +6255,20 @@ dependencies = [ "prometheus-client", ] -[[package]] -name = "libp2p-mplex" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03805b44107aa013e7cbbfa5627b31c36cbedfdfb00603c0311998882bc4bace" -dependencies = [ - "asynchronous-codec", - "bytes", - "futures", - "libp2p-core 0.38.0", - "log", - "nohash-hasher", - "parking_lot 0.12.1", - "rand 0.8.5", - "smallvec", - "unsigned-varint", -] - [[package]] name = "libp2p-noise" -version = "0.41.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a978cb57efe82e892ec6f348a536bfbd9fee677adbe5689d7a93ad3a9bffbf2e" +checksum = "9c3673da89d29936bc6435bafc638e2f184180d554ce844db65915113f86ec5e" dependencies = [ "bytes", "curve25519-dalek 3.2.0", "futures", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "log", "once_cell", - "prost", - "prost-build", + "quick-protobuf", "rand 0.8.5", "sha2 0.10.7", "snow", @@ -5911,14 +6280,15 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "929fcace45a112536e22b3dcfd4db538723ef9c3cb79f672b98be2cc8e25f37f" +checksum = "3e57759c19c28a73ef1eb3585ca410cefb72c1a709fcf6de1612a378e4219202" dependencies = [ + "either", "futures", "futures-timer", "instant", - "libp2p-core 0.38.0", + "libp2p-core", "libp2p-swarm", "log", "rand 0.8.5", @@ -5927,15 +6297,16 @@ dependencies = [ [[package]] name = "libp2p-quic" -version = "0.7.0-alpha" +version = "0.7.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e7c867e95c8130667b24409d236d37598270e6da69b3baf54213ba31ffca59" +checksum = "c6b26abd81cd2398382a1edfe739b539775be8a90fa6914f39b2ab49571ec735" dependencies = [ "bytes", "futures", "futures-timer", "if-watch", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "libp2p-tls", "log", "parking_lot 0.12.1", @@ -5948,49 +6319,46 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3236168796727bfcf4927f766393415361e2c644b08bedb6a6b13d957c9a4884" +checksum = "7ffdb374267d42dc5ed5bc53f6e601d4a64ac5964779c6e40bb9e4f14c1e30d5" dependencies = [ "async-trait", - "bytes", "futures", "instant", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "libp2p-swarm", - "log", "rand 0.8.5", "smallvec", - "unsigned-varint", ] [[package]] name = "libp2p-swarm" -version = "0.41.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a35472fe3276b3855c00f1c032ea8413615e030256429ad5349cdf67c6e1a0" +checksum = "903b3d592d7694e56204d211f29d31bc004be99386644ba8731fc3e3ef27b296" dependencies = [ "either", "fnv", "futures", "futures-timer", "instant", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "libp2p-swarm-derive", "log", - "pin-project", "rand 0.8.5", "smallvec", - "thiserror", "tokio", "void", ] [[package]] name = "libp2p-swarm-derive" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400" +checksum = "0fba456131824ab6acd4c7bf61e9c0f0a3014b5fc9868ccb8e10d344594cdc4f" dependencies = [ "heck", "quote", @@ -5999,15 +6367,15 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b257baf6df8f2df39678b86c578961d48cc8b68642a12f0f763f56c8e5858d" +checksum = "33d33698596d7722d85d3ab0c86c2c322254fce1241e91208e3679b4eb3026cf" dependencies = [ "futures", "futures-timer", "if-watch", "libc", - "libp2p-core 0.38.0", + "libp2p-core", "log", "socket2 0.4.9", "tokio", @@ -6021,7 +6389,7 @@ checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781" dependencies = [ "futures", "futures-rustls", - "libp2p-core 0.39.2", + "libp2p-core", "libp2p-identity", "rcgen 0.10.0", "ring", @@ -6034,13 +6402,13 @@ dependencies = [ [[package]] name = "libp2p-wasm-ext" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb1a35299860e0d4b3c02a3e74e3b293ad35ae0cee8a056363b0c862d082069" +checksum = "77dff9d32353a5887adb86c8afc1de1a94d9e8c3bc6df8b2201d7cdf5c848f43" dependencies = [ "futures", "js-sys", - "libp2p-core 0.38.0", + "libp2p-core", "parity-send-wrapper", "wasm-bindgen", "wasm-bindgen-futures", @@ -6048,9 +6416,9 @@ dependencies = [ [[package]] name = "libp2p-webrtc" -version = "0.4.0-alpha" +version = "0.4.0-alpha.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb6cd86dd68cba72308ea05de1cebf3ba0ae6e187c40548167955d4e3970f6a" +checksum = "dba48592edbc2f60b4bc7c10d65445b0c3964c07df26fdf493b6880d33be36f8" dependencies = [ "async-trait", "asynchronous-codec", @@ -6059,13 +6427,13 @@ dependencies = [ "futures-timer", "hex", "if-watch", - "libp2p-core 0.38.0", + "libp2p-core", + "libp2p-identity", "libp2p-noise", "log", - "multihash 0.16.3", - "prost", - "prost-build", - "prost-codec", + "multihash", + "quick-protobuf", + "quick-protobuf-codec", "rand 0.8.5", "rcgen 0.9.3", "serde", @@ -6079,42 +6447,41 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.40.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d705506030d5c0aaf2882437c70dab437605f21c5f9811978f694e6917a3b54" +checksum = "111273f7b3d3510524c752e8b7a5314b7f7a1fee7e68161c01a7d72cbb06db9f" dependencies = [ "either", "futures", "futures-rustls", - "libp2p-core 0.38.0", + "libp2p-core", "log", "parking_lot 0.12.1", "quicksink", "rw-stream-sink", "soketto", "url", - "webpki-roots", + "webpki-roots 0.22.6", ] [[package]] name = "libp2p-yamux" -version = "0.42.0" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f63594a0aa818642d9d4915c791945053877253f08a3626f13416b5cd928a29" +checksum = "4dcd21d950662700a385d4c6d68e2f5f54d778e97068cdd718522222ef513bda" dependencies = [ "futures", - "libp2p-core 0.38.0", + "libp2p-core", "log", - "parking_lot 0.12.1", "thiserror", "yamux", ] [[package]] name = "librocksdb-sys" -version = "0.10.0+7.9.2" +version = "0.11.0+8.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fe4d5874f5ff2bc616e55e8c6086d478fcda13faf9495768a4aa1c22042d30b" +checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" dependencies = [ "bindgen", "bzip2-sys", @@ -6234,9 +6601,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "pkg-config", @@ -6245,9 +6612,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" dependencies = [ "cc", ] @@ -6269,9 +6636,9 @@ dependencies = [ [[package]] name = "linregress" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475015a7f8f017edb28d2e69813be23500ad4b32cfe3421c4148efc97324ee52" +checksum = "4de0b5f52a9f84544d268f5fabb71b38962d6aa3c6600b8bcd27d44ccf9c9c45" dependencies = [ "nalgebra", ] @@ -6288,6 +6655,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +[[package]] +name = "linux-raw-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" + [[package]] name = "loans" version = "1.9.3" @@ -6357,24 +6730,24 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" +checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" dependencies = [ - "hashbrown 0.12.3", + "hashbrown 0.13.2", ] [[package]] name = "lru" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" +checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" dependencies = [ "hashbrown 0.13.2", ] @@ -6417,6 +6790,54 @@ dependencies = [ "libc", ] +[[package]] +name = "macro_magic" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9" +dependencies = [ + "macro_magic_core", + "macro_magic_macros", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "macro_magic_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00" +dependencies = [ + "const-random", + "derive-syn-parse", + "macro_magic_core_macros", + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "macro_magic_core_macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c12469fc165526520dff2807c2975310ab47cf7190a45b99b49a7dc8befab17b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", +] + +[[package]] +name = "macro_magic_macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a" +dependencies = [ + "macro_magic_core", + "quote", + "syn 2.0.29", +] + [[package]] name = "maplit" version = "1.0.2" @@ -6435,7 +6856,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] @@ -6475,7 +6896,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" dependencies = [ - "rustix 0.37.20", + "rustix 0.37.23", ] [[package]] @@ -6496,6 +6917,15 @@ dependencies = [ "autocfg 1.1.0", ] +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg 1.1.0", +] + [[package]] name = "memoffset" version = "0.9.0" @@ -6514,12 +6944,6 @@ dependencies = [ "hash-db 0.16.0", ] -[[package]] -name = "memory_units" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" - [[package]] name = "merlin" version = "2.0.1" @@ -6549,15 +6973,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -6581,7 +6996,7 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "futures", "log", @@ -6600,7 +7015,7 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "anyhow", "jsonrpsee", @@ -6684,24 +7099,6 @@ dependencies = [ "traits", ] -[[package]] -name = "multiaddr" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aebdb21e90f81d13ed01dc84123320838e53963c2ca94b60b305d3fa64f31e" -dependencies = [ - "arrayref", - "byteorder", - "data-encoding", - "multibase", - "multihash 0.16.3", - "percent-encoding", - "serde", - "static_assertions", - "unsigned-varint", - "url", -] - [[package]] name = "multiaddr" version = "0.17.1" @@ -6713,7 +7110,7 @@ dependencies = [ "data-encoding", "log", "multibase", - "multihash 0.17.0", + "multihash", "percent-encoding", "serde", "static_assertions", @@ -6734,14 +7131,14 @@ dependencies = [ [[package]] name = "multihash" -version = "0.16.3" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc" +checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ "blake2b_simd", "blake2s_simd", "blake3", - "core2", + "core2 0.4.0", "digest 0.10.7", "multihash-derive", "sha2 0.10.7", @@ -6749,17 +7146,6 @@ dependencies = [ "unsigned-varint", ] -[[package]] -name = "multihash" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" -dependencies = [ - "core2", - "multihash-derive", - "unsigned-varint", -] - [[package]] name = "multihash-derive" version = "0.8.0" @@ -6796,9 +7182,9 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.32.2" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511" +checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" dependencies = [ "approx", "matrixmultiply", @@ -6812,9 +7198,9 @@ dependencies = [ [[package]] name = "nalgebra-macros" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" +checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" dependencies = [ "proc-macro2", "quote", @@ -6873,7 +7259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", "byteorder", "libc", "netlink-packet-core", @@ -6926,7 +7312,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.6.5", @@ -7001,9 +7387,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg 1.1.0", "num-integer", @@ -7012,9 +7398,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -7064,21 +7450,21 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg 1.1.0", - "libm 0.2.7", + "libm", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.2", "libc", ] @@ -7100,7 +7486,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -7111,21 +7497,21 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.29.0" +version = "0.30.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" dependencies = [ "crc32fast", - "hashbrown 0.12.3", + "hashbrown 0.13.2", "indexmap 1.9.3", "memchr", ] [[package]] name = "object" -version = "0.30.4" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -7154,6 +7540,12 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + [[package]] name = "opaque-debug" version = "0.2.3" @@ -7168,11 +7560,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -7189,7 +7581,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -7200,9 +7592,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ "cc", "libc", @@ -7302,7 +7694,7 @@ dependencies = [ [[package]] name = "orml-asset-registry" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=ca05423f4f32be1d30765caacdc7d90130f5554a#ca05423f4f32be1d30765caacdc7d90130f5554a" +source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5#f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" dependencies = [ "frame-support", "frame-system", @@ -7321,7 +7713,7 @@ dependencies = [ [[package]] name = "orml-oracle" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=ca05423f4f32be1d30765caacdc7d90130f5554a#ca05423f4f32be1d30765caacdc7d90130f5554a" +source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5#f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" dependencies = [ "frame-support", "frame-system", @@ -7339,7 +7731,7 @@ dependencies = [ [[package]] name = "orml-tokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=ca05423f4f32be1d30765caacdc7d90130f5554a#ca05423f4f32be1d30765caacdc7d90130f5554a" +source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5#f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" dependencies = [ "frame-support", "frame-system", @@ -7355,7 +7747,7 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=ca05423f4f32be1d30765caacdc7d90130f5554a#ca05423f4f32be1d30765caacdc7d90130f5554a" +source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5#f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -7374,7 +7766,7 @@ dependencies = [ [[package]] name = "orml-unknown-tokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=ca05423f4f32be1d30765caacdc7d90130f5554a#ca05423f4f32be1d30765caacdc7d90130f5554a" +source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5#f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" dependencies = [ "frame-support", "frame-system", @@ -7389,12 +7781,13 @@ dependencies = [ [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=ca05423f4f32be1d30765caacdc7d90130f5554a#ca05423f4f32be1d30765caacdc7d90130f5554a" +source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5#f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" dependencies = [ "frame-support", "parity-scale-codec", "scale-info", "serde", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -7403,7 +7796,7 @@ dependencies = [ [[package]] name = "orml-vesting" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=ca05423f4f32be1d30765caacdc7d90130f5554a#ca05423f4f32be1d30765caacdc7d90130f5554a" +source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5#f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" dependencies = [ "frame-support", "frame-system", @@ -7418,7 +7811,7 @@ dependencies = [ [[package]] name = "orml-xcm" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=ca05423f4f32be1d30765caacdc7d90130f5554a#ca05423f4f32be1d30765caacdc7d90130f5554a" +source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5#f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" dependencies = [ "frame-support", "frame-system", @@ -7432,7 +7825,7 @@ dependencies = [ [[package]] name = "orml-xcm-support" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=ca05423f4f32be1d30765caacdc7d90130f5554a#ca05423f4f32be1d30765caacdc7d90130f5554a" +source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5#f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" dependencies = [ "frame-support", "orml-traits", @@ -7446,7 +7839,7 @@ dependencies = [ [[package]] name = "orml-xtokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=ca05423f4f32be1d30765caacdc7d90130f5554a#ca05423f4f32be1d30765caacdc7d90130f5554a" +source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5#f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -7496,19 +7889,40 @@ dependencies = [ ] [[package]] -name = "packed_simd_2" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +name = "pallet-asset-tx-payment" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "cfg-if", - "libm 0.1.4", + "frame-support", + "frame-system", + "pallet-transaction-payment", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-assets" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -7524,7 +7938,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -7540,7 +7954,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -7554,7 +7968,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7578,7 +7992,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7598,7 +8012,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7613,7 +8027,7 @@ dependencies = [ [[package]] name = "pallet-base-fee" version = "1.0.0" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "fp-evm", "frame-support", @@ -7627,7 +8041,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -7646,9 +8060,9 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "binary-merkle-tree", "frame-support", "frame-system", @@ -7670,7 +8084,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7688,7 +8102,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7705,9 +8119,28 @@ dependencies = [ ] [[package]] -name = "pallet-collective" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +name = "pallet-collator-selection" +version = "3.0.0" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-authorship", + "pallet-session", + "parity-scale-codec", + "rand 0.8.5", + "scale-info", + "sp-runtime", + "sp-staking", + "sp-std", +] + +[[package]] +name = "pallet-collective" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7724,9 +8157,9 @@ dependencies = [ [[package]] name = "pallet-contracts" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "environmental", "frame-benchmarking", "frame-support", @@ -7746,16 +8179,15 @@ dependencies = [ "sp-runtime", "sp-std", "wasm-instrument 0.4.0", - "wasmi 0.28.0", - "wasmparser-nostd", + "wasmi", ] [[package]] name = "pallet-contracts-primitives" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "24.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "parity-scale-codec", "scale-info", "sp-runtime", @@ -7766,17 +8198,17 @@ dependencies = [ [[package]] name = "pallet-contracts-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "assert_matches", "frame-benchmarking", @@ -7793,7 +8225,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7811,7 +8243,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7834,7 +8266,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7847,7 +8279,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -7859,13 +8291,14 @@ dependencies = [ "sp-io", "sp-npos-elections", "sp-runtime", + "sp-staking", "sp-std", ] [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "ethereum", "ethereum-types", @@ -7888,7 +8321,7 @@ dependencies = [ [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "environmental", "evm", @@ -7913,18 +8346,19 @@ dependencies = [ [[package]] name = "pallet-evm-chain-id" version = "1.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", + "sp-runtime", ] [[package]] name = "pallet-evm-precompile-dispatch" version = "2.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.42#2499d18c936edbcb7fcb711827db7abb9b4f4da4" dependencies = [ "fp-evm", "frame-support", @@ -7934,7 +8368,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "fp-evm", "num", @@ -7943,7 +8377,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-sha3fips" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "fp-evm", "tiny-keccak", @@ -7952,7 +8386,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.42#1a718546085be20ce381b70e1f9e4c8b4d4b1f03" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" dependencies = [ "fp-evm", "ripemd", @@ -7962,8 +8396,9 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ + "docify", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -7977,10 +8412,28 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-glutton" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +dependencies = [ + "blake2", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8003,7 +8456,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "enumflags2", "frame-benchmarking", @@ -8019,7 +8472,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8039,7 +8492,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8056,7 +8509,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8070,10 +8523,29 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-message-queue" +version = "7.0.0-dev" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", +] + [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8090,7 +8562,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8106,7 +8578,7 @@ dependencies = [ [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8122,7 +8594,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -8139,7 +8611,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8159,7 +8631,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", @@ -8170,7 +8642,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -8187,7 +8659,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8211,7 +8683,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8228,7 +8700,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8243,7 +8715,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8261,7 +8733,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8276,7 +8748,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "assert_matches", "frame-benchmarking", @@ -8295,7 +8767,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8312,7 +8784,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -8333,7 +8805,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8349,13 +8821,18 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", + "hex-literal 0.3.4", + "log", "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", + "sp-arithmetic", + "sp-io", "sp-runtime", "sp-std", ] @@ -8363,7 +8840,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8386,18 +8863,18 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "log", "sp-arithmetic", @@ -8406,7 +8883,7 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "sp-api", @@ -8415,7 +8892,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8432,8 +8909,9 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", @@ -8446,7 +8924,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8464,7 +8942,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8483,7 +8961,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-support", "frame-system", @@ -8499,7 +8977,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -8515,7 +8993,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -8527,7 +9005,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8544,7 +9022,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8560,7 +9038,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8575,7 +9053,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-benchmarking", "frame-support", @@ -8589,8 +9067,8 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bounded-collections", "frame-benchmarking", @@ -8610,8 +9088,8 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "frame-benchmarking", "frame-support", @@ -8630,13 +9108,15 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "parity-scale-codec", "scale-info", + "sp-runtime", + "sp-std", ] [[package]] @@ -8644,7 +9124,7 @@ name = "parachain-tests" version = "1.2.0" dependencies = [ "annuity", - "bitcoin", + "bitcoin 1.2.0", "btc-relay", "btc-relay-rpc-runtime-api", "clients-info", @@ -8730,6 +9210,7 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime", "polkadot-runtime-parachains", + "polkadot-test-runtime", "pretty_assertions", "rand 0.8.5", "redeem", @@ -8755,6 +9236,7 @@ dependencies = [ "sp-session", "sp-std", "sp-timestamp", + "sp-tracing", "sp-transaction-pool", "sp-version", "staking", @@ -8770,11 +9252,40 @@ dependencies = [ "xcm-simulator", ] +[[package]] +name = "parachains-common" +version = "1.0.0" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" +dependencies = [ + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-support", + "frame-system", + "num-traits", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "parity-scale-codec", + "polkadot-primitives", + "scale-info", + "sp-consensus-aura", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "substrate-wasm-builder", + "xcm", + "xcm-builder", + "xcm-executor", +] + [[package]] name = "parity-db" -version = "0.4.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4890dcb9556136a4ec2b0c51fa4a08c8b733b829506af8fff2e853f3a065985b" +checksum = "78f19d20a0d2cc52327a88d131fa1c4ea81ea4a04714aedcfeca2dd410049cf8" dependencies = [ "blake2", "crc32fast", @@ -8792,9 +9303,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.1" +version = "3.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2287753623c76f953acd29d15d8100bcab84d29db78fb6f352adb3c53e83b967" +checksum = "dd8e946cc0cc711189c0b0249fb8b599cbeeab9784d83c415719368bb8d4ac64" dependencies = [ "arrayvec 0.7.4", "bitvec", @@ -8807,9 +9318,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.1" +version = "3.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b6937b5e67bfba3351b87b040d48352a2fcb6ad72f81855412ce97b45c8f110" +checksum = "2a296c3079b5fefbc499e1de58dc26c09b1b9a5952d26694ee89f04a43ebbb3e" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8880,14 +9391,20 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] +[[package]] +name = "partial_sort" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7924d1d0ad836f665c9065e26d016c673ece3993f30d340068b16f282afc1156" + [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pbkdf2" @@ -8939,9 +9456,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.7.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73935e4d55e2abf7f130186537b19e7a4abc886a0252380b59248af473a3fc9" +checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" dependencies = [ "thiserror", "ucd-trie", @@ -8949,9 +9466,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef623c9bbfa0eedf5a0efba11a5ee83209c326653ca31ff019bec3a95bfff2b" +checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853" dependencies = [ "pest", "pest_generator", @@ -8959,22 +9476,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e8cba4ec22bada7fc55ffe51e2deb6a0e0db2d0b7ab0b103acc80d2510c190" +checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "pest_meta" -version = "2.7.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01f71cb40bd8bb94232df14b946909e14660e33fc05db3e50ae2a82d7ea0ca0" +checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48" dependencies = [ "once_cell", "pest", @@ -8983,32 +9500,32 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 1.9.3", + "indexmap 2.0.0", ] [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -9019,9 +9536,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -9045,7 +9562,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.6", + "der 0.7.8", "spki 0.7.2", ] @@ -9057,27 +9574,51 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "platforms" -version = "2.0.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" [[package]] -name = "platforms" -version = "3.0.2" +name = "plotters" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" + +[[package]] +name = "plotters-svg" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +dependencies = [ + "plotters-backend", +] [[package]] name = "polkadot-approval-distribution" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures", + "futures-timer", "polkadot-node-jaeger", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", + "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.5", "tracing-gum", @@ -9085,10 +9626,11 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures", + "futures-timer", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -9099,8 +9641,8 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "derive_more", "fatality", @@ -9122,8 +9664,8 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "fatality", "futures", @@ -9143,15 +9685,15 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "clap", "frame-benchmarking-cli", "futures", "log", - "polkadot-client", - "polkadot-node-core-pvf-worker", + "polkadot-node-core-pvf-execute-worker", + "polkadot-node-core-pvf-prepare-worker", "polkadot-node-metrics", "polkadot-performance-test", "polkadot-service", @@ -9170,53 +9712,10 @@ dependencies = [ "try-runtime-cli", ] -[[package]] -name = "polkadot-client" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" -dependencies = [ - "async-trait", - "frame-benchmarking", - "frame-benchmarking-cli", - "frame-system", - "frame-system-rpc-runtime-api", - "futures", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "polkadot-core-primitives", - "polkadot-node-core-parachains-inherent", - "polkadot-primitives", - "polkadot-runtime", - "polkadot-runtime-common", - "rococo-runtime", - "sc-client-api", - "sc-consensus", - "sc-executor", - "sc-service", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-consensus-grandpa", - "sp-core", - "sp-inherents", - "sp-keyring", - "sp-mmr-primitives", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-storage", - "sp-timestamp", - "sp-transaction-pool", -] - [[package]] name = "polkadot-collator-protocol" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "always-assert", "bitvec", @@ -9237,8 +9736,8 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "parity-scale-codec", "scale-info", @@ -9249,8 +9748,8 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "derive_more", "fatality", @@ -9274,8 +9773,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -9288,8 +9787,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures", "futures-timer", @@ -9308,8 +9807,8 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "always-assert", "async-trait", @@ -9331,8 +9830,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures", "parity-scale-codec", @@ -9349,8 +9848,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "derive_more", @@ -9378,8 +9877,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "futures", @@ -9387,6 +9886,7 @@ dependencies = [ "kvdb", "parity-scale-codec", "polkadot-erasure-coding", + "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -9399,8 +9899,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "fatality", @@ -9418,8 +9918,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures", "polkadot-node-subsystem", @@ -9433,8 +9933,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "async-trait", "futures", @@ -9453,8 +9953,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures", "polkadot-node-metrics", @@ -9468,8 +9968,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures", "futures-timer", @@ -9485,8 +9985,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "fatality", "futures", @@ -9504,8 +10004,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "async-trait", "futures", @@ -9521,8 +10021,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "fatality", @@ -9539,8 +10039,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "always-assert", "futures", @@ -9549,6 +10049,9 @@ dependencies = [ "parity-scale-codec", "pin-project", "polkadot-core-primitives", + "polkadot-node-core-pvf-common", + "polkadot-node-core-pvf-execute-worker", + "polkadot-node-core-pvf-prepare-worker", "polkadot-node-metrics", "polkadot-node-primitives", "polkadot-parachain", @@ -9560,14 +10063,15 @@ dependencies = [ "sp-tracing", "sp-wasm-interface", "substrate-build-script-utils", + "tempfile", "tokio", "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures", "polkadot-node-primitives", @@ -9581,29 +10085,67 @@ dependencies = [ ] [[package]] -name = "polkadot-node-core-pvf-worker" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +name = "polkadot-node-core-pvf-common" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ - "assert_matches", "cpu-time", "futures", + "landlock", "libc", "parity-scale-codec", - "polkadot-node-core-pvf", "polkadot-parachain", "polkadot-primitives", - "rayon", "sc-executor", "sc-executor-common", "sc-executor-wasmtime", "sp-core", "sp-externalities", "sp-io", - "sp-maybe-compressed-blob", "sp-tracing", "substrate-build-script-utils", - "tempfile", + "tokio", + "tracing-gum", +] + +[[package]] +name = "polkadot-node-core-pvf-execute-worker" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +dependencies = [ + "cpu-time", + "futures", + "parity-scale-codec", + "polkadot-node-core-pvf-common", + "polkadot-parachain", + "polkadot-primitives", + "rayon", + "sp-core", + "sp-maybe-compressed-blob", + "sp-tracing", + "tikv-jemalloc-ctl", + "tokio", + "tracing-gum", +] + +[[package]] +name = "polkadot-node-core-pvf-prepare-worker" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +dependencies = [ + "futures", + "libc", + "parity-scale-codec", + "polkadot-node-core-pvf-common", + "polkadot-parachain", + "polkadot-primitives", + "rayon", + "sc-executor", + "sc-executor-common", + "sc-executor-wasmtime", + "sp-io", + "sp-maybe-compressed-blob", + "sp-tracing", "tikv-jemalloc-ctl", "tokio", "tracing-gum", @@ -9611,8 +10153,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "futures", "lru 0.9.0", @@ -9626,8 +10168,8 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "lazy_static", "log", @@ -9644,8 +10186,8 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bs58", "futures", @@ -9663,9 +10205,10 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ + "async-channel", "async-trait", "derive_more", "fatality", @@ -9685,8 +10228,8 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bounded-vec", "futures", @@ -9707,8 +10250,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -9717,8 +10260,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "async-trait", "derive_more", @@ -9730,6 +10273,7 @@ dependencies = [ "polkadot-primitives", "polkadot-statement-table", "sc-network", + "sc-transaction-pool-api", "smallvec", "sp-api", "sp-authority-discovery", @@ -9740,8 +10284,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "async-trait", "derive_more", @@ -9773,8 +10317,8 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "async-trait", "futures", @@ -9796,8 +10340,8 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bounded-collections", "derive_more", @@ -9813,14 +10357,14 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "env_logger 0.9.3", "kusama-runtime", "log", "polkadot-erasure-coding", - "polkadot-node-core-pvf-worker", + "polkadot-node-core-pvf-prepare-worker", "polkadot-node-primitives", "polkadot-primitives", "quote", @@ -9831,8 +10375,8 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "hex-literal 0.4.1", @@ -9857,8 +10401,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -9889,8 +10433,8 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "frame-benchmarking", @@ -9922,6 +10466,7 @@ dependencies = [ "pallet-im-online", "pallet-indices", "pallet-membership", + "pallet-message-queue", "pallet-multisig", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", @@ -9983,8 +10528,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "frame-benchmarking", @@ -10029,8 +10574,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "frame-support", "polkadot-primitives", @@ -10043,8 +10588,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bs58", "parity-scale-codec", @@ -10055,10 +10600,10 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bitvec", "derive_more", "frame-benchmarking", @@ -10069,6 +10614,7 @@ dependencies = [ "pallet-authorship", "pallet-babe", "pallet-balances", + "pallet-message-queue", "pallet-session", "pallet-staking", "pallet-timestamp", @@ -10099,12 +10645,14 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "async-trait", + "frame-benchmarking", "frame-benchmarking-cli", "frame-support", + "frame-system", "frame-system-rpc-runtime-api", "futures", "hex-literal 0.4.1", @@ -10117,14 +10665,16 @@ dependencies = [ "pallet-babe", "pallet-im-online", "pallet-staking", + "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "parity-db", + "parity-scale-codec", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", "polkadot-availability-recovery", - "polkadot-client", "polkadot-collator-protocol", + "polkadot-core-primitives", "polkadot-dispute-distribution", "polkadot-gossip-support", "polkadot-network-bridge", @@ -10151,7 +10701,7 @@ dependencies = [ "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", - "polkadot-runtime-constants", + "polkadot-runtime-common", "polkadot-runtime-parachains", "polkadot-statement-distribution", "rococo-runtime", @@ -10178,6 +10728,7 @@ dependencies = [ "sc-sysinfo", "sc-telemetry", "sc-transaction-pool", + "sc-transaction-pool-api", "serde", "serde_json", "sp-api", @@ -10191,6 +10742,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-keyring", "sp-keystore", "sp-mmr-primitives", "sp-offchain", @@ -10201,6 +10753,8 @@ dependencies = [ "sp-timestamp", "sp-transaction-pool", "sp-trie", + "sp-version", + "sp-weights", "substrate-prometheus-endpoint", "thiserror", "tracing-gum", @@ -10209,12 +10763,13 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "arrayvec 0.5.2", "fatality", "futures", + "futures-timer", "indexmap 1.9.3", "parity-scale-codec", "polkadot-node-network-protocol", @@ -10230,12 +10785,124 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +dependencies = [ + "parity-scale-codec", + "polkadot-primitives", + "sp-core", +] + +[[package]] +name = "polkadot-test-runtime" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ + "bitvec", + "frame-election-provider-support", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-rpc-runtime-api", + "log", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-balances", + "pallet-grandpa", + "pallet-indices", + "pallet-offences", + "pallet-session", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-vesting", + "pallet-xcm", "parity-scale-codec", + "polkadot-parachain", + "polkadot-primitives", + "polkadot-runtime-common", + "polkadot-runtime-parachains", + "rustc-hex", + "scale-info", + "serde", + "serde_derive", + "smallvec", + "sp-api", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-babe", + "sp-consensus-beefy", + "sp-core", + "sp-inherents", + "sp-io", + "sp-mmr-primitives", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-transaction-pool", + "sp-version", + "substrate-wasm-builder", + "test-runtime-constants", + "xcm", + "xcm-builder", + "xcm-executor", +] + +[[package]] +name = "polkadot-test-service" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +dependencies = [ + "frame-system", + "futures", + "hex", + "pallet-balances", + "pallet-staking", + "pallet-transaction-payment", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-overseer", + "polkadot-parachain", "polkadot-primitives", + "polkadot-rpc", + "polkadot-runtime-common", + "polkadot-runtime-parachains", + "polkadot-service", + "polkadot-test-runtime", + "rand 0.8.5", + "sc-authority-discovery", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sc-consensus-babe", + "sc-consensus-grandpa", + "sc-network", + "sc-service", + "sc-tracing", + "sc-transaction-pool", + "sp-arithmetic", + "sp-authority-discovery", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-consensus-grandpa", "sp-core", + "sp-inherents", + "sp-keyring", + "sp-runtime", + "sp-state-machine", + "substrate-test-client", + "tempfile", + "test-runtime-constants", + "tokio", + "tracing-gum", ] [[package]] @@ -10245,12 +10912,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg 1.1.0", - "bitflags", + "bitflags 1.3.2", "cfg-if", "concurrent-queue", "libc", "log", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "windows-sys 0.48.0", ] @@ -10291,9 +10958,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.3.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" +checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e" [[package]] name = "ppv-lite86" @@ -10353,6 +11020,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "prettyplease" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" +dependencies = [ + "proc-macro2", + "syn 2.0.29", +] + [[package]] name = "primitive-types" version = "0.12.1" @@ -10425,20 +11102,20 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro-warning" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4" +checksum = "70550716265d1ec349c41f70dd4f964b4fd88394efe4405f0c1da679c4799a07" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -10459,25 +11136,25 @@ dependencies = [ [[package]] name = "prometheus-client" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c" +checksum = "5d6fa99d535dd930d1249e6c79cb3c2915f9172a540fe2b02a4c8f9ca954721e" dependencies = [ "dtoa", "itoa", "parking_lot 0.12.1", - "prometheus-client-derive-text-encode", + "prometheus-client-derive-encode", ] [[package]] -name = "prometheus-client-derive-text-encode" -version = "0.3.0" +name = "prometheus-client-derive-encode" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd" +checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] @@ -10487,7 +11164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" dependencies = [ "bit-set", - "bitflags", + "bitflags 1.3.2", "byteorder", "lazy_static", "num-traits", @@ -10523,7 +11200,7 @@ dependencies = [ "log", "multimap", "petgraph", - "prettyplease", + "prettyplease 0.1.25", "prost", "prost-types", "regex", @@ -10532,19 +11209,6 @@ dependencies = [ "which", ] -[[package]] -name = "prost-codec" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc34979ff898b6e141106178981ce2596c387ea6e62533facfc61a37fc879c0" -dependencies = [ - "asynchronous-codec", - "bytes", - "prost", - "thiserror", - "unsigned-varint", -] - [[package]] name = "prost-derive" version = "0.11.9" @@ -10591,6 +11255,19 @@ dependencies = [ "byteorder", ] +[[package]] +name = "quick-protobuf-codec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1693116345026436eb2f10b677806169c1a1260c1c60eaaffe3fb5a29ae23d8b" +dependencies = [ + "asynchronous-codec", + "bytes", + "quick-protobuf", + "thiserror", + "unsigned-varint", +] + [[package]] name = "quicksink" version = "0.1.2" @@ -10604,9 +11281,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" +checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9" dependencies = [ "bytes", "rand 0.8.5", @@ -10622,9 +11299,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -10866,7 +11543,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", "ring", - "time 0.3.22", + "time 0.3.27", "x509-parser 0.13.2", "yasna", ] @@ -10879,7 +11556,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring", - "time 0.3.22", + "time 0.3.27", "yasna", ] @@ -10896,7 +11573,7 @@ dependencies = [ name = "redeem" version = "1.2.0" dependencies = [ - "bitcoin", + "bitcoin 1.2.0", "btc-relay", "currency", "fee", @@ -10953,7 +11630,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -10962,7 +11639,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -10991,29 +11668,29 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c" +checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.16" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7" +checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "regalloc2" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c" +checksum = "80535183cae11b149d618fbd3c37e38d7cda589d82d7769e196ca9a9042d7621" dependencies = [ "fxhash", "log", @@ -11023,13 +11700,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ - "aho-corasick 1.0.2", + "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.3.6", + "regex-syntax 0.7.4", ] [[package]] @@ -11042,34 +11720,33 @@ dependencies = [ ] [[package]] -name = "regex-syntax" -version = "0.6.29" +name = "regex-automata" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", +] [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] -name = "region" -version = "3.0.0" +name = "regex-syntax" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" -dependencies = [ - "bitflags", - "libc", - "mach", - "winapi", -] +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "replace" version = "1.2.0" dependencies = [ - "bitcoin", + "bitcoin 1.2.0", "btc-relay", "currency", "fee", @@ -11243,9 +11920,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015439787fce1e75d55f279078d33ff14b4af5d93d995e8838ee4631301c8a99" +checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" dependencies = [ "libc", "librocksdb-sys", @@ -11253,8 +11930,8 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "binary-merkle-tree", "frame-benchmarking", @@ -11282,6 +11959,7 @@ dependencies = [ "pallet-im-online", "pallet-indices", "pallet-membership", + "pallet-message-queue", "pallet-mmr", "pallet-multisig", "pallet-nis", @@ -11339,8 +12017,8 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "frame-support", "polkadot-primitives", @@ -11487,7 +12165,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.17", + "semver 1.0.18", ] [[package]] @@ -11501,11 +12179,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.14" +version = "0.36.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e4d67015953998ad0eb82887a0eb0129e18a7e2f3b7b0f6c422fddcd503d62" +checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -11515,11 +12193,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.20" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -11527,6 +12205,19 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "rustix" +version = "0.38.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.5", + "windows-sys 0.48.0", +] + [[package]] name = "rustls" version = "0.19.1" @@ -11552,6 +12243,18 @@ dependencies = [ "webpki 0.22.0", ] +[[package]] +name = "rustls" +version = "0.21.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +dependencies = [ + "log", + "ring", + "rustls-webpki 0.101.4", + "sct 0.7.0", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -11573,11 +12276,31 @@ dependencies = [ "base64 0.21.2", ] +[[package]] +name = "rustls-webpki" +version = "0.100.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rusty-fork" @@ -11604,15 +12327,15 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safe_arch" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62a7484307bd40f8f7ccbacccac730108f2cae119a3b11c74485b48aa9ea650f" +checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" dependencies = [ "bytemuck", ] @@ -11629,7 +12352,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "log", "sp-core", @@ -11640,7 +12363,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "futures", @@ -11648,13 +12371,13 @@ dependencies = [ "ip_network", "libp2p", "log", + "multihash", "parity-scale-codec", "prost", "prost-build", "rand 0.8.5", "sc-client-api", "sc-network", - "sc-network-common", "sp-api", "sp-authority-discovery", "sp-blockchain", @@ -11668,7 +12391,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "futures", "futures-timer", @@ -11691,7 +12414,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -11706,7 +12429,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -11725,25 +12448,25 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "chrono", "clap", "fdlimit", "futures", - "libp2p", + "libp2p-identity", "log", "names", "parity-scale-codec", @@ -11754,7 +12477,6 @@ dependencies = [ "sc-client-db", "sc-keystore", "sc-network", - "sc-network-common", "sc-service", "sc-telemetry", "sc-tracing", @@ -11776,7 +12498,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "fnv", "futures", @@ -11790,11 +12512,11 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", - "sp-database 4.0.0-dev (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42)", + "sp-database", "sp-externalities", - "sp-keystore", "sp-runtime", "sp-state-machine", + "sp-statement-store", "sp-storage", "substrate-prometheus-endpoint", ] @@ -11802,7 +12524,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "hash-db 0.16.0", "kvdb", @@ -11819,7 +12541,7 @@ dependencies = [ "sp-arithmetic", "sp-blockchain", "sp-core", - "sp-database 4.0.0-dev (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42)", + "sp-database", "sp-runtime", "sp-state-machine", "sp-trie", @@ -11828,12 +12550,12 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "futures", "futures-timer", - "libp2p", + "libp2p-identity", "log", "mockall", "parking_lot 0.12.1", @@ -11853,7 +12575,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "futures", @@ -11882,7 +12604,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "fork-tree", @@ -11897,8 +12619,8 @@ dependencies = [ "sc-consensus", "sc-consensus-epochs", "sc-consensus-slots", - "sc-keystore", "sc-telemetry", + "sc-transaction-pool-api", "scale-info", "sp-api", "sp-application-crypto", @@ -11918,7 +12640,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "futures", "jsonrpsee", @@ -11940,9 +12662,10 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", + "async-channel", "async-trait", "fnv", "futures", @@ -11951,9 +12674,7 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-consensus", - "sc-keystore", "sc-network", - "sc-network-common", "sc-network-gossip", "sc-network-sync", "sc-utils", @@ -11975,7 +12696,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "futures", "jsonrpsee", @@ -11994,7 +12715,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "fork-tree", "parity-scale-codec", @@ -12007,10 +12728,10 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "ahash 0.8.3", - "array-bytes 4.2.0", + "array-bytes", "async-trait", "dyn-clone", "finality-grandpa", @@ -12029,6 +12750,7 @@ dependencies = [ "sc-network-common", "sc-network-gossip", "sc-telemetry", + "sc-transaction-pool-api", "sc-utils", "serde_json", "sp-api", @@ -12047,7 +12769,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "finality-grandpa", "futures", @@ -12067,11 +12789,12 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "assert_matches", "async-trait", "futures", + "futures-timer", "jsonrpsee", "log", "parity-scale-codec", @@ -12101,7 +12824,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "futures", @@ -12124,14 +12847,13 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", "sc-executor-common", - "sc-executor-wasmi", "sc-executor-wasmtime", + "schnellru", "sp-api", "sp-core", "sp-externalities", @@ -12142,46 +12864,30 @@ dependencies = [ "sp-version", "sp-wasm-interface", "tracing", - "wasmi 0.13.2", ] [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", "sp-wasm-interface", "thiserror", "wasm-instrument 0.3.0", - "wasmi 0.13.2", -] - -[[package]] -name = "sc-executor-wasmi" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" -dependencies = [ - "log", - "sc-allocator", - "sc-executor-common", - "sp-runtime-interface", - "sp-wasm-interface", - "wasmi 0.13.2", ] [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "anyhow", "cfg-if", "libc", "log", - "once_cell", - "rustix 0.36.14", + "rustix 0.36.15", "sc-allocator", "sc-executor-common", "sp-runtime-interface", @@ -12192,7 +12898,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "ansi_term", "futures", @@ -12208,10 +12914,9 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", - "async-trait", + "array-bytes", "parking_lot 0.12.1", "serde_json", "sp-application-crypto", @@ -12223,9 +12928,9 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "async-channel", "async-trait", "asynchronous-codec", @@ -12238,47 +12943,43 @@ dependencies = [ "libp2p", "linked_hash_set", "log", - "lru 0.8.1", "mockall", "parity-scale-codec", "parking_lot 0.12.1", + "partial_sort", "pin-project", "rand 0.8.5", - "sc-block-builder", "sc-client-api", - "sc-consensus", "sc-network-common", - "sc-peerset", "sc-utils", "serde", "serde_json", "smallvec", - "snow", "sp-arithmetic", "sp-blockchain", - "sp-consensus", "sp-core", "sp-runtime", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", + "wasm-timer", "zeroize", ] [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ + "async-channel", "cid", "futures", - "libp2p", + "libp2p-identity", "log", "prost", "prost-build", "sc-client-api", "sc-network", - "sc-network-common", "sp-blockchain", "sp-runtime", "thiserror", @@ -12288,45 +12989,33 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", "async-trait", - "bitflags", - "bytes", + "bitflags 1.3.2", "futures", - "futures-timer", - "libp2p", + "libp2p-identity", "parity-scale-codec", "prost-build", "sc-consensus", - "sc-peerset", - "sc-utils", - "serde", - "smallvec", - "sp-blockchain", "sp-consensus", "sp-consensus-grandpa", "sp-runtime", - "substrate-prometheus-endpoint", - "thiserror", - "zeroize", ] [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "ahash 0.8.3", "futures", "futures-timer", "libp2p", "log", - "lru 0.8.1", "sc-network", "sc-network-common", - "sc-peerset", + "schnellru", "sp-runtime", "substrate-prometheus-endpoint", "tracing", @@ -12335,19 +13024,18 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", + "async-channel", "futures", - "libp2p", + "libp2p-identity", "log", "parity-scale-codec", "prost", "prost-build", "sc-client-api", "sc-network", - "sc-network-common", - "sc-peerset", "sp-blockchain", "sp-core", "sp-runtime", @@ -12357,16 +13045,16 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", + "async-channel", "async-trait", "fork-tree", "futures", "futures-timer", "libp2p", "log", - "lru 0.8.1", "mockall", "parity-scale-codec", "prost", @@ -12375,8 +13063,8 @@ dependencies = [ "sc-consensus", "sc-network", "sc-network-common", - "sc-peerset", "sc-utils", + "schnellru", "smallvec", "sp-arithmetic", "sp-blockchain", @@ -12391,17 +13079,15 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "futures", "libp2p", "log", "parity-scale-codec", - "pin-project", "sc-network", "sc-network-common", - "sc-peerset", "sc-utils", "sp-consensus", "sp-runtime", @@ -12411,9 +13097,9 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "bytes", "fnv", "futures", @@ -12421,6 +13107,7 @@ dependencies = [ "hyper", "hyper-rustls", "libp2p", + "log", "num_cpus", "once_cell", "parity-scale-codec", @@ -12429,33 +13116,22 @@ dependencies = [ "sc-client-api", "sc-network", "sc-network-common", - "sc-peerset", + "sc-transaction-pool-api", "sc-utils", "sp-api", "sp-core", + "sp-externalities", + "sp-keystore", "sp-offchain", "sp-runtime", "threadpool", "tracing", ] -[[package]] -name = "sc-peerset" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" -dependencies = [ - "futures", - "libp2p", - "log", - "sc-utils", - "serde_json", - "wasm-timer", -] - [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -12464,7 +13140,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "futures", "jsonrpsee", @@ -12487,6 +13163,7 @@ dependencies = [ "sp-rpc", "sp-runtime", "sp-session", + "sp-statement-store", "sp-version", "tokio", ] @@ -12494,7 +13171,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -12513,7 +13190,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "http", "jsonrpsee", @@ -12528,9 +13205,9 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "futures", "futures-util", "hex", @@ -12554,7 +13231,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "directories", @@ -12581,11 +13258,9 @@ dependencies = [ "sc-network-light", "sc-network-sync", "sc-network-transactions", - "sc-offchain", "sc-rpc", "sc-rpc-server", "sc-rpc-spec-v2", - "sc-storage-monitor", "sc-sysinfo", "sc-telemetry", "sc-tracing", @@ -12620,7 +13295,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "log", "parity-scale-codec", @@ -12631,14 +13306,12 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "clap", "fs4", - "futures", "log", "sc-client-db", - "sc-utils", "sp-core", "thiserror", "tokio", @@ -12647,7 +13320,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -12666,7 +13339,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "futures", "libc", @@ -12685,7 +13358,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "chrono", "futures", @@ -12704,7 +13377,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "ansi_term", "atty", @@ -12712,12 +13385,10 @@ dependencies = [ "lazy_static", "libc", "log", - "once_cell", "parking_lot 0.12.1", "regex", "rustc-hash", "sc-client-api", - "sc-rpc-server", "sc-tracing-proc-macro", "serde", "sp-api", @@ -12735,25 +13406,24 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "futures", "futures-timer", "linked-hash-map", "log", - "num-traits", "parity-scale-codec", "parking_lot 0.12.1", "sc-client-api", @@ -12773,13 +13443,15 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "futures", "log", + "parity-scale-codec", "serde", "sp-blockchain", + "sp-core", "sp-runtime", "thiserror", ] @@ -12787,7 +13459,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-channel", "futures", @@ -12864,9 +13536,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad560913365790f17cbf12479491169f01b9d46d29cfc7422bf8c64bdc61b731" +checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782" dependencies = [ "bitvec", "cfg-if", @@ -12878,9 +13550,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19df9bd9ace6cc2fe19387c96ce677e823e07d017ceed253e7bb3d1d1bd9c73b" +checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -12890,11 +13562,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -12928,15 +13600,15 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scratch" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" +checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" [[package]] name = "sct" @@ -12986,12 +13658,12 @@ dependencies = [ [[package]] name = "sec1" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct 0.2.0", - "der 0.7.6", + "der 0.7.8", "generic-array 0.14.7", "pkcs8 0.10.2", "subtle", @@ -13016,6 +13688,16 @@ dependencies = [ "secp256k1-sys 0.6.1", ] +[[package]] +name = "secp256k1" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" +dependencies = [ + "bitcoin_hashes 0.12.0", + "secp256k1-sys 0.8.1", +] + [[package]] name = "secp256k1-sys" version = "0.4.0" @@ -13033,6 +13715,15 @@ dependencies = [ "cc", ] +[[package]] +name = "secp256k1-sys" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e" +dependencies = [ + "cc", +] + [[package]] name = "secrecy" version = "0.8.0" @@ -13062,11 +13753,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -13075,9 +13766,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -13094,9 +13785,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] @@ -13109,29 +13800,29 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.99" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -13276,15 +13967,15 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg 1.1.0", ] @@ -13297,8 +13988,8 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "slot-range-helper" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "enumn", "parity-scale-codec", @@ -13318,9 +14009,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "snap" @@ -13330,14 +14021,14 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "snow" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733" +checksum = "0c9d1425eb528a21de2755c75af4c9b5d57f50a0d4c3b7f1828a4cd03f8ba155" dependencies = [ "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-rc.1", + "curve25519-dalek 4.0.0", "rand_core 0.6.4", "ring", "rustc_version", @@ -13385,7 +14076,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "hash-db 0.16.0", "log", @@ -13393,6 +14084,7 @@ dependencies = [ "scale-info", "sp-api-proc-macro", "sp-core", + "sp-externalities", "sp-metadata-ir", "sp-runtime", "sp-state-machine", @@ -13405,21 +14097,21 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "Inflector", "blake2", - "expander 1.0.0", + "expander 2.0.0", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "sp-application-crypto" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "23.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "scale-info", @@ -13431,8 +14123,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "16.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "integer-sqrt", "num-traits", @@ -13446,7 +14138,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "scale-info", @@ -13459,9 +14151,8 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", @@ -13471,16 +14162,16 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "futures", "log", - "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", + "schnellru", "sp-api", "sp-consensus", - "sp-database 4.0.0-dev (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42)", + "sp-database", "sp-runtime", "sp-state-machine", "thiserror", @@ -13489,7 +14180,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "futures", @@ -13504,14 +14195,13 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", "sp-api", "sp-application-crypto", - "sp-consensus", "sp-consensus-slots", "sp-inherents", "sp-runtime", @@ -13522,7 +14212,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "parity-scale-codec", @@ -13530,11 +14220,9 @@ dependencies = [ "serde", "sp-api", "sp-application-crypto", - "sp-consensus", "sp-consensus-slots", "sp-core", "sp-inherents", - "sp-keystore", "sp-runtime", "sp-std", "sp-timestamp", @@ -13543,7 +14231,7 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "lazy_static", "parity-scale-codec", @@ -13562,7 +14250,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "finality-grandpa", "log", @@ -13580,7 +14268,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "scale-info", @@ -13591,11 +14279,11 @@ dependencies = [ [[package]] name = "sp-core" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "21.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "array-bytes 4.2.0", - "bitflags", + "array-bytes", + "bitflags 1.3.2", "blake2", "bounded-collections", "bs58", @@ -13630,47 +14318,37 @@ dependencies = [ "substrate-bip39", "thiserror", "tiny-bip39", + "tracing", "zeroize", ] [[package]] name = "sp-core-hashing" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "9.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "blake2b_simd", "byteorder", "digest 0.10.7", "sha2 0.10.7", "sha3", - "sp-std", "twox-hash", ] -[[package]] -name = "sp-core-hashing-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" -dependencies = [ - "proc-macro2", - "quote", - "sp-core-hashing", - "syn 2.0.22", -] - -[[package]] -name = "sp-database" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +[[package]] +name = "sp-core-hashing-proc-macro" +version = "9.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "kvdb", - "parking_lot 0.12.1", + "quote", + "sp-core-hashing", + "syn 2.0.29", ] [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -13678,18 +14356,18 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "8.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "sp-externalities" -version = "0.13.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "0.19.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "environmental", "parity-scale-codec", @@ -13700,13 +14378,12 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-core", "sp-runtime", "sp-std", "thiserror", @@ -13714,13 +14391,12 @@ dependencies = [ [[package]] name = "sp-io" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "23.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "bytes", - "ed25519", - "ed25519-dalek", - "futures", + "ed25519 1.5.3", + "ed25519-dalek 1.0.1", "libsecp256k1 0.7.1", "log", "parity-scale-codec", @@ -13740,8 +14416,8 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "24.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "lazy_static", "sp-core", @@ -13751,13 +14427,11 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.13.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "0.27.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ - "futures", "parity-scale-codec", "parking_lot 0.12.1", - "serde", "sp-core", "sp-externalities", "thiserror", @@ -13766,16 +14440,16 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "thiserror", - "zstd 0.12.3+zstd.1.5.2", + "zstd 0.12.4", ] [[package]] name = "sp-metadata-ir" version = "0.1.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -13786,7 +14460,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -13804,7 +14478,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "scale-info", @@ -13818,7 +14492,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "sp-api", "sp-core", @@ -13827,8 +14501,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "8.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "backtrace", "lazy_static", @@ -13838,7 +14512,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "rustc-hash", "serde", @@ -13847,8 +14521,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "24.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "either", "hash256-std-hasher", @@ -13869,8 +14543,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "17.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -13887,25 +14561,26 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "11.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", "sp-core", + "sp-keystore", "sp-runtime", "sp-staking", "sp-std", @@ -13914,8 +14589,9 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ + "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", @@ -13926,8 +14602,8 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.13.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "0.28.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "hash-db 0.16.0", "log", @@ -13942,17 +14618,35 @@ dependencies = [ "sp-trie", "thiserror", "tracing", + "trie-db", +] + +[[package]] +name = "sp-statement-store" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-externalities", + "sp-runtime", + "sp-runtime-interface", + "sp-std", + "thiserror", ] [[package]] name = "sp-std" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "8.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" [[package]] name = "sp-storage" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "13.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "impl-serde 0.4.0", "parity-scale-codec", @@ -13965,11 +14659,9 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", - "futures-timer", - "log", "parity-scale-codec", "sp-inherents", "sp-runtime", @@ -13979,8 +14671,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "10.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "sp-std", @@ -13992,7 +14684,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "sp-api", "sp-runtime", @@ -14001,10 +14693,9 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", - "log", "parity-scale-codec", "scale-info", "sp-core", @@ -14016,8 +14707,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "22.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "ahash 0.8.3", "hash-db 0.16.0", @@ -14039,8 +14730,8 @@ dependencies = [ [[package]] name = "sp-version" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "22.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "impl-serde 0.4.0", "parity-scale-codec", @@ -14056,33 +14747,32 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "8.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "sp-wasm-interface" -version = "7.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "14.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", "sp-std", - "wasmi 0.13.2", "wasmtime", ] [[package]] name = "sp-weights" -version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +version = "20.0.0" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "parity-scale-codec", "scale-info", @@ -14143,7 +14833,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" dependencies = [ "base64ct", - "der 0.7.6", + "der 0.7.8", ] [[package]] @@ -14269,9 +14959,9 @@ dependencies = [ [[package]] name = "ss58-registry" -version = "1.40.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47a8ad42e5fc72d5b1eb104a5546937eaf39843499948bb666d6e93c62423b" +checksum = "5e6915280e2d0db8911e5032a5c275571af6bdded2916abd691a659be25d3439" dependencies = [ "Inflector", "num-format", @@ -14336,7 +15026,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg_aliases", "libc", "parking_lot 0.11.2", @@ -14434,15 +15124,12 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" -dependencies = [ - "platforms 2.0.0", -] +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -14461,7 +15148,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "hyper", "log", @@ -14473,7 +15160,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "jsonrpsee", @@ -14486,14 +15173,12 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "jsonrpsee", - "log", "parity-scale-codec", "sc-client-api", "sc-rpc-api", - "scale-info", "serde", "sp-core", "sp-runtime", @@ -14502,19 +15187,46 @@ dependencies = [ "trie-db", ] +[[package]] +name = "substrate-test-client" +version = "2.0.1" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" +dependencies = [ + "array-bytes", + "async-trait", + "futures", + "parity-scale-codec", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-executor", + "sc-offchain", + "sc-service", + "serde", + "serde_json", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-keyring", + "sp-keystore", + "sp-runtime", + "sp-state-machine", +] + [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "ansi_term", "build-helper", "cargo_metadata", "filetime", + "parity-wasm", "sp-maybe-compressed-blob", "strum", "tempfile", - "toml 0.7.5", + "toml 0.7.6", "walkdir", "wasm-opt", ] @@ -14568,9 +15280,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.22" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -14595,7 +15307,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "system-configuration-sys", ] @@ -14618,21 +15330,20 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.8" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "autocfg 1.1.0", "cfg-if", - "fastrand", + "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.37.20", + "rustix 0.38.8", "windows-sys 0.48.0", ] @@ -14651,24 +15362,38 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" +[[package]] +name = "test-runtime-constants" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" +dependencies = [ + "frame-support", + "polkadot-primitives", + "polkadot-runtime-common", + "smallvec", + "sp-core", + "sp-runtime", + "sp-weights", +] + [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -14711,9 +15436,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-ctl" -version = "0.5.0" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1" +checksum = "619bfed27d807b54f7f776b9430d4f8060e66ee138a28632ca898584d462c31c" dependencies = [ "libc", "paste", @@ -14722,9 +15447,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.5.3+5.3.0-patched" +version = "0.5.4+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8" +checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" dependencies = [ "cc", "libc", @@ -14743,10 +15468,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.22" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" dependencies = [ + "deranged", "itoa", "serde", "time-core", @@ -14761,9 +15487,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9" dependencies = [ "time-core", ] @@ -14823,20 +15549,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374442f06ee49c3a28a8fc9f01a2596fed7559c6b99b31279c3261778e77d84f" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg 1.1.0", "backtrace", "bytes", "libc", "mio", "num_cpus", "parking_lot 0.12.1", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "signal-hook-registry", - "socket2 0.4.9", + "socket2 0.5.3", "tokio-macros", "windows-sys 0.48.0", ] @@ -14849,18 +15574,28 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", +] + +[[package]] +name = "tokio-retry" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" +dependencies = [ + "pin-project", + "rand 0.8.5", + "tokio", ] [[package]] name = "tokio-rustls" -version = "0.23.4" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.20.8", + "rustls 0.21.6", "tokio", - "webpki 0.22.0", ] [[package]] @@ -14870,7 +15605,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "tokio", "tokio-util", ] @@ -14885,7 +15620,7 @@ dependencies = [ "futures-core", "futures-io", "futures-sink", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "tokio", "tracing", ] @@ -14901,9 +15636,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -14922,9 +15657,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.11" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ "indexmap 2.0.0", "serde", @@ -14946,18 +15681,18 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.3.5" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" dependencies = [ - "bitflags", + "bitflags 2.4.0", "bytes", "futures-core", "futures-util", "http", "http-body", "http-range-header", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "tower-layer", "tower-service", ] @@ -14982,7 +15717,7 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "log", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "tracing-attributes", "tracing-core", ] @@ -14995,7 +15730,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -15020,8 +15755,8 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "polkadot-node-jaeger", "polkadot-primitives", @@ -15031,14 +15766,14 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "expander 2.0.0", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -15192,7 +15927,7 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.42#ff24c60ac7d9f87727ecdd0ded9a80c56e4f4b65" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" dependencies = [ "async-trait", "clap", @@ -15203,7 +15938,6 @@ dependencies = [ "parity-scale-codec", "sc-cli", "sc-executor", - "sc-service", "serde", "serde_json", "sp-api", @@ -15223,7 +15957,7 @@ dependencies = [ "sp-version", "sp-weights", "substrate-rpc-client", - "zstd 0.12.3+zstd.1.5.2", + "zstd 0.12.4", ] [[package]] @@ -15289,9 +16023,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "uint" @@ -15319,9 +16053,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -15413,9 +16147,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom 0.2.10", ] @@ -15430,7 +16164,7 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" name = "vault-registry" version = "1.2.0" dependencies = [ - "bitcoin", + "bitcoin 1.2.0", "currency", "fee", "fixed-hash 0.7.0", @@ -15596,7 +16330,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -15630,7 +16364,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -15661,9 +16395,9 @@ dependencies = [ [[package]] name = "wasm-opt" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a303793cbc01fb96551badfc7367db6007396bba6bac97936b3c8b6f7fdb41" +checksum = "87fef6d0d508f08334e0ab0e6877feb4c0ecb3956bcf2cb950699b22fedf3e9c" dependencies = [ "anyhow", "libc", @@ -15677,9 +16411,9 @@ dependencies = [ [[package]] name = "wasm-opt-cxx-sys" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c9deb56f8a9f2ec177b3bd642a8205621835944ed5da55f2388ef216aca5a4" +checksum = "bc816bbc1596c8f2e8127e137a760c798023ef3d378f2ae51f0f1840e2dfa445" dependencies = [ "anyhow", "cxx", @@ -15689,15 +16423,14 @@ dependencies = [ [[package]] name = "wasm-opt-sys" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4432e28b542738a9776cedf92e8a99d8991c7b4667ee2c7ccddfb479dd2856a7" +checksum = "40199e4f68ef1071b3c6d0bd8026a12b481865d4b9e49c156932ea9a6234dd14" dependencies = [ "anyhow", "cc", "cxx", "cxx-build", - "regex", ] [[package]] @@ -15717,56 +16450,24 @@ dependencies = [ [[package]] name = "wasmi" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422" -dependencies = [ - "parity-wasm", - "wasmi-validation", - "wasmi_core 0.2.1", -] - -[[package]] -name = "wasmi" -version = "0.28.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e61a7006b0fdf24f6bbe8dcfdad5ca1b350de80061fb2827f31c82fbbb9565a" +checksum = "e51fb5c61993e71158abf5bb863df2674ca3ec39ed6471c64f07aeaf751d67b4" dependencies = [ + "intx", + "smallvec", "spin 0.9.8", "wasmi_arena", - "wasmi_core 0.12.0", + "wasmi_core", "wasmparser-nostd", ] -[[package]] -name = "wasmi-validation" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b" -dependencies = [ - "parity-wasm", -] - [[package]] name = "wasmi_arena" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468" -[[package]] -name = "wasmi_core" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" -dependencies = [ - "downcast-rs", - "libm 0.2.7", - "memory_units", - "num-rational", - "num-traits", - "region", -] - [[package]] name = "wasmi_core" version = "0.12.0" @@ -15774,16 +16475,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624e6333e861ef49095d2d678b76ebf30b06bf37effca845be7e5b87c90071b7" dependencies = [ "downcast-rs", - "libm 0.2.7", + "libm", "num-traits", "paste", ] [[package]] name = "wasmparser" -version = "0.100.0" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4" +checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b" dependencies = [ "indexmap 1.9.3", "url", @@ -15800,9 +16501,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a222f5fa1e14b2cefc286f1b68494d7a965f4bf57ec04c59bb62673d639af6" +checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9" dependencies = [ "anyhow", "bincode", @@ -15810,7 +16511,7 @@ dependencies = [ "indexmap 1.9.3", "libc", "log", - "object 0.29.0", + "object 0.30.4", "once_cell", "paste", "psm", @@ -15823,43 +16524,43 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "wasmtime-asm-macros" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4407a7246e7d2f3d8fb1cf0c72fda8dbafdb6dd34d555ae8bea0e5ae031089cc" +checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ceb3adf61d654be0be67fffdce42447b0880481348785be5fe40b5dd7663a4c" +checksum = "c86437fa68626fe896e5afc69234bb2b5894949083586535f200385adfd71213" dependencies = [ "anyhow", - "base64 0.13.1", + "base64 0.21.2", "bincode", "directories-next", "file-per-thread-logger", "log", - "rustix 0.36.14", + "rustix 0.36.15", "serde", "sha2 0.10.7", "toml 0.5.11", - "windows-sys 0.42.0", + "windows-sys 0.45.0", "zstd 0.11.2+zstd.1.5.2", ] [[package]] name = "wasmtime-cranelift" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c366bb8647e01fd08cb5589976284b00abfded5529b33d7e7f3f086c68304a4" +checksum = "b1cefde0cce8cb700b1b21b6298a3837dba46521affd7b8c38a9ee2c869eee04" dependencies = [ "anyhow", "cranelift-codegen", @@ -15867,27 +16568,43 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.26.2", + "gimli 0.27.3", "log", - "object 0.29.0", + "object 0.30.4", "target-lexicon", "thiserror", "wasmparser", + "wasmtime-cranelift-shared", + "wasmtime-environ", +] + +[[package]] +name = "wasmtime-cranelift-shared" +version = "8.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd041e382ef5aea1b9fc78442394f1a4f6d676ce457e7076ca4cb3f397882f8b" +dependencies = [ + "anyhow", + "cranelift-codegen", + "cranelift-native", + "gimli 0.27.3", + "object 0.30.4", + "target-lexicon", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b8b50962eae38ee319f7b24900b7cf371f03eebdc17400c1dc8575fc10c9a7" +checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949" dependencies = [ "anyhow", "cranelift-entity", - "gimli 0.26.2", + "gimli 0.27.3", "indexmap 1.9.3", "log", - "object 0.29.0", + "object 0.30.4", "serde", "target-lexicon", "thiserror", @@ -15897,18 +16614,18 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffaed4f9a234ba5225d8e64eac7b4a5d13b994aeb37353cde2cbeb3febda9eaa" +checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244" dependencies = [ - "addr2line 0.17.0", + "addr2line 0.19.0", "anyhow", "bincode", "cfg-if", "cpp_demangle", - "gimli 0.26.2", + "gimli 0.27.3", "log", - "object 0.29.0", + "object 0.30.4", "rustc-demangle", "serde", "target-lexicon", @@ -15916,36 +16633,36 @@ dependencies = [ "wasmtime-jit-debug", "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "wasmtime-jit-debug" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed41cbcbf74ce3ff6f1d07d1b707888166dc408d1a880f651268f4f7c9194b2" +checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846" dependencies = [ - "object 0.29.0", + "object 0.30.4", "once_cell", - "rustix 0.36.14", + "rustix 0.36.15", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a28ae1e648461bfdbb79db3efdaee1bca5b940872e4175390f465593a2e54c" +checksum = "aecae978b13f7f67efb23bd827373ace4578f2137ec110bbf6a4a7cde4121bbd" dependencies = [ "cfg-if", "libc", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "wasmtime-runtime" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e704b126e4252788ccfc3526d4d4511d4b23c521bf123e447ac726c14545217b" +checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441" dependencies = [ "anyhow", "cc", @@ -15955,21 +16672,21 @@ dependencies = [ "log", "mach", "memfd", - "memoffset 0.6.5", + "memoffset 0.8.0", "paste", "rand 0.8.5", - "rustix 0.36.14", + "rustix 0.36.15", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "wasmtime-types" -version = "6.0.2" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e5572c5727c1ee7e8f28717aaa8400e4d22dcbd714ea5457d85b5005206568" +checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f" dependencies = [ "cranelift-entity", "serde", @@ -16016,6 +16733,21 @@ dependencies = [ "webpki 0.22.0", ] +[[package]] +name = "webpki-roots" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +dependencies = [ + "rustls-webpki 0.100.2", +] + +[[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + [[package]] name = "webrtc" version = "0.6.0" @@ -16042,7 +16774,7 @@ dependencies = [ "sha2 0.10.7", "stun", "thiserror", - "time 0.3.22", + "time 0.3.27", "tokio", "turn", "url", @@ -16074,9 +16806,9 @@ dependencies = [ [[package]] name = "webrtc-dtls" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942be5bd85f072c3128396f6e5a9bfb93ca8c1939ded735d177b7bcba9a13d05" +checksum = "c4a00f4242f2db33307347bd5be53263c52a0331c96c14292118c9a6bb48d267" dependencies = [ "aes 0.6.0", "aes-gcm 0.10.2", @@ -16091,12 +16823,11 @@ dependencies = [ "hkdf", "hmac 0.12.1", "log", - "oid-registry 0.6.1", "p256", "p384", "rand 0.8.5", "rand_core 0.6.4", - "rcgen 0.9.3", + "rcgen 0.10.0", "ring", "rustls 0.19.1", "sec1 0.3.0", @@ -16109,7 +16840,7 @@ dependencies = [ "tokio", "webpki 0.21.4", "webrtc-util", - "x25519-dalek 2.0.0-pre.1", + "x25519-dalek 2.0.0", "x509-parser 0.13.2", ] @@ -16211,7 +16942,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87" dependencies = [ "async-trait", - "bitflags", + "bitflags 1.3.2", "bytes", "cc", "ipnet", @@ -16227,8 +16958,8 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bitvec", "frame-benchmarking", @@ -16257,6 +16988,7 @@ dependencies = [ "pallet-im-online", "pallet-indices", "pallet-membership", + "pallet-message-queue", "pallet-multisig", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", @@ -16319,8 +17051,8 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "frame-support", "polkadot-primitives", @@ -16344,9 +17076,9 @@ dependencies = [ [[package]] name = "wide" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40018623e2dba2602a9790faba8d33f2ebdebf4b86561b83928db735f8784728" +checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f" dependencies = [ "bytemuck", "safe_arch", @@ -16408,22 +17140,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.48.5", ] [[package]] @@ -16441,7 +17158,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] @@ -16461,17 +17178,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -16482,9 +17199,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -16500,9 +17217,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -16518,9 +17235,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -16536,9 +17253,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -16554,9 +17271,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -16566,9 +17283,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -16584,15 +17301,15 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.4.7" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" dependencies = [ "memchr", ] @@ -16629,12 +17346,13 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0-pre.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek 4.0.0", "rand_core 0.6.4", + "serde", "zeroize", ] @@ -16654,7 +17372,7 @@ dependencies = [ "ring", "rusticata-macros", "thiserror", - "time 0.3.22", + "time 0.3.27", ] [[package]] @@ -16672,13 +17390,13 @@ dependencies = [ "oid-registry 0.6.1", "rusticata-macros", "thiserror", - "time 0.3.22", + "time 0.3.27", ] [[package]] name = "xcm" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "bounded-collections", "derivative", @@ -16693,8 +17411,8 @@ dependencies = [ [[package]] name = "xcm-builder" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "frame-support", "frame-system", @@ -16708,6 +17426,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "sp-weights", "xcm", "xcm-executor", ] @@ -16715,33 +17434,40 @@ dependencies = [ [[package]] name = "xcm-emulator" version = "0.1.0" -source = "git+https://github.com/shaunxw/xcm-simulator?rev=d011e5ca62b93e8f688c2042c1f92cdbafc5d1d0#d011e5ca62b93e8f688c2042c1f92cdbafc5d1d0" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" dependencies = [ + "casey", "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "cumulus-test-relay-sproof-builder", + "cumulus-test-service", "frame-support", "frame-system", + "log", + "pallet-balances", + "pallet-message-queue", "parachain-info", + "parachains-common", "parity-scale-codec", "paste", "polkadot-primitives", "polkadot-runtime-parachains", "quote", "sp-arithmetic", + "sp-core", "sp-io", "sp-std", + "sp-trie", "xcm", - "xcm-executor", ] [[package]] name = "xcm-executor" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "environmental", "frame-benchmarking", @@ -16760,19 +17486,19 @@ dependencies = [ [[package]] name = "xcm-procedural" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "xcm-simulator" -version = "0.9.42" -source = "git+https://github.com/paritytech//polkadot?branch=release-v0.9.42#6f991987c0b4cbbd7d4badc9ef08d83da5fefbfd" +version = "1.0.0" +source = "git+https://github.com/paritytech//polkadot?branch=release-v1.0.0#c9ec8c5a15959ce711bb60aa79add58f560d61e9" dependencies = [ "frame-support", "parity-scale-codec", @@ -16783,6 +17509,7 @@ dependencies = [ "sp-io", "sp-std", "xcm", + "xcm-builder", "xcm-executor", ] @@ -16806,7 +17533,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.22", + "time 0.3.27", ] [[package]] @@ -16826,7 +17553,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -16840,11 +17567,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.3+zstd.1.5.2" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" dependencies = [ - "zstd-safe 6.0.5+zstd.1.5.4", + "zstd-safe 6.0.6", ] [[package]] @@ -16859,9 +17586,9 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "6.0.5+zstd.1.5.4" +version = "6.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" +checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" dependencies = [ "libc", "zstd-sys", @@ -16877,3 +17604,68 @@ dependencies = [ "libc", "pkg-config", ] + +[[patch.unused]] +name = "asset-hub-kusama-runtime" +version = "0.9.420" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" + +[[patch.unused]] +name = "asset-hub-polkadot-runtime" +version = "0.9.420" +source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" + +[[patch.unused]] +name = "pallet-nfts" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" + +[[patch.unused]] +name = "pallet-nfts-runtime-api" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" + +[[patch.unused]] +name = "pallet-root-testing" +version = "1.0.0-dev" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" + +[[patch.unused]] +name = "pallet-uniques" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" + +[[patch.unused]] +name = "substrate-test-utils" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" + +[[patch.unused]] +name = "substrate-test-utils-derive" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" + +[[patch.unused]] +name = "fc-cli" +version = "1.0.0-dev" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" + +[[patch.unused]] +name = "fp-dynamic-fee" +version = "1.0.0" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" + +[[patch.unused]] +name = "pallet-dynamic-fee" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" + +[[patch.unused]] +name = "pallet-evm-test-vector-support" +version = "1.0.0-dev" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" + +[[patch.unused]] +name = "pallet-hotfix-sufficients" +version = "1.0.0" +source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" diff --git a/Cargo.toml b/Cargo.toml index 8d79b83b4d..f8a6f68401 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,260 +20,287 @@ incremental = false [profile.release] incremental = false - [patch."https://github.com/paritytech/substrate"] -frame-benchmarking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -frame-election-provider-support = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -frame-executive = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -frame-support = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -frame-support-procedural = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -frame-system = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -frame-system-benchmarking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -frame-try-runtime = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-aura = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-authorship = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-babe = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-balances = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-bounties = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-collective = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-democracy = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-grandpa = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-identity = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-im-online = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-indices = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-membership = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-mmr = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -mmr-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-nis = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-state-trie-migration = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-multisig = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-offences = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-offences-benchmarking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-proxy = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-recovery = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-scheduler = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-session = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-session-benchmarking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-society = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-staking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-staking-reward-fn = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-sudo = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-timestamp = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-tips = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-treasury = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-utility = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-vesting = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-authority-discovery = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-basic-authorship = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-block-builder = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-chain-spec = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-cli = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-client-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-client-db = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-consensus = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-consensus-aura = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-consensus-babe = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-consensus-slots = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-executor = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-executor-common = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-informant = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-keystore = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-network = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-network-gossip = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-network-common = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-offchain = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-peerset = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-rpc-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-rpc-server = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-service = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-telemetry = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-tracing = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-transaction-pool = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-utils = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-application-crypto = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-arithmetic = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-authority-discovery = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-block-builder = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-blockchain = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-consensus = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-consensus-aura = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-consensus-babe = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-consensus-slots = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-core = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-debug-derive = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-externalities = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-inherents = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-io = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-keyring = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-keystore = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-mmr-primitives = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-npos-elections = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-offchain = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-runtime = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-session = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-staking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-std = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-storage = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-timestamp = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-tracing = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-transaction-pool = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-trie = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-version = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-weights = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -try-runtime-cli = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-sysinfo = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-bags-list = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-beefy = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-beefy-mmr = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-child-bounties = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-election-provider-support-benchmarking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-nomination-pools = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-nomination-pools-benchmarking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-nomination-pools-runtime-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-preimage = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-conviction-voting = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-fast-unstake = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-ranked-collective = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-referenda = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-whitelist = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-network-light = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-network-sync = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -fork-tree = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -mmr-gadget = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-storage-monitor = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -binary-merkle-tree = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-staking-runtime-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-consensus-beefy = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-consensus-beefy-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-consensus-grandpa = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-consensus-grandpa-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sc-network-transactions = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-consensus-beefy = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -sp-consensus-grandpa = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-contracts = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } -pallet-contracts-primitives = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v0.9.42" } +binary-merkle-tree = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +frame-benchmarking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +frame-election-provider-support = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +frame-executive = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +frame-remote-externalities = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +frame-support = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +frame-support-procedural = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +frame-system = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +frame-system-benchmarking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +frame-try-runtime = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +mmr-gadget = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +mmr-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-asset-tx-payment = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-assets = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-aura = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-authorship = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-babe = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-bags-list = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-balances = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-beefy = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-beefy-mmr = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-bounties = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-child-bounties = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-collective = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-conviction-voting = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-democracy = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-election-provider-support-benchmarking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-fast-unstake = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-grandpa = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-identity = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-im-online = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-indices = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-membership = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-mmr = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-multisig = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-nfts = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-nfts-runtime-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-nis = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-nomination-pools = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-nomination-pools-benchmarking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-nomination-pools-runtime-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-offences = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-offences-benchmarking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-preimage = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-proxy = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-ranked-collective = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-recovery = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-referenda = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-root-testing = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-scheduler = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-session = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-session-benchmarking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-society = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-staking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-staking-reward-fn = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-staking-runtime-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-state-trie-migration = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-sudo = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-timestamp = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-tips = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-treasury = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-uniques = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-utility = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-vesting = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-whitelist = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-authority-discovery = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-basic-authorship = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-block-builder = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-chain-spec = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-cli = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-client-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-client-db = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-consensus = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-consensus-aura = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-consensus-babe = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-consensus-beefy = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-consensus-grandpa = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-consensus-grandpa-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-consensus-slots = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-executor = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-executor-common = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-informant = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-keystore = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-network = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-network-common = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-network-gossip = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-network-light = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-network-sync = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-network-transactions = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-offchain = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-rpc-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-rpc-server = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-service = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-storage-monitor = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-sysinfo = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-telemetry = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-tracing = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-transaction-pool = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-utils = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-application-crypto = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-arithmetic = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-block-builder = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sc-consensus-beefy-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-blockchain = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-consensus = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-consensus-aura = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-consensus-babe = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-consensus-beefy = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-consensus-grandpa = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-consensus-slots = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-debug-derive = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-externalities = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-inherents = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-io = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-keyring = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-keystore = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-mmr-primitives = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-npos-elections = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-offchain = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-runtime = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-session = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-staking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-state-machine = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-std = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-storage = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-timestamp = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-tracing = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-transaction-pool = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-trie = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-version = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-weights = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +substrate-test-client = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +substrate-test-utils = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +substrate-test-utils-derive = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +try-runtime-cli = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-glutton = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +sp-database = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-message-queue = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-contracts = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } +pallet-contracts-primitives = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } [patch."https://github.com/paritytech/polkadot"] -kusama-runtime = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -pallet-xcm = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-cli = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-client = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-node-core-av-store = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-node-subsystem-util = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-overseer = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-parachain = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-primitives = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-runtime = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-service = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -rococo-runtime = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -westend-runtime = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -xcm = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -xcm-builder = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -xcm-executor = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -xcm-simulator = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -pallet-xcm-benchmarks = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-availability-distribution = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-erasure-coding = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-network-bridge = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-node-jaeger = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -tracing-gum = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -tracing-gum-proc-macro = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-availability-recovery = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-collator-protocol = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-node-collation-generation = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-node-core-runtime-api = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-node-metrics = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } -polkadot-node-subsystem-types = { git = "https://github.com/paritytech//polkadot", branch = "release-v0.9.42" } +kusama-runtime = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +kusama-runtime-constants = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +pallet-xcm = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +pallet-xcm-benchmarks = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-cli = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-network-bridge = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-node-core-av-store = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-node-metrics = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-node-subsystem-util= { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-overseer = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-parachain = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-rpc = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-runtime = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-runtime-constants = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-service = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-test-runtime = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-test-service = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +rococo-runtime = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +test-runtime-constants = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +tracing-gum = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +westend-runtime = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +xcm = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +xcm-builder = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +xcm-executor = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +xcm-simulator = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-node-core-runtime-api = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-node-collation-generation = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-collator-protocol = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-availability-recovery = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } [patch."https://github.com/paritytech/cumulus"] -cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-client-network = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-client-service = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -parachain-info = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-client-collator = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } -cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v0.9.42" } +cumulus-client-collator = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-client-network = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-client-service = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +parachain-info = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +parachains-common = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +asset-hub-kusama-runtime = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +asset-hub-polkadot-runtime = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } +xcm-emulator = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } [patch."https://github.com/open-web3-stack/open-runtime-module-library"] -orml-asset-registry = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "ca05423f4f32be1d30765caacdc7d90130f5554a" } -orml-oracle = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "ca05423f4f32be1d30765caacdc7d90130f5554a" } -orml-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "ca05423f4f32be1d30765caacdc7d90130f5554a" } -orml-traits = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "ca05423f4f32be1d30765caacdc7d90130f5554a" } -orml-unknown-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "ca05423f4f32be1d30765caacdc7d90130f5554a" } -orml-utilities = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "ca05423f4f32be1d30765caacdc7d90130f5554a" } -orml-vesting = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "ca05423f4f32be1d30765caacdc7d90130f5554a" } -orml-xcm-support = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "ca05423f4f32be1d30765caacdc7d90130f5554a" } -orml-xcm = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "ca05423f4f32be1d30765caacdc7d90130f5554a" } -orml-xtokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "ca05423f4f32be1d30765caacdc7d90130f5554a" } +orml-asset-registry = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" } +orml-oracle = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" } +orml-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" } +orml-traits = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" } +orml-unknown-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" } +orml-utilities = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" } +orml-vesting = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" } +orml-xcm-support = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" } +orml-xcm = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" } +orml-xtokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" } [patch."https://github.com/paritytech/frontier"] -fc-consensus = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v0.9.42" } -fc-db = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v0.9.42" } -fc-mapping-sync = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v0.9.42" } -fc-rpc = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v0.9.42" } -fc-rpc-core = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v0.9.42" } -fc-storage = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v0.9.42" } - -fp-ethereum = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v0.9.42" } -fp-evm = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v0.9.42" } -fp-rpc = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v0.9.42" } -fp-self-contained = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v0.9.42" } - -pallet-base-fee = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v0.9.42" } -pallet-ethereum = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v0.9.42" } -pallet-evm = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v0.9.42" } -pallet-evm-chain-id = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v0.9.42" } -pallet-evm-precompile-dispatch = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v0.9.42" } +# ToDo: remove this if not required +#fc-api = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +fc-cli = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +fc-consensus = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +fc-db = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +fc-mapping-sync = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +fc-rpc = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +fc-rpc-core = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +fc-storage = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +# Frontier Primitive +fp-account = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +fp-consensus = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +fp-dynamic-fee = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +fp-ethereum = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +fp-evm = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +fp-rpc = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +fp-self-contained = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +fp-storage = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +# Frontier FRAME +pallet-base-fee = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +pallet-dynamic-fee = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +pallet-ethereum = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +pallet-evm = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +pallet-evm-chain-id = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +pallet-evm-precompile-modexp = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +pallet-evm-precompile-sha3fips = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +pallet-evm-precompile-simple = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +pallet-evm-test-vector-support = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } +pallet-hotfix-sufficients = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } diff --git a/README.md b/README.md index b242970f30..b02d5cddd0 100644 --- a/README.md +++ b/README.md @@ -152,6 +152,16 @@ cargo run --release --bin interbtc-parachain -- --dev To connect with a local relay-chain follow [these instructions](docs/rococo.md). +### Development node + +Running a development can be achieved without compiling the node with docker and `instant-seal`. Replace the release version with one of the available tags: + +```shell +docker run --network=host interlayhq/interbtc:RELEASE_TAG --dev --instant-seal +# Example +docker run --network=host interlayhq/interbtc:1.25.0-rc5 --dev --instant-seal +``` + #### Test Coverage Test coverage reports available under [docs/testcoverage.html](https://github.com/interlay/interbtc/blob/master/docs/testcoverage.html) diff --git a/crates/annuity/Cargo.toml b/crates/annuity/Cargo.toml index 3e5b48dbe1..3e7d3f60ce 100644 --- a/crates/annuity/Cargo.toml +++ b/crates/annuity/Cargo.toml @@ -6,7 +6,7 @@ name = "annuity" version = "1.0.0" [dependencies] -serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -35,7 +35,7 @@ reward = { path = "../reward", default-features = false } [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", "scale-info/std", diff --git a/crates/annuity/src/lib.rs b/crates/annuity/src/lib.rs index da6110ea49..e44db09987 100644 --- a/crates/annuity/src/lib.rs +++ b/crates/annuity/src/lib.rs @@ -24,6 +24,7 @@ use frame_support::{ weights::Weight, PalletId, }; +use frame_system::pallet_prelude::BlockNumberFor; use sp_runtime::traits::{AccountIdConversion, CheckedDiv, Convert, Saturating}; use sp_std::cmp::min; @@ -55,11 +56,11 @@ pub mod pallet { type BlockRewardProvider: BlockRewardProvider; /// Convert the block number into a balance. - type BlockNumberToBalance: Convert>; + type BlockNumberToBalance: Convert, BalanceOf>; /// The emission period for block rewards. #[pallet::constant] - type EmissionPeriod: Get; + type EmissionPeriod: Get>; /// The total amount of the wrapped asset. type TotalWrapped: Get>; @@ -79,8 +80,8 @@ pub mod pallet { pub enum Error {} #[pallet::hooks] - impl, I: 'static> Hooks for Pallet { - fn on_initialize(n: T::BlockNumber) -> Weight { + impl, I: 'static> Hooks> for Pallet { + fn on_initialize(n: BlockNumberFor) -> Weight { if let Err(e) = Self::begin_block(n) { sp_runtime::print(e); } @@ -154,7 +155,7 @@ impl, I: 'static> Pallet { } } - pub(crate) fn begin_block(_height: T::BlockNumber) -> DispatchResult { + pub(crate) fn begin_block(_height: BlockNumberFor) -> DispatchResult { let reward_per_block = Self::min_reward_per_block(); Self::deposit_event(Event::::BlockReward(reward_per_block)); T::BlockRewardProvider::distribute_block_reward(&Self::account_id(), reward_per_block) diff --git a/crates/annuity/src/mock.rs b/crates/annuity/src/mock.rs index 60f8094d72..73554e6cca 100644 --- a/crates/annuity/src/mock.rs +++ b/crates/annuity/src/mock.rs @@ -1,4 +1,4 @@ -use crate::{self as annuity, BlockRewardProvider, Config}; +use crate::{self as annuity, BlockRewardProvider, Config, Convert}; use frame_support::{ parameter_types, traits::{ConstU32, Everything}, @@ -7,24 +7,17 @@ use frame_support::{ pub use primitives::{CurrencyId, CurrencyId::Token, SignedFixedPoint, TokenSymbol::*}; use sp_core::H256; use sp_runtime::{ - generic::Header as GenericHeader, - traits::{BlakeTwo256, Identity, IdentityLookup}, - DispatchError, DispatchResult, + traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, DispatchError, DispatchResult, }; -type Header = GenericHeader; - -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Balances: pallet_balances::{Pallet, Call, Storage, Event}, Rewards: reward::{Pallet, Call, Storage, Event}, Annuity: annuity::{Pallet, Call, Storage, Event}, @@ -33,8 +26,7 @@ frame_support::construct_runtime!( pub type AccountId = u64; pub type Balance = u128; -pub type BlockNumber = u128; -pub type Index = u64; +pub type BlockNumber = u64; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -48,13 +40,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = Index; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -82,7 +73,7 @@ impl pallet_balances::Config for Test { type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxFreezes = (); type MaxHolds = (); @@ -133,12 +124,19 @@ parameter_types! { pub const TotalWrapped: Balance = 100000000; // 1 BTC } +pub struct BlockNumberToBalance; +impl Convert for BlockNumberToBalance { + fn convert(a: BlockNumber) -> Balance { + a.into() + } +} + impl Config for Test { type AnnuityPalletId = AnnuityPalletId; type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BlockRewardProvider = MockBlockRewardProvider; - type BlockNumberToBalance = Identity; + type BlockNumberToBalance = BlockNumberToBalance; type EmissionPeriod = EmissionPeriod; type TotalWrapped = TotalWrapped; type WeightInfo = (); @@ -148,7 +146,7 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build() -> sp_io::TestExternalities { - let storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); storage.into() } diff --git a/crates/annuity/src/tests.rs b/crates/annuity/src/tests.rs index fde7d27ffc..0d79c1c0d3 100644 --- a/crates/annuity/src/tests.rs +++ b/crates/annuity/src/tests.rs @@ -8,19 +8,31 @@ fn should_calculate_emission_rewards() { run_test(|| { >::make_free_balance_be(&Annuity::account_id(), YEAR_1_REWARDS); Annuity::update_reward_per_block(); - assert_eq!(Annuity::reward_per_block(), YEAR_1_REWARDS / EmissionPeriod::get()); + assert_eq!( + Annuity::reward_per_block(), + YEAR_1_REWARDS / EmissionPeriod::get() as u128 + ); >::make_free_balance_be(&Annuity::account_id(), YEAR_2_REWARDS); Annuity::update_reward_per_block(); - assert_eq!(Annuity::reward_per_block(), YEAR_2_REWARDS / EmissionPeriod::get()); + assert_eq!( + Annuity::reward_per_block(), + YEAR_2_REWARDS / EmissionPeriod::get() as u128 + ); >::make_free_balance_be(&Annuity::account_id(), YEAR_3_REWARDS); Annuity::update_reward_per_block(); - assert_eq!(Annuity::reward_per_block(), YEAR_3_REWARDS / EmissionPeriod::get()); + assert_eq!( + Annuity::reward_per_block(), + YEAR_3_REWARDS / EmissionPeriod::get() as u128 + ); >::make_free_balance_be(&Annuity::account_id(), YEAR_4_REWARDS); Annuity::update_reward_per_block(); - assert_eq!(Annuity::reward_per_block(), YEAR_4_REWARDS / EmissionPeriod::get()); + assert_eq!( + Annuity::reward_per_block(), + YEAR_4_REWARDS / EmissionPeriod::get() as u128 + ); }) } @@ -29,7 +41,10 @@ fn should_set_reward_per_wrapped() { run_test(|| { >::make_free_balance_be(&Annuity::account_id(), YEAR_1_REWARDS); Annuity::update_reward_per_block(); - assert_eq!(Annuity::min_reward_per_block(), YEAR_1_REWARDS / EmissionPeriod::get()); + assert_eq!( + Annuity::min_reward_per_block(), + YEAR_1_REWARDS / EmissionPeriod::get() as u128 + ); let reward_per_wrapped = 100; assert_ok!(Annuity::set_reward_per_wrapped( RuntimeOrigin::root(), diff --git a/crates/bitcoin/Cargo.toml b/crates/bitcoin/Cargo.toml index da310e6bc8..da67ab2d75 100644 --- a/crates/bitcoin/Cargo.toml +++ b/crates/bitcoin/Cargo.toml @@ -7,14 +7,15 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } -impl-serde = { version = "0.3.1", default-features = false, optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } +impl-serde = { version = "0.3.1", default-features = false } sha2 = { version = "0.8.2", default-features = false } hex = { version = "0.4.2", default-features = false } spin = { version = "0.7.1", default-features = false } primitive-types = { version = "0.12.1", default-features = false, features = ["codec", "scale-info"] } bitcoin_hashes = { version = "0.7.3", default-features = false } secp256k1 = { package = "secp256k1", git = "https://github.com/rust-bitcoin/rust-secp256k1", rev = "8e61874", default-features = false } +rust-bitcoin = { package = "bitcoin", version = "0.30.1", default-features = false, features = ["no-std"], optional = true } [dev-dependencies] mocktopus = "0.8.0" @@ -25,17 +26,18 @@ frame-support = { git = "https://github.com/paritytech/substrate", branch = "pol default = ["std"] std = [ "codec/std", + "impl-serde/std", "scale-info/std", - "serde", - "impl-serde", + "serde/std", "sha2/std", "hex/alloc", "primitive-types/std", - "primitive-types/serde", "secp256k1/std", + "rust-bitcoin?/std" ] parser = [] runtime-benchmarks = [] +bitcoin-types-compat = ["rust-bitcoin", "parser"] [[example]] name = "parse-transaction" diff --git a/crates/bitcoin/src/address.rs b/crates/bitcoin/src/address.rs index 28809257cd..43edece67d 100644 --- a/crates/bitcoin/src/address.rs +++ b/crates/bitcoin/src/address.rs @@ -3,6 +3,7 @@ use bitcoin_hashes::{hash160::Hash as Hash160, Hash}; use codec::{Decode, Encode, MaxEncodedLen}; use primitive_types::{H160, H256}; use scale_info::TypeInfo; +use serde::{Deserialize, Serialize}; use sha2::{Digest, Sha256}; #[cfg(not(feature = "std"))] @@ -13,8 +14,10 @@ use secp256k1::{constants::PUBLIC_KEY_SIZE, Error as Secp256k1Error, PublicKey a /// A Bitcoin address is a serialized identifier that represents the destination for a payment. /// Address prefixes are used to indicate the network as well as the format. Since the Parachain /// follows SPV assumptions we do not need to know which network a payment is included in. -#[derive(Encode, Decode, Clone, Ord, PartialOrd, PartialEq, Eq, Debug, Copy, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize, std::hash::Hash))] +#[derive( + Serialize, Deserialize, Encode, Decode, Clone, Ord, PartialOrd, PartialEq, Eq, Debug, Copy, TypeInfo, MaxEncodedLen, +)] +#[cfg_attr(feature = "std", derive(std::hash::Hash))] pub enum Address { // input: {signature} {pubkey} // output: OP_DUP OP_HASH160 {hash160(pubkey)} OP_EQUALVERIFY OP_CHECKSIG @@ -150,7 +153,6 @@ impl From<[u8; PUBLIC_KEY_SIZE]> for PublicKey { } } -#[cfg(feature = "std")] impl serde::Serialize for PublicKey { fn serialize(&self, serializer: S) -> Result where @@ -161,7 +163,6 @@ impl serde::Serialize for PublicKey { } } -#[cfg(feature = "std")] impl<'de> serde::Deserialize<'de> for PublicKey { fn deserialize(deserializer: D) -> Result where diff --git a/crates/bitcoin/src/compat.rs b/crates/bitcoin/src/compat.rs new file mode 100644 index 0000000000..940229e3f5 --- /dev/null +++ b/crates/bitcoin/src/compat.rs @@ -0,0 +1,119 @@ +//! Provides conversions between rust-bitcoin and interbtc types. +//! Please note that these operations involve (unbounded) re-encoding +//! and decoding so may be expensive to use. + +use crate::{formatter::TryFormat, parser::Parsable}; +use rust_bitcoin::consensus::{Decodable, Encodable}; + +pub use rust_bitcoin; + +#[cfg(not(feature = "std"))] +use alloc::vec::Vec; + +#[derive(Debug)] +pub enum ConversionError { + ParsingError, + FormattingError, +} + +/// Macro to implement type conversion from interbtc types to rust-bitcoin, using consensus encoding +macro_rules! impl_bitcoin_conversion { + ($a:path, $b:path) => { + impl TryFrom<$a> for $b { + type Error = ConversionError; + fn try_from(value: $a) -> Result { + let mut bytes = Vec::::new(); + value + .try_format(&mut bytes) + .map_err(|_| ConversionError::FormattingError)?; + let result = Self::consensus_decode_from_finite_reader(&mut &bytes[..]) + .map_err(|_| ConversionError::ParsingError)?; + Ok(result) + } + } + }; +} + +/// Macro to implement type conversion to interbtc types from rust-bitcoin, using consensus encoding +macro_rules! impl_interbtc_conversion { + ($a:path, $b:path) => { + impl TryFrom<$b> for $a { + type Error = ConversionError; + fn try_from(value: $b) -> Result { + let mut data: Vec = Vec::new(); + value + .consensus_encode(&mut data) + .map_err(|_| ConversionError::FormattingError)?; + let result = Self::parse(&data, 0).map_err(|_| ConversionError::ParsingError)?; + Ok(result.0) + } + } + }; +} + +macro_rules! impl_bidirectional_conversions { + ($a:path, $b:path) => { + impl_bitcoin_conversion!($a, $b); + impl_interbtc_conversion!($a, $b); + }; +} + +// NOTE: rust_bitcoin::Script exists but we can't convert to that because it's unsized +impl_bitcoin_conversion!(crate::Script, rust_bitcoin::ScriptBuf); + +// Transaction conversions +impl_bidirectional_conversions!(crate::types::Transaction, rust_bitcoin::Transaction); + +// Payload -> Address +impl TryFrom for crate::Address { + type Error = ConversionError; + fn try_from(value: rust_bitcoin::address::Payload) -> Result { + let bitcoin_script = value.script_pubkey(); + let bitcoin_script_bytes = bitcoin_script.to_bytes(); + let interlay_script = crate::Script::from(bitcoin_script_bytes); + crate::Address::from_script_pub_key(&interlay_script).map_err(|_| ConversionError::ParsingError) + } +} + +// Address -> Payload +impl TryFrom for rust_bitcoin::address::Payload { + type Error = ConversionError; + fn try_from(value: crate::Address) -> Result { + let interlay_script = value.to_script_pub_key(); + let bitcoin_script = rust_bitcoin::blockdata::script::Script::from_bytes(interlay_script.as_bytes()); + rust_bitcoin::address::Payload::from_script(&bitcoin_script).map_err(|_| ConversionError::ParsingError) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::parser::parse_transaction; + + #[test] + fn test_transaction_compat() { + // txid eb3db053cd139147f2fd676cf59a491fd5aebc54bddfde829704585b659126fc + let raw_tx = "0100000000010120e6fb8f0e2cfb8667a140a92d045d5db7c1b56635790bc907c3e71d43720a150e00000017160014641e441c2ba32dd7cf05afde7922144dd106b09bffffffff019dbd54000000000017a914bd847a4912984cf6152547feca51c1b9c2bcbe2787024830450221008f00033064c26cfca4dc98e5dba800b18729c3441dca37b49358ae0df9be7fad02202a81085318466ea66ef390d5dab6737e44a05f7f2e747932ebba917e0098f37d012102c109fc47335c3a2e206d462ad52590b1842aa9d6e0eb9c683c896fa8723590b400000000"; + let tx_bytes = hex::decode(&raw_tx).unwrap(); + let interlay_transaction = parse_transaction(&tx_bytes).unwrap(); + + let rust_bitcoin_transaction: rust_bitcoin::Transaction = interlay_transaction.clone().try_into().unwrap(); + + // check that the rust-bitcoin type encodes to the same bytes + let mut re_encoded_bytes: Vec = Vec::new(); + rust_bitcoin_transaction + .consensus_encode(&mut re_encoded_bytes) + .unwrap(); + assert_eq!(tx_bytes, re_encoded_bytes); + + // check that the conversion back works + assert_eq!(interlay_transaction, rust_bitcoin_transaction.try_into().unwrap()); + } + + #[test] + fn test_address_compat() { + let interbtc_address = crate::Address::P2WPKHv0(primitive_types::H160([1; 20])); + let rust_bitcoin_address: rust_bitcoin::address::Payload = interbtc_address.clone().try_into().unwrap(); + assert_eq!(interbtc_address, rust_bitcoin_address.try_into().unwrap()); + } +} diff --git a/crates/bitcoin/src/formatter.rs b/crates/bitcoin/src/formatter.rs index 5987d64535..e7ad33b5a4 100644 --- a/crates/bitcoin/src/formatter.rs +++ b/crates/bitcoin/src/formatter.rs @@ -103,10 +103,10 @@ impl TryFormat for CompactUint { fn try_format(&self, w: &mut W) -> Result<(), Error> { if self.value < 0xfd { (self.value as u8).try_format(w)?; - } else if self.value < u16::max_value() as u64 { + } else if self.value < u16::MAX as u64 { 0xfd_u8.try_format(w)?; (self.value as u16).try_format(w)?; - } else if self.value < u32::max_value() as u64 { + } else if self.value < u32::MAX as u64 { 0xfe_u8.try_format(w)?; (self.value as u32).try_format(w)?; } else { @@ -136,7 +136,7 @@ where impl TryFormat for TransactionInput { fn try_format(&self, w: &mut W) -> Result<(), Error> { let (previous_hash, previous_index) = match self.source { - TransactionInputSource::Coinbase(_) => (H256Le::zero(), u32::max_value()), + TransactionInputSource::Coinbase(_) => (H256Le::zero(), u32::MAX), TransactionInputSource::FromOutput(hash, index) => (hash, index), }; previous_hash.try_format(w)?; @@ -304,7 +304,7 @@ mod tests { assert_eq!(try_format(256u16), [0, 1]); assert_eq!(try_format(0xffffu32 + 1), [0, 0, 1, 0]); assert_eq!(try_format(0xffffffu32 + 1), [0, 0, 0, 1]); - assert_eq!(try_format(u64::max_value()), [0xff].repeat(8)); + assert_eq!(try_format(u64::MAX), [0xff].repeat(8)); } #[test] @@ -313,9 +313,7 @@ mod tests { assert_eq!(try_format(CompactUint { value: 0xff }), [0xfd, 0xff, 0]); let u32_cuint = CompactUint { value: 0xffff + 1 }; assert_eq!(try_format(u32_cuint), [0xfe, 0, 0, 1, 0]); - let u64_cuint = CompactUint { - value: u64::max_value(), - }; + let u64_cuint = CompactUint { value: u64::MAX }; assert_eq!(try_format(u64_cuint), [0xff].repeat(9)); } diff --git a/crates/bitcoin/src/lib.rs b/crates/bitcoin/src/lib.rs index 90115bcd7d..e0b8a3b79a 100644 --- a/crates/bitcoin/src/lib.rs +++ b/crates/bitcoin/src/lib.rs @@ -45,6 +45,9 @@ pub mod formatter; #[cfg(any(feature = "parser", test))] pub mod parser; +#[cfg(feature = "bitcoin-types-compat")] +pub mod compat; + pub mod utils; pub mod pow; diff --git a/crates/bitcoin/src/parser.rs b/crates/bitcoin/src/parser.rs index f57345eda2..e684e66db7 100644 --- a/crates/bitcoin/src/parser.rs +++ b/crates/bitcoin/src/parser.rs @@ -110,6 +110,68 @@ impl Parsable for Vec { } } +impl Parsable for Transaction { + fn parse(raw_bytes: &[u8], position: usize) -> Result<(Transaction, usize), Error> { + let slice = raw_bytes.get(position..).ok_or(Error::EndOfFile)?; + let mut parser = BytesParser::new(slice); + let version: i32 = parser.parse()?; + + // fail if incorrect version: we only support version 1 and 2 + if version != 1 && version != 2 { + return Err(Error::MalformedTransaction); + } + + let allow_witness = (version & SERIALIZE_TRANSACTION_NO_WITNESS) == 0; + + // TODO: bound maximum? + let mut inputs: Vec = parser.parse_with(version)?; + + let mut flags: u8 = 0; + if inputs.is_empty() && allow_witness { + flags = parser.parse()?; + inputs = parser.parse_with(version)?; + } + + // TODO: bound maximum? + let outputs: Vec = parser.parse()?; + + if (flags & 1) != 0 && allow_witness { + flags ^= 1; + for input in &mut inputs { + input.with_witness(parser.parse()?); + } + + if inputs.iter().all(|input| input.witness.is_empty()) { + // A transaction with a set witness-flag must actually include witnesses in the transaction. + // see https://github.com/bitcoin/bitcoin/blob/be4171679b8eab8205e04ff86140329bd67878a0/src/primitives/transaction.h#L214-L217 + return Err(Error::MalformedTransaction); + } + } + + // https://en.bitcoin.it/wiki/NLockTime + let locktime_or_blockheight: u32 = parser.parse()?; + let lock_at = if locktime_or_blockheight < LOCKTIME_THRESHOLD { + LockTime::BlockHeight(locktime_or_blockheight) + } else { + LockTime::Time(locktime_or_blockheight) + }; + + if flags != 0 { + return Err(Error::MalformedTransaction); + } + + Ok(( + Transaction { + version, + inputs, + outputs, + lock_at, + }, + parser.position, + )) + } +} + impl ParsableMeta for TransactionInput { fn parse_with(raw_bytes: &[u8], position: usize, version: i32) -> Result<(TransactionInput, usize), Error> { let slice = raw_bytes.get(position..).ok_or(Error::EndOfFile)?; @@ -270,59 +332,7 @@ pub fn parse_compact_uint(varint: &[u8]) -> Result<(u64, usize), Error> { /// /// * `raw_transaction` - the raw bytes of the transaction pub fn parse_transaction(raw_transaction: &[u8]) -> Result { - let mut parser = BytesParser::new(raw_transaction); - let version: i32 = parser.parse()?; - - // fail if incorrect version: we only support version 1 and 2 - if version != 1 && version != 2 { - return Err(Error::MalformedTransaction); - } - - let allow_witness = (version & SERIALIZE_TRANSACTION_NO_WITNESS) == 0; - - // TODO: bound maximum? - let mut inputs: Vec = parser.parse_with(version)?; - - let mut flags: u8 = 0; - if inputs.is_empty() && allow_witness { - flags = parser.parse()?; - inputs = parser.parse_with(version)?; - } - - // TODO: bound maximum? - let outputs: Vec = parser.parse()?; - - if (flags & 1) != 0 && allow_witness { - flags ^= 1; - for input in &mut inputs { - input.with_witness(parser.parse()?); - } - - if inputs.iter().all(|input| input.witness.is_empty()) { - // A transaction with a set witness-flag must actually include witnesses in the transaction. - // see https://github.com/bitcoin/bitcoin/blob/be4171679b8eab8205e04ff86140329bd67878a0/src/primitives/transaction.h#L214-L217 - return Err(Error::MalformedTransaction); - } - } - - // https://en.bitcoin.it/wiki/NLockTime - let locktime_or_blockheight: u32 = parser.parse()?; - let lock_at = if locktime_or_blockheight < LOCKTIME_THRESHOLD { - LockTime::BlockHeight(locktime_or_blockheight) - } else { - LockTime::Time(locktime_or_blockheight) - }; - - if flags != 0 { - return Err(Error::MalformedTransaction); - } - - Ok(Transaction { - version, - inputs, - outputs, - lock_at, - }) + Transaction::parse(raw_transaction, 0).map(|(tx, _len)| tx) } /// Parses a transaction input @@ -336,7 +346,7 @@ fn parse_transaction_input(raw_input: &[u8], version: i32) -> Result<(Transactio // fail if transaction is coinbase and previous index is not 0xffffffff // previous_hash - if is_coinbase && previous_index != u32::max_value() { + if is_coinbase && previous_index != u32::MAX { return Err(Error::MalformedTransaction); } @@ -549,7 +559,7 @@ pub(crate) mod tests { let previous_hash = H256Le::from_hex_le("7b1eabe0209b1fe794124575ef807057c77ada2138ae4fa8d6c4de0398a14f3f"); assert!(matches!(input.source, TransactionInputSource::FromOutput(hash, 0) if hash == previous_hash)); - assert_eq!(input.sequence, u32::max_value()); + assert_eq!(input.sequence, u32::MAX); assert_eq!(input.script.len(), 73); } diff --git a/crates/bitcoin/src/pow.rs b/crates/bitcoin/src/pow.rs index f0727cedeb..4159731662 100644 --- a/crates/bitcoin/src/pow.rs +++ b/crates/bitcoin/src/pow.rs @@ -10,12 +10,7 @@ pub const TARGET_TIMESPAN_DIVISOR: u64 = 4; /// Unrounded Maximum Target /// 0x00000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -pub const UNROUNDED_MAX_TARGET: U256 = U256([ - ::max_value(), - ::max_value(), - ::max_value(), - 0x0000_0000_ffff_ffffu64, -]); +pub const UNROUNDED_MAX_TARGET: U256 = U256([::MAX, ::MAX, ::MAX, 0x0000_0000_ffff_ffffu64]); // https://github.com/bitcoin/bitcoin/blob/89b910711c004c21b7d67baa888073742f7f94f0/src/pow.cpp#L49-L72 pub fn calculate_next_work_required( diff --git a/crates/bitcoin/src/script.rs b/crates/bitcoin/src/script.rs index 6fc9510323..6e1d3adb08 100644 --- a/crates/bitcoin/src/script.rs +++ b/crates/bitcoin/src/script.rs @@ -42,6 +42,15 @@ impl Script { } } + // If the most significant byte is >= 0x80 and the value is positive, push a + // new zero-byte to make the significant byte < 0x80 again. + // See https://github.com/bitcoin/bitcoin/blob/b565485c24c0feacae559a7f6f7b83d7516ca58d/src/script/script.h#L360-L373 + if let Some(x) = height_bytes.last() { + if (x & 0x80) != 0 { + height_bytes.push(0); + } + } + // note: formatting the height_bytes vec automatically prepends the length of the vec, so no need // to append it manually script.append(height_bytes); @@ -147,6 +156,16 @@ impl std::convert::TryFrom<&str> for Script { #[test] fn test_script_height() { assert_eq!(Script::height(7).bytes, vec![1, 7]); + // 2^7 boundary + assert_eq!(Script::height(127).bytes, vec![1, 127]); + assert_eq!(Script::height(128).bytes, vec![2, 128, 0]); + // 2^8 boundary + assert_eq!(Script::height(255).bytes, vec![2, 0xff, 0x00]); assert_eq!(Script::height(256).bytes, vec![2, 0x00, 0x01]); + // 2^15 boundary + assert_eq!(Script::height(32767).bytes, vec![2, 0xff, 0x7f]); + assert_eq!(Script::height(32768).bytes, vec![3, 0x00, 0x80, 0x00]); + // 2^16 boundary + assert_eq!(Script::height(65535).bytes, vec![3, 0xff, 0xff, 0x00]); assert_eq!(Script::height(65536).bytes, vec![3, 0x00, 0x00, 0x01]); } diff --git a/crates/bitcoin/src/types.rs b/crates/bitcoin/src/types.rs index 42e9f01dfc..1fa46b57e6 100644 --- a/crates/bitcoin/src/types.rs +++ b/crates/bitcoin/src/types.rs @@ -19,7 +19,6 @@ use alloc::{vec, vec::Vec}; #[cfg(feature = "std")] use codec::alloc::string::String; -#[cfg(feature = "std")] use serde::{Deserialize, Serialize}; /// We also check the coinbase proof in order to defend against the 'leaf-node weakness'. @@ -565,7 +564,7 @@ fn generate_coinbase_transaction( input_builder .with_source(TransactionInputSource::Coinbase(Some(height))) .add_witness(&[0; 32]) - .with_sequence(u32::max_value()); + .with_sequence(u32::MAX); if let Some(script) = input_script { input_builder.with_script(&script); } @@ -591,8 +590,9 @@ pub struct BlockChain { } /// Represents a bitcoin 32 bytes hash digest encoded in little-endian -#[derive(Encode, Decode, Default, PartialEq, Eq, Clone, Copy, Debug, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive( + Serialize, Deserialize, Encode, Decode, Default, PartialEq, Eq, Clone, Copy, Debug, TypeInfo, MaxEncodedLen, +)] pub struct H256Le { content: [u8; 32], } diff --git a/crates/btc-relay/src/ext.rs b/crates/btc-relay/src/ext.rs index 09afc87679..861698c88d 100644 --- a/crates/btc-relay/src/ext.rs +++ b/crates/btc-relay/src/ext.rs @@ -4,19 +4,20 @@ use mocktopus::macros::mockable; #[cfg_attr(test, mockable)] pub(crate) mod security { use frame_support::dispatch::DispatchError; + use frame_system::pallet_prelude::BlockNumberFor; #[cfg(feature = "runtime-benchmarks")] - pub fn set_active_block_number(n: T::BlockNumber) { + pub fn set_active_block_number(n: BlockNumberFor) { >::set_active_block_number(n) } - pub fn active_block_number() -> T::BlockNumber { + pub fn active_block_number() -> BlockNumberFor { >::active_block_number() } pub fn parachain_block_expired( - opentime: T::BlockNumber, - period: T::BlockNumber, + opentime: BlockNumberFor, + period: BlockNumberFor, ) -> Result { >::parachain_block_expired(opentime, period) } diff --git a/crates/btc-relay/src/lib.rs b/crates/btc-relay/src/lib.rs index 6162d7441f..0b4c4f3701 100644 --- a/crates/btc-relay/src/lib.rs +++ b/crates/btc-relay/src/lib.rs @@ -99,11 +99,11 @@ pub mod pallet { type WeightInfo: WeightInfo; #[pallet::constant] - type ParachainBlocksPerBitcoinBlock: Get<::BlockNumber>; + type ParachainBlocksPerBitcoinBlock: Get>; } #[pallet::hooks] - impl Hooks for Pallet {} + impl Hooks> for Pallet {} #[pallet::call] impl Pallet { @@ -316,12 +316,14 @@ pub mod pallet { WrongForkBound, /// Weight bound exceeded BoundExceeded, + /// Coinbase tx must be the first transaction in the block + InvalidCoinbasePosition, } /// Store Bitcoin block headers #[pallet::storage] pub(super) type BlockHeaders = - StorageMap<_, Blake2_128Concat, H256Le, RichBlockHeader, ValueQuery>; + StorageMap<_, Blake2_128Concat, H256Le, RichBlockHeader>, ValueQuery>; /// Priority queue of BlockChain elements, ordered by the maximum height (descending). /// The first index into this mapping (0) is considered to be the longest chain. The value @@ -364,7 +366,7 @@ pub mod pallet { /// Global security parameter k for stable Parachain transactions #[pallet::storage] #[pallet::getter(fn parachain_confirmations)] - pub(super) type StableParachainConfirmations = StorageValue<_, T::BlockNumber, ValueQuery>; + pub(super) type StableParachainConfirmations = StorageValue<_, BlockNumberFor, ValueQuery>; /// Whether the module should perform difficulty checks. #[pallet::storage] @@ -377,31 +379,20 @@ pub mod pallet { pub(super) type DisableInclusionCheck = StorageValue<_, bool, ValueQuery>; #[pallet::genesis_config] + #[derive(frame_support::DefaultNoBound)] pub struct GenesisConfig { /// Global security parameter k for stable Bitcoin transactions pub bitcoin_confirmations: u32, /// Global security parameter k for stable Parachain transactions - pub parachain_confirmations: T::BlockNumber, + pub parachain_confirmations: BlockNumberFor, /// Whether the module should perform difficulty checks. pub disable_difficulty_check: bool, /// Whether the module should perform inclusion checks. pub disable_inclusion_check: bool, } - #[cfg(feature = "std")] - impl Default for GenesisConfig { - fn default() -> Self { - Self { - bitcoin_confirmations: Default::default(), - parachain_confirmations: Default::default(), - disable_difficulty_check: Default::default(), - disable_inclusion_check: Default::default(), - } - } - } - #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { StableBitcoinConfirmations::::put(self.bitcoin_confirmations); StableParachainConfirmations::::put(self.parachain_confirmations); @@ -424,15 +415,11 @@ pub const ACCEPTED_MAX_TRANSACTION_OUTPUTS: usize = 3; /// Unrounded Maximum Target /// 0x00000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -pub const UNROUNDED_MAX_TARGET: U256 = U256([ - ::max_value(), - ::max_value(), - ::max_value(), - 0x0000_0000_ffff_ffffu64, -]); +pub const UNROUNDED_MAX_TARGET: U256 = U256([::MAX, ::MAX, ::MAX, 0x0000_0000_ffff_ffffu64]); /// Main chain id pub const MAIN_CHAIN_ID: u32 = 0; +use frame_system::pallet_prelude::BlockNumberFor; #[cfg_attr(test, mockable)] impl Pallet { @@ -608,6 +595,14 @@ impl Pallet { let user_proof_result = Self::verify_merkle_proof(unchecked_transaction.user_tx_proof)?; let coinbase_proof_result = Self::verify_merkle_proof(unchecked_transaction.coinbase_proof)?; + // make sure the the coinbase tx is the first tx in the block. Otherwise a fake coinbase + // could be included in a leaf-node attack. Related: + // https://bitslog.com/2018/06/09/leaf-node-weakness-in-bitcoin-merkle-tree-design/ . + ensure!( + coinbase_proof_result.transaction_position == 0, + Error::::InvalidCoinbasePosition + ); + // Make sure the coinbase tx is for the same block as the user tx ensure!( user_proof_result.extracted_root == coinbase_proof_result.extracted_root, @@ -696,20 +691,20 @@ impl Pallet { } pub fn has_request_expired( - opentime: T::BlockNumber, + opentime: BlockNumberFor, btc_open_height: u32, - period: T::BlockNumber, + period: BlockNumberFor, ) -> Result { Ok(ext::security::parachain_block_expired::(opentime, period)? && Self::bitcoin_block_expired(btc_open_height, period)?) } - pub fn bitcoin_expiry_height(btc_open_height: u32, period: T::BlockNumber) -> Result { + pub fn bitcoin_expiry_height(btc_open_height: u32, period: BlockNumberFor) -> Result { // calculate num_bitcoin_blocks as ceil(period / ParachainBlocksPerBitcoinBlock) let num_bitcoin_blocks: u32 = period .checked_add(&T::ParachainBlocksPerBitcoinBlock::get()) .ok_or(Error::::ArithmeticOverflow)? - .checked_sub(&T::BlockNumber::one()) + .checked_sub(&BlockNumberFor::::one()) .ok_or(Error::::ArithmeticUnderflow)? .checked_div(&T::ParachainBlocksPerBitcoinBlock::get()) .ok_or(Error::::ArithmeticUnderflow)? @@ -721,7 +716,7 @@ impl Pallet { .ok_or(Error::::ArithmeticOverflow)?) } - pub fn bitcoin_block_expired(btc_open_height: u32, period: T::BlockNumber) -> Result { + pub fn bitcoin_block_expired(btc_open_height: u32, period: BlockNumberFor) -> Result { let expiration_height = Self::bitcoin_expiry_height(btc_open_height, period)?; // Note that we check stictly greater than. This ensures that at least @@ -787,7 +782,7 @@ impl Pallet { } /// Get a block header from its hash - fn get_block_header_from_hash(block_hash: H256Le) -> Result, DispatchError> { + fn get_block_header_from_hash(block_hash: H256Le) -> Result>, DispatchError> { BlockHeaders::::try_get(block_hash).or(Err(Error::::BlockNotFound.into())) } @@ -800,7 +795,7 @@ impl Pallet { fn get_block_header_from_height( blockchain: &BlockChain, block_height: u32, - ) -> Result, DispatchError> { + ) -> Result>, DispatchError> { let block_hash = Self::get_block_hash(blockchain.chain_id, block_height)?; Self::get_block_header_from_hash(block_hash) } @@ -828,7 +823,7 @@ impl Pallet { } /// Set a new block header - fn set_block_header_from_hash(hash: H256Le, header: &RichBlockHeader) { + fn set_block_header_from_hash(hash: H256Le, header: &RichBlockHeader>) { BlockHeaders::::insert(hash, header); } @@ -942,7 +937,7 @@ impl Pallet { fn verify_block_header( block_header: &BlockHeader, block_height: u32, - prev_block_header: RichBlockHeader, + prev_block_header: RichBlockHeader>, ) -> Result<(), DispatchError> { // Check that the block header is not yet stored in BTC-Relay ensure!( @@ -976,7 +971,7 @@ impl Pallet { /// * `prev_block_header`: previous block header /// * `block_height` : block height of new target fn compute_new_target( - prev_block_header: &RichBlockHeader, + prev_block_header: &RichBlockHeader>, block_height: u32, ) -> Result { // time of last retarget (first block in current difficulty period) @@ -1100,7 +1095,7 @@ impl Pallet { /// Transfers the given block to the main chain. If this would overwrite a block already in the /// main chain, then the overwritten block is moved to to `chain_id_for_old_main_blocks`. fn swap_block_to_mainchain( - block: RichBlockHeader, + block: RichBlockHeader>, chain_id_for_old_main_blocks: u32, ) -> Result<(), DispatchError> { let block_height = block.block_height; @@ -1129,7 +1124,7 @@ impl Pallet { // returns (child, parent) fn enumerate_chain_links( start: H256Le, - ) -> impl Iterator, RichBlockHeader), DispatchError>> + ) -> impl Iterator>, RichBlockHeader>), DispatchError>> { let child = Self::get_block_header_from_hash(start); @@ -1307,7 +1302,7 @@ impl Pallet { /// # Arguments /// /// * `para_height` - height of the parachain when the block was stored - pub fn check_parachain_confirmations(para_height: T::BlockNumber) -> Result<(), DispatchError> { + pub fn check_parachain_confirmations(para_height: BlockNumberFor) -> Result<(), DispatchError> { let current_height = ext::security::active_block_number::(); ensure!( diff --git a/crates/btc-relay/src/mock.rs b/crates/btc-relay/src/mock.rs index e8f28cd2bc..ed6133338f 100644 --- a/crates/btc-relay/src/mock.rs +++ b/crates/btc-relay/src/mock.rs @@ -2,29 +2,25 @@ use crate as btc_relay; use crate::{Config, Error}; use frame_support::{ parameter_types, - traits::{ConstU32, Everything, GenesisBuild}, + traits::{ConstU32, Everything}, }; use mocktopus::mocking::clear_mocks; use sp_core::H256; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, }; pub const BITCOIN_CONFIRMATIONS: u32 = 6; pub const PARACHAIN_CONFIRMATIONS: u64 = 20; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, // Operational @@ -36,7 +32,6 @@ frame_support::construct_runtime!( pub type AccountId = u64; pub type BlockNumber = u64; pub type Moment = u64; -pub type Index = u64; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -50,13 +45,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = Index; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -103,7 +97,7 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build() -> sp_io::TestExternalities { - let mut storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let mut storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); btc_relay::GenesisConfig:: { bitcoin_confirmations: BITCOIN_CONFIRMATIONS, diff --git a/crates/btc-relay/src/tests.rs b/crates/btc-relay/src/tests.rs index ac65cf9526..c5bbc93113 100644 --- a/crates/btc-relay/src/tests.rs +++ b/crates/btc-relay/src/tests.rs @@ -1491,6 +1491,52 @@ fn get_chain_from_id_ok() { }); } +#[test] +fn fake_coinbase_gets_rejected() { + let target = U256::from(2).pow(254.into()); + let some_address = BtcAddress::P2PKH(H160::from_str(&"66c7060feb882664ae62ffad0051fe843e318e85").unwrap()); + + run_test(|| { + let transaction = TransactionBuilder::new() + .with_version(2) + .add_input(TransactionInputBuilder::new().build()) + .add_output(TransactionOutput::payment(100, &some_address.clone())) + .build(); + + // build a block with two coinbase transactions + let block = BlockBuilder::new() + .with_coinbase(&some_address, 50, 25) // this one will be index 1 + .with_coinbase(&some_address, 50, 0) // this one will be index 0 + .add_transaction(transaction) + .mine(target) + .unwrap(); + assert_ok!(BTCRelay::_initialize(3, block.header, 0)); + + let fake_coinbase = block.transactions[1].clone(); + let fake_coinbase_proof = block.merkle_proof(&[fake_coinbase.tx_id()]).unwrap(); + let user_tx = block.transactions[2].clone(); + let user_tx_proof = block.merkle_proof(&[user_tx.tx_id()]).unwrap(); + + let full_proof = FullTransactionProof { + coinbase_proof: PartialTransactionProof { + transaction: fake_coinbase, + tx_encoded_len: u32::MAX, + merkle_proof: fake_coinbase_proof, + }, + user_tx_proof: PartialTransactionProof { + transaction: user_tx, + tx_encoded_len: u32::MAX, + merkle_proof: user_tx_proof, + }, + }; + + assert_err!( + BTCRelay::_verify_transaction_inclusion(full_proof, Some(0)), + Error::::InvalidCoinbasePosition + ); + }) +} + #[test] fn store_generated_block_headers() { let target = U256::from(2).pow(254.into()); diff --git a/crates/clients-info/Cargo.toml b/crates/clients-info/Cargo.toml index 3166db3ab8..ca11399468 100644 --- a/crates/clients-info/Cargo.toml +++ b/crates/clients-info/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Interlay Ltd"] edition = "2021" [dependencies] -serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -28,7 +28,7 @@ frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", "scale-info/std", diff --git a/crates/clients-info/src/mock.rs b/crates/clients-info/src/mock.rs index 9cedd6a2ac..3ca6c594ea 100644 --- a/crates/clients-info/src/mock.rs +++ b/crates/clients-info/src/mock.rs @@ -6,29 +6,22 @@ use frame_support::{ }; use sp_core::H256; use sp_runtime::{ - generic::Header as GenericHeader, traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, }; -type Header = GenericHeader; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, ClientsInfo: clients_info::{Pallet, Call, Storage, Event} } ); pub type AccountId = u64; -pub type BlockNumber = u64; -pub type Index = u64; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -42,13 +35,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = Index; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -73,7 +65,7 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build() -> sp_io::TestExternalities { - let storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); storage.into() } diff --git a/crates/collator-selection/src/benchmarking.rs b/crates/collator-selection/src/benchmarking.rs index d112c83dd7..ded7bbcb3e 100644 --- a/crates/collator-selection/src/benchmarking.rs +++ b/crates/collator-selection/src/benchmarking.rs @@ -101,6 +101,7 @@ fn register_candidates(count: u32) { )] pub mod benchmarks { use super::*; + use frame_system::pallet_prelude::BlockNumberFor; #[benchmark] fn set_invulnerables(b: Linear<1, 100>) { @@ -202,7 +203,7 @@ pub mod benchmarks { >::put(BalanceOf::::max_value() / 4u32.into()); T::RewardsCurrency::make_free_balance_be(&>::account_id(), 2000u32.into()); let author = account("author", 0, SEED); - let new_block: T::BlockNumber = 10u32.into(); + let new_block: BlockNumberFor = 10u32.into(); frame_system::Pallet::::set_block_number(new_block); assert!(T::RewardsCurrency::free_balance(&author) == 0u32.into()); @@ -226,8 +227,8 @@ pub mod benchmarks { register_validators::(c); register_candidates::(c); - let new_block: T::BlockNumber = 1800u32.into(); - let zero_block: T::BlockNumber = 0u32.into(); + let new_block: BlockNumberFor = 1800u32.into(); + let zero_block: BlockNumberFor = 0u32.into(); let candidates = >::get(); let non_removals = c.saturating_sub(r); diff --git a/crates/collator-selection/src/lib.rs b/crates/collator-selection/src/lib.rs index d9062960bd..f2935777d4 100644 --- a/crates/collator-selection/src/lib.rs +++ b/crates/collator-selection/src/lib.rs @@ -61,7 +61,6 @@ pub mod pallet { use core::ops::Div; use frame_support::{ dispatch::{DispatchClass, DispatchResultWithPostInfo}, - inherent::Vec, pallet_prelude::*, sp_runtime::{ traits::{AccountIdConversion, CheckedSub, Saturating, Zero}, @@ -74,7 +73,7 @@ pub mod pallet { use pallet_session::SessionManager; use sp_runtime::traits::Convert; use sp_staking::SessionIndex; - + use sp_std::prelude::*; type BalanceOf = <::StakingCurrency as Currency<::AccountId>>::Balance; /// A convertor from collators id. Since this pallet does not have stash/controller, this is @@ -118,7 +117,7 @@ pub mod pallet { type MaxInvulnerables: Get; // Will be kicked if block is not produced in threshold. - type KickThreshold: Get; + type KickThreshold: Get>; /// A stable ID for a validator. type ValidatorId: Member + Parameter; @@ -161,7 +160,7 @@ pub mod pallet { /// Last block authored by collator. #[pallet::storage] #[pallet::getter(fn last_authored_block)] - pub type LastAuthoredBlock = StorageMap<_, Twox64Concat, T::AccountId, T::BlockNumber, ValueQuery>; + pub type LastAuthoredBlock = StorageMap<_, Twox64Concat, T::AccountId, BlockNumberFor, ValueQuery>; /// Desired number of candidates. /// @@ -178,27 +177,20 @@ pub mod pallet { pub type CandidacyBond = StorageValue<_, BalanceOf, ValueQuery>; #[pallet::genesis_config] + #[derive(frame_support::DefaultNoBound)] pub struct GenesisConfig { pub invulnerables: Vec, pub candidacy_bond: BalanceOf, pub desired_candidates: u32, } - #[cfg(feature = "std")] - impl Default for GenesisConfig { - fn default() -> Self { - Self { - invulnerables: Default::default(), - candidacy_bond: Default::default(), - desired_candidates: Default::default(), - } - } - } - #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { - let duplicate_invulnerables = self.invulnerables.iter().collect::>(); + let duplicate_invulnerables = self + .invulnerables + .iter() + .collect::>(); assert!( duplicate_invulnerables.len() == self.invulnerables.len(), "duplicate invulnerables in genesis." @@ -466,7 +458,7 @@ pub mod pallet { /// Keep track of number of authored blocks per authority, uncles are counted as well since /// they're a valid proof of being online. - impl pallet_authorship::EventHandler + impl pallet_authorship::EventHandler> for Pallet { fn note_author(author: T::AccountId) { diff --git a/crates/collator-selection/src/mock.rs b/crates/collator-selection/src/mock.rs index 4997a5ecc0..9fef536aad 100644 --- a/crates/collator-selection/src/mock.rs +++ b/crates/collator-selection/src/mock.rs @@ -17,29 +17,25 @@ use super::*; use crate as collator_selection; use frame_support::{ ord_parameter_types, parameter_types, - traits::{FindAuthor, GenesisBuild, ValidatorRegistration}, + traits::{FindAuthor, ValidatorRegistration}, PalletId, }; use frame_system as system; use frame_system::EnsureSignedBy; use sp_core::H256; use sp_runtime::{ - testing::{Header, UintAuthorityId}, - traits::{BlakeTwo256, IdentityLookup, OpaqueKeys}, - RuntimeAppPublic, + testing::UintAuthorityId, + traits::{BlakeTwo256, ConstBool, IdentityLookup, OpaqueKeys}, + BuildStorage, RuntimeAppPublic, }; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Config, Storage, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, Session: pallet_session::{Pallet, Call, Storage, Event, Config}, Aura: pallet_aura::{Pallet, Storage, Config}, @@ -61,13 +57,12 @@ impl system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = u64; - type BlockNumber = u64; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = u64; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -96,7 +91,7 @@ impl pallet_balances::Config for Test { type MaxLocks = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxFreezes = (); type MaxHolds = (); @@ -132,6 +127,7 @@ impl pallet_aura::Config for Test { type AuthorityId = sp_consensus_aura::sr25519::AuthorityId; type MaxAuthorities = MaxAuthorities; type DisabledValidators = (); + type AllowMultipleBlocksPerSlot = ConstBool; } sp_runtime::impl_opaque_keys! { @@ -226,7 +222,7 @@ impl Config for Test { pub fn new_test_ext() -> sp_io::TestExternalities { sp_tracing::try_init_simple(); - let mut t = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let mut t = frame_system::GenesisConfig::::default().build_storage().unwrap(); let invulnerables = vec![1, 2]; let balances = vec![(1, 100), (2, 100), (3, 100), (4, 100), (5, 100)]; diff --git a/crates/collator-selection/src/tests.rs b/crates/collator-selection/src/tests.rs index 71e6e62c06..d7d79bc246 100644 --- a/crates/collator-selection/src/tests.rs +++ b/crates/collator-selection/src/tests.rs @@ -16,10 +16,10 @@ use crate::{self as collator_selection, mock::*, CandidateInfo, Error}; use frame_support::{ assert_noop, assert_ok, - traits::{Currency, GenesisBuild, OnInitialize}, + traits::{Currency, OnInitialize}, }; use pallet_balances::Error as BalancesError; -use sp_runtime::traits::BadOrigin; +use sp_runtime::{traits::BadOrigin, BuildStorage}; #[test] fn basic_setup_works() { @@ -425,7 +425,7 @@ fn should_kick_mechanism_below_balance() { #[should_panic = "duplicate invulnerables in genesis."] fn cannot_set_genesis_value_twice() { sp_tracing::try_init_simple(); - let mut t = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let mut t = frame_system::GenesisConfig::::default().build_storage().unwrap(); let invulnerables = vec![1, 1]; let collator_selection = collator_selection::GenesisConfig:: { diff --git a/crates/currency/Cargo.toml b/crates/currency/Cargo.toml index 617d2f461f..8acf8b3612 100644 --- a/crates/currency/Cargo.toml +++ b/crates/currency/Cargo.toml @@ -7,7 +7,7 @@ name = "currency" version = "1.2.0" [dependencies] -serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -38,7 +38,7 @@ sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "pol [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", "scale-info/std", diff --git a/crates/currency/src/mock.rs b/crates/currency/src/mock.rs index 63073c6277..d972fc3f99 100644 --- a/crates/currency/src/mock.rs +++ b/crates/currency/src/mock.rs @@ -7,22 +7,18 @@ pub use primitives::{CurrencyId::Token, TokenSymbol::*}; use sp_arithmetic::{FixedI128, FixedU128}; use sp_core::H256; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, }; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { // substrate pallets - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Tokens: orml_tokens::{Pallet, Storage, Config, Event}, // Operational @@ -32,13 +28,11 @@ frame_support::construct_runtime!( pub type AccountId = u64; pub type Balance = u128; -pub type BlockNumber = u64; pub type UnsignedFixedPoint = FixedU128; pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; pub type CurrencyId = primitives::CurrencyId; pub type Moment = u64; -pub type Index = u64; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -52,13 +46,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = Index; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -128,8 +121,7 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build() -> sp_io::TestExternalities { - let storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); - + let storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); sp_io::TestExternalities::from(storage) } } diff --git a/crates/democracy/Cargo.toml b/crates/democracy/Cargo.toml index 8b394b80e2..3e5c600181 100644 --- a/crates/democracy/Cargo.toml +++ b/crates/democracy/Cargo.toml @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] log = { version = "0.4.17", default-features = false } -serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -36,7 +36,7 @@ pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "p [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", "scale-info/std", "sp-core/std", diff --git a/crates/democracy/src/lib.rs b/crates/democracy/src/lib.rs index 81a6ee50fc..ceb7c6355f 100644 --- a/crates/democracy/src/lib.rs +++ b/crates/democracy/src/lib.rs @@ -78,6 +78,7 @@ use frame_support::{ transactional, weights::Weight, }; +use frame_system::pallet_prelude::BlockNumberFor; use sp_runtime::{ traits::{One, Saturating, Zero}, ArithmeticError, DispatchError, DispatchResult, @@ -138,7 +139,7 @@ pub mod pallet { type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The Scheduler. - type Scheduler: ScheduleNamed, Self::PalletsOrigin>; + type Scheduler: ScheduleNamed, CallOf, Self::PalletsOrigin>; /// The Preimage provider. type Preimages: QueryPreimage + StorePreimage; @@ -152,15 +153,15 @@ pub mod pallet { /// voting stakers have an opportunity to remove themselves from the system in the case /// where they are on the losing side of a vote. #[pallet::constant] - type EnactmentPeriod: Get; + type EnactmentPeriod: Get>; /// How often (in blocks) to check for new votes. #[pallet::constant] - type VotingPeriod: Get; + type VotingPeriod: Get>; /// Minimum voting period allowed for a fast-track referendum. #[pallet::constant] - type FastTrackVotingPeriod: Get; + type FastTrackVotingPeriod: Get>; /// The minimum amount to be used as a deposit for a public referendum proposal. #[pallet::constant] @@ -241,7 +242,7 @@ pub mod pallet { #[pallet::storage] #[pallet::getter(fn referendum_info)] pub type ReferendumInfoOf = - StorageMap<_, Twox64Concat, ReferendumIndex, ReferendumInfo, BalanceOf>>; + StorageMap<_, Twox64Concat, ReferendumIndex, ReferendumInfo, BoundedCallOf, BalanceOf>>; /// All votes for a particular voter. We store the balance for the number of votes that we /// have recorded. @@ -255,23 +256,14 @@ pub mod pallet { pub type NextLaunchTimestamp = StorageValue<_, u64, ValueQuery>; #[pallet::genesis_config] + #[derive(frame_support::DefaultNoBound)] pub struct GenesisConfig { _phantom: sp_std::marker::PhantomData, next_launch_timestamp: u64, } - #[cfg(feature = "std")] - impl Default for GenesisConfig { - fn default() -> Self { - GenesisConfig { - _phantom: Default::default(), - next_launch_timestamp: 0, - } - } - } - #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { PublicPropCount::::put(0 as PropIndex); ReferendumCount::::put(0 as ReferendumIndex); @@ -358,7 +350,7 @@ pub mod pallet { #[pallet::hooks] impl Hooks> for Pallet { /// Weight: see `begin_block` - fn on_initialize(n: T::BlockNumber) -> Weight { + fn on_initialize(n: BlockNumberFor) -> Weight { Self::begin_block(n).unwrap_or_else(|e| { sp_runtime::print(e); Weight::from_parts(0 as u64, 0u64) @@ -473,7 +465,7 @@ pub mod pallet { pub fn fast_track( origin: OriginFor, #[pallet::compact] prop_index: PropIndex, - delay: T::BlockNumber, + delay: BlockNumberFor, ) -> DispatchResult { T::FastTrackOrigin::ensure_origin(origin)?; Self::fast_track_with_voting_period(prop_index, delay, T::FastTrackVotingPeriod::get()) @@ -495,7 +487,7 @@ pub mod pallet { pub fn table_proposal( origin: OriginFor, #[pallet::compact] prop_index: PropIndex, - delay: T::BlockNumber, + delay: BlockNumberFor, ) -> DispatchResult { T::FastTrackOrigin::ensure_origin(origin)?; Self::fast_track_with_voting_period(prop_index, delay, T::VotingPeriod::get()) @@ -658,10 +650,10 @@ impl Pallet { /// Get all referenda ready for tally at block `n`. pub fn maturing_referenda_at( - n: T::BlockNumber, + n: BlockNumberFor, ) -> Vec<( ReferendumIndex, - ReferendumStatus, BalanceOf>, + ReferendumStatus, BoundedCallOf, BalanceOf>, )> { let next = Self::lowest_unbaked(); let last = Self::referendum_count(); @@ -669,11 +661,11 @@ impl Pallet { } fn maturing_referenda_at_inner( - n: T::BlockNumber, + n: BlockNumberFor, range: core::ops::Range, ) -> Vec<( ReferendumIndex, - ReferendumStatus, BalanceOf>, + ReferendumStatus, BoundedCallOf, BalanceOf>, )> { range .into_iter() @@ -692,7 +684,7 @@ impl Pallet { pub fn internal_start_referendum( proposal: BoundedCallOf, threshold: VoteThreshold, - delay: T::BlockNumber, + delay: BlockNumberFor, ) -> ReferendumIndex { >::inject_referendum( >::block_number().saturating_add(T::VotingPeriod::get()), @@ -716,8 +708,8 @@ impl Pallet { fn fast_track_with_voting_period( prop_index: PropIndex, - delay: T::BlockNumber, - voting_period: T::BlockNumber, + delay: BlockNumberFor, + voting_period: BlockNumberFor, ) -> DispatchResult { let mut public_props = Self::public_props(); let (winner_index, _) = public_props @@ -749,8 +741,8 @@ impl Pallet { /// Ok if the given referendum is active, Err otherwise fn ensure_ongoing( - r: ReferendumInfo, BalanceOf>, - ) -> Result, BalanceOf>, DispatchError> { + r: ReferendumInfo, BoundedCallOf, BalanceOf>, + ) -> Result, BoundedCallOf, BalanceOf>, DispatchError> { match r { ReferendumInfo::Ongoing(s) => Ok(s), _ => Err(Error::::ReferendumInvalid.into()), @@ -759,7 +751,7 @@ impl Pallet { fn referendum_status( ref_index: ReferendumIndex, - ) -> Result, BalanceOf>, DispatchError> { + ) -> Result, BoundedCallOf, BalanceOf>, DispatchError> { let info = ReferendumInfoOf::::get(ref_index).ok_or(Error::::ReferendumInvalid)?; Self::ensure_ongoing(info) } @@ -822,10 +814,10 @@ impl Pallet { /// Start a referendum fn inject_referendum( - end: T::BlockNumber, + end: BlockNumberFor, proposal: BoundedCallOf, threshold: VoteThreshold, - delay: T::BlockNumber, + delay: BlockNumberFor, ) -> ReferendumIndex { let ref_index = Self::referendum_count(); ReferendumCount::::put(ref_index + 1); @@ -843,12 +835,12 @@ impl Pallet { } /// Table the next waiting proposal for a vote. - fn launch_next(now: T::BlockNumber) -> DispatchResult { + fn launch_next(now: BlockNumberFor) -> DispatchResult { Self::launch_public(now).map_err(|_| Error::::NoneWaiting.into()) } /// Table the waiting public proposal with the highest backing for a vote. - fn launch_public(now: T::BlockNumber) -> DispatchResult { + fn launch_public(now: BlockNumberFor) -> DispatchResult { let mut public_props = Self::public_props(); if let Some((winner_index, _)) = public_props.iter().enumerate().max_by_key( // defensive only: All current public proposals have an amount locked @@ -880,9 +872,9 @@ impl Pallet { } fn bake_referendum( - now: T::BlockNumber, + now: BlockNumberFor, index: ReferendumIndex, - status: ReferendumStatus, BalanceOf>, + status: ReferendumStatus, BoundedCallOf, BalanceOf>, ) -> Result { let total_issuance = T::Currency::total_issuance(); let approved = status.threshold.approved(status.tally, total_issuance); @@ -925,7 +917,7 @@ impl Pallet { /// - Db writes: `PublicProps`, `account`, `ReferendumCount`, `DepositOf`, `ReferendumInfoOf` /// - Db reads per R: `DepositOf`, `ReferendumInfoOf` /// # - fn begin_block(now: T::BlockNumber) -> Result { + fn begin_block(now: BlockNumberFor) -> Result { let max_block_weight = T::BlockWeights::get().max_block; let mut weight = Weight::from_parts(0 as u64, 0u64); diff --git a/crates/democracy/src/migrations.rs b/crates/democracy/src/migrations.rs index b2b18544d4..1a8c98a35d 100644 --- a/crates/democracy/src/migrations.rs +++ b/crates/democracy/src/migrations.rs @@ -40,7 +40,7 @@ mod v0 { Pallet, Identity, ::Hash, - PreimageStatus<::AccountId, BalanceOf, ::BlockNumber>, + PreimageStatus<::AccountId, BalanceOf, BlockNumberFor>, >; #[cfg(feature = "try-runtime")] @@ -49,19 +49,22 @@ mod v0 { Pallet, frame_support::Twox64Concat, ReferendumIndex, - ReferendumInfo<::BlockNumber, ::Hash, BalanceOf>, + ReferendumInfo, ::Hash, BalanceOf>, >; } pub mod v1 { use super::*; + use frame_system::pallet_prelude::BlockNumberFor; + #[cfg(feature = "try-runtime")] + use sp_runtime::TryRuntimeError; /// Migration for translating bare `Hash`es into `Bounded`s. pub struct Migration(sp_std::marker::PhantomData); impl> OnRuntimeUpgrade for Migration { #[cfg(feature = "try-runtime")] - fn pre_upgrade() -> Result, &'static str> { + fn pre_upgrade() -> Result, TryRuntimeError> { assert_eq!(StorageVersion::get::>(), 0, "can only upgrade from version 0"); let props_count = v0::PublicProps::::get().len(); @@ -86,7 +89,7 @@ pub mod v1 { return weight; } - ReferendumInfoOf::::translate(|index, old: ReferendumInfo>| { + ReferendumInfoOf::::translate(|index, old: ReferendumInfo, T::Hash, BalanceOf>| { weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 1)); log::info!(target: TARGET, "migrating referendum #{:?}", &index); Some(match old { @@ -154,7 +157,7 @@ pub mod v1 { } #[cfg(feature = "try-runtime")] - fn post_upgrade(state: Vec) -> Result<(), &'static str> { + fn post_upgrade(state: Vec) -> Result<(), TryRuntimeError> { assert_eq!(StorageVersion::get::>(), 1, "must upgrade"); let (old_props_count, old_ref_count): (u32, u32) = diff --git a/crates/democracy/src/tests.rs b/crates/democracy/src/tests.rs index aa18c16601..1494e29318 100644 --- a/crates/democracy/src/tests.rs +++ b/crates/democracy/src/tests.rs @@ -4,16 +4,15 @@ use super::*; use crate as pallet_democracy; use frame_support::{ assert_noop, assert_ok, ord_parameter_types, parameter_types, - traits::{ConstU32, ConstU64, Contains, EqualPrivilegeOnly, GenesisBuild, OnInitialize, SortedMembers}, + traits::{ConstU32, ConstU64, Contains, EqualPrivilegeOnly, OnInitialize, SortedMembers}, weights::Weight, }; use frame_system::{EnsureRoot, EnsureSignedBy}; use pallet_balances::Error as BalancesError; use sp_core::H256; use sp_runtime::{ - testing::Header, traits::{BadOrigin, BlakeTwo256, IdentityLookup}, - Perbill, + BuildStorage, Perbill, }; mod cancellation; @@ -25,16 +24,12 @@ mod voting; const MAX_PROPOSALS: u32 = 100; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Config, Storage, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, Preimage: pallet_preimage, Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event}, @@ -70,14 +65,13 @@ impl frame_system::Config for Test { type BlockLength = (); type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = u64; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = u64; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -142,7 +136,7 @@ impl pallet_balances::Config for Test { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxFreezes = (); type MaxHolds = (); @@ -197,7 +191,7 @@ impl Config for Test { } pub fn new_test_ext() -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let mut t = frame_system::GenesisConfig::::default().build_storage().unwrap(); pallet_balances::GenesisConfig:: { balances: vec![(1, 10), (2, 20), (3, 30), (4, 40), (5, 50), (6, 60)], } diff --git a/crates/democracy/src/vote_threshold.rs b/crates/democracy/src/vote_threshold.rs index 354bb125b7..ce948acbeb 100644 --- a/crates/democracy/src/vote_threshold.rs +++ b/crates/democracy/src/vote_threshold.rs @@ -3,14 +3,24 @@ use crate::Tally; use codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; -#[cfg(feature = "std")] use serde::{Deserialize, Serialize}; use sp_runtime::traits::{IntegerSquareRoot, Zero}; use sp_std::ops::{Add, Div, Mul, Rem}; /// A means of determining if a vote is past pass threshold. -#[derive(Clone, Copy, PartialEq, Eq, Encode, Decode, sp_runtime::RuntimeDebug, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive( + Serialize, + Deserialize, + Clone, + Copy, + PartialEq, + Eq, + Encode, + Decode, + sp_runtime::RuntimeDebug, + TypeInfo, + MaxEncodedLen, +)] pub enum VoteThreshold { /// A supermajority of approvals is needed to pass this vote. SuperMajorityApprove, diff --git a/crates/dex-general/Cargo.toml b/crates/dex-general/Cargo.toml index e5bfccfe3f..aca6443c40 100644 --- a/crates/dex-general/Cargo.toml +++ b/crates/dex-general/Cargo.toml @@ -7,7 +7,7 @@ license = "Apache 2.0" [dependencies] log = { version = "0.4.14", default-features = false } -serde = { version = "1.0.119", optional = true } +serde = { version = "1.0.119", default-features = false } # alias "parity-scale-code" to "codec" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } @@ -35,7 +35,7 @@ proptest = "1.1.0" default = ["std"] std = [ "log/std", - "serde", + "serde/std", "codec/std", "scale-info/std", "sp-core/std", diff --git a/crates/dex-general/rpc/Cargo.toml b/crates/dex-general/rpc/Cargo.toml index 1d783e010d..05d1969a8b 100644 --- a/crates/dex-general/rpc/Cargo.toml +++ b/crates/dex-general/rpc/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache 2.0" [dependencies] -serde = { version = "1.0.119", features = ["derive"], optional = true } +serde = { version = "1.0.119", features = ["derive"] , default-features = false} # alias "parity-scale-code" to "codec" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } diff --git a/crates/dex-general/src/fee/mock.rs b/crates/dex-general/src/fee/mock.rs index f521906be5..16e565a5bb 100644 --- a/crates/dex-general/src/fee/mock.rs +++ b/crates/dex-general/src/fee/mock.rs @@ -5,26 +5,36 @@ use codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; -#[cfg(feature = "std")] use serde::{Deserialize, Serialize}; use frame_support::{parameter_types, traits::Contains, PalletId}; use orml_traits::parameter_type_with_key; use sp_core::{ConstU32, H256}; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, - RuntimeDebug, + BuildStorage, RuntimeDebug, }; use crate as pallet_dex_general; pub use crate::{AssetBalance, Config, GenerateLpAssetId, Pallet, ValidateAsset}; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive( + Serialize, + Deserialize, + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + PartialOrd, + Ord, + TypeInfo, + MaxEncodedLen, +)] pub enum CurrencyId { Token(u8), LpToken(u8, u8), @@ -68,12 +78,9 @@ impl From for CurrencyId { } frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Config, Storage, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, DexGeneral: pallet_dex_general::{Pallet, Call, Storage, Event}, Tokens: orml_tokens::{Pallet, Storage, Event, Config}, } @@ -91,14 +98,13 @@ parameter_types! { impl frame_system::Config for Test { type BaseCallFilter = frame_support::traits::Everything; type RuntimeOrigin = RuntimeOrigin; - type Index = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = u64; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = u128; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); @@ -165,7 +171,7 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build() -> sp_io::TestExternalities { - let storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); storage.into() } @@ -174,10 +180,7 @@ impl ExtBuilder { pub type DexPallet = Pallet; pub fn new_test_ext() -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() - .unwrap() - .into(); + let mut t = frame_system::GenesisConfig::::default().build_storage().unwrap(); pallet_dex_general::GenesisConfig:: { fee_receiver: None, diff --git a/crates/dex-general/src/lib.rs b/crates/dex-general/src/lib.rs index df5b377330..3547be2259 100644 --- a/crates/dex-general/src/lib.rs +++ b/crates/dex-general/src/lib.rs @@ -22,7 +22,7 @@ pub use pallet::*; use codec::{Decode, Encode, FullCodec}; use frame_support::{ - inherent::Vec, pallet_prelude::*, storage::bounded_btree_map::BoundedBTreeMap, traits::Get, PalletId, RuntimeDebug, + pallet_prelude::*, storage::bounded_btree_map::BoundedBTreeMap, traits::Get, PalletId, RuntimeDebug, }; use orml_traits::MultiCurrency; use sp_core::U256; @@ -126,7 +126,7 @@ pub mod pallet { _, Twox64Concat, (T::AssetId, T::AssetId), - PairStatus, + PairStatus, T::AccountId>, ValueQuery, >; @@ -149,7 +149,7 @@ pub mod pallet { _, Twox64Concat, (T::AssetId, T::AssetId), - PairStatus, + PairStatus, T::AccountId>, ValueQuery, >; @@ -174,6 +174,7 @@ pub mod pallet { >; #[pallet::genesis_config] + #[derive(frame_support::DefaultNoBound)] /// Refer: https://github.com/Uniswap/uniswap-v2-core/blob/master/contracts/UniswapV2Pair.sol#L88 pub struct GenesisConfig { /// The receiver of the protocol fee. @@ -183,40 +184,13 @@ pub mod pallet { pub fee_point: u8, } - #[cfg(feature = "std")] - impl Default for GenesisConfig { - fn default() -> Self { - Self { - fee_receiver: None, - fee_point: 5, - } - } - } - #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { >::put((&self.fee_receiver, &self.fee_point)); } } - #[cfg(feature = "std")] - impl GenesisConfig { - /// Direct implementation of `GenesisBuild::build_storage`. - /// - /// Kept in order not to break dependency. - pub fn build_storage(&self) -> Result { - >::build_storage(self) - } - - /// Direct implementation of `GenesisBuild::assimilate_storage`. - /// - /// Kept in order not to break dependency. - pub fn assimilate_storage(&self, storage: &mut sp_runtime::Storage) -> Result<(), String> { - >::assimilate_storage(self, storage) - } - } - #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] pub enum Event { @@ -285,7 +259,7 @@ pub mod pallet { total_supply_1: AssetBalance, capacity_supply_0: AssetBalance, capacity_supply_1: AssetBalance, - end: T::BlockNumber, + end: BlockNumberFor, }, /// Claim a bootstrap pair. @@ -309,7 +283,7 @@ pub mod pallet { total_supply_1: AssetBalance, capacity_supply_0: AssetBalance, capacity_supply_1: AssetBalance, - end: T::BlockNumber, + end: BlockNumberFor, }, /// Refund from disable bootstrap pair. @@ -611,7 +585,7 @@ pub mod pallet { #[pallet::compact] amount_1_desired: AssetBalance, #[pallet::compact] amount_0_min: AssetBalance, #[pallet::compact] amount_1_min: AssetBalance, - #[pallet::compact] deadline: T::BlockNumber, + #[pallet::compact] deadline: BlockNumberFor, ) -> DispatchResult { ensure!( T::EnsurePairAsset::validate_asset(&asset_0) && T::EnsurePairAsset::validate_asset(&asset_1), @@ -656,7 +630,7 @@ pub mod pallet { #[pallet::compact] amount_0_min: AssetBalance, #[pallet::compact] amount_1_min: AssetBalance, recipient: ::Source, - #[pallet::compact] deadline: T::BlockNumber, + #[pallet::compact] deadline: BlockNumberFor, ) -> DispatchResult { ensure!( T::EnsurePairAsset::validate_asset(&asset_0) && T::EnsurePairAsset::validate_asset(&asset_1), @@ -696,7 +670,7 @@ pub mod pallet { #[pallet::compact] amount_out_min: AssetBalance, path: Vec, recipient: ::Source, - #[pallet::compact] deadline: T::BlockNumber, + #[pallet::compact] deadline: BlockNumberFor, ) -> DispatchResult { let who = ensure_signed(origin)?; let recipient = T::Lookup::lookup(recipient)?; @@ -728,7 +702,7 @@ pub mod pallet { #[pallet::compact] amount_in_max: AssetBalance, path: Vec, recipient: ::Source, - #[pallet::compact] deadline: T::BlockNumber, + #[pallet::compact] deadline: BlockNumberFor, ) -> DispatchResult { let who = ensure_signed(origin)?; let recipient = T::Lookup::lookup(recipient)?; @@ -763,7 +737,7 @@ pub mod pallet { #[pallet::compact] target_supply_1: AssetBalance, #[pallet::compact] capacity_supply_0: AssetBalance, #[pallet::compact] capacity_supply_1: AssetBalance, - #[pallet::compact] end: T::BlockNumber, + #[pallet::compact] end: BlockNumberFor, rewards: Vec, limits: Vec<(T::AssetId, AssetBalance)>, ) -> DispatchResult { @@ -884,7 +858,7 @@ pub mod pallet { asset_1: T::AssetId, #[pallet::compact] amount_0_contribute: AssetBalance, #[pallet::compact] amount_1_contribute: AssetBalance, - #[pallet::compact] deadline: T::BlockNumber, + #[pallet::compact] deadline: BlockNumberFor, ) -> DispatchResult { let who = ensure_signed(who)?; @@ -914,7 +888,7 @@ pub mod pallet { recipient: ::Source, asset_0: T::AssetId, asset_1: T::AssetId, - #[pallet::compact] deadline: T::BlockNumber, + #[pallet::compact] deadline: BlockNumberFor, ) -> DispatchResult { let who = ensure_signed(origin)?; let recipient = T::Lookup::lookup(recipient)?; @@ -966,7 +940,7 @@ pub mod pallet { #[pallet::compact] target_supply_1: AssetBalance, #[pallet::compact] capacity_supply_0: AssetBalance, #[pallet::compact] capacity_supply_1: AssetBalance, - #[pallet::compact] end: T::BlockNumber, + #[pallet::compact] end: BlockNumberFor, rewards: Vec, limits: Vec<(T::AssetId, AssetBalance)>, ) -> DispatchResult { diff --git a/crates/dex-general/src/rpc.rs b/crates/dex-general/src/rpc.rs index b19ed2cd5f..59a9616f7f 100644 --- a/crates/dex-general/src/rpc.rs +++ b/crates/dex-general/src/rpc.rs @@ -5,14 +5,12 @@ use codec::{Decode, Encode}; use scale_info::TypeInfo; -#[cfg(feature = "std")] use serde::{Deserialize, Serialize}; use super::*; -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, PartialOrd, Ord, TypeInfo)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] -#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] +#[derive(Serialize, Deserialize, Encode, Decode, Eq, PartialEq, Copy, Clone, PartialOrd, Ord, TypeInfo)] +#[serde(rename_all = "camelCase")] pub struct PairInfo { pub asset_0: AssetId, pub asset_1: AssetId, diff --git a/crates/dex-general/src/swap/mock.rs b/crates/dex-general/src/swap/mock.rs index eefe481467..65d58d77c8 100644 --- a/crates/dex-general/src/swap/mock.rs +++ b/crates/dex-general/src/swap/mock.rs @@ -11,19 +11,30 @@ use frame_support::{parameter_types, traits::Contains, PalletId}; use orml_traits::parameter_type_with_key; use sp_core::{ConstU32, H256}; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, - RuntimeDebug, + BuildStorage, RuntimeDebug, }; use crate as pallet_dex_general; pub use crate::{AssetBalance, Config, GenerateLpAssetId, Pallet, ValidateAsset}; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, MaxEncodedLen, Ord, TypeInfo)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive( + Serialize, + Deserialize, + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + PartialOrd, + MaxEncodedLen, + Ord, + TypeInfo, +)] pub enum CurrencyId { Token(u8), LpToken(u8, u8), @@ -55,12 +66,9 @@ impl ValidateAsset for EnsurePairAssetImpl { } frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Config, Storage, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, DexGeneral: pallet_dex_general::{Pallet, Call, Storage, Event}, Tokens: orml_tokens::{Pallet, Storage, Event, Config}, } @@ -78,14 +86,13 @@ parameter_types! { impl frame_system::Config for Test { type BaseCallFilter = frame_support::traits::Everything; type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; - type BlockNumber = u64; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = u128; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); @@ -151,10 +158,7 @@ impl Config for Test { pub type DexPallet = Pallet; pub fn new_test_ext() -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() - .unwrap() - .into(); + let mut t = frame_system::GenesisConfig::::default().build_storage().unwrap(); pallet_dex_general::GenesisConfig:: { fee_receiver: None, diff --git a/crates/dex-general/src/swap/mod.rs b/crates/dex-general/src/swap/mod.rs index 842fbac661..ddddf6c854 100644 --- a/crates/dex-general/src/swap/mod.rs +++ b/crates/dex-general/src/swap/mod.rs @@ -9,6 +9,7 @@ //! mechanism refers to the design of Uniswap V2. use super::*; +use frame_system::pallet_prelude::BlockNumberFor; #[cfg(test)] mod mock; @@ -922,7 +923,9 @@ impl Pallet { } // After end block, bootstrap has not enough asset. Is will become disable. - pub(crate) fn bootstrap_disable(params: &BootstrapParameter) -> bool { + pub(crate) fn bootstrap_disable( + params: &BootstrapParameter, T::AccountId>, + ) -> bool { let now = frame_system::Pallet::::block_number(); if now > params.end_block_number && (params.accumulated_supply.0 < params.target_supply.0 diff --git a/crates/dex-stable/Cargo.toml b/crates/dex-stable/Cargo.toml index c51b52cac5..29849eebdf 100644 --- a/crates/dex-stable/Cargo.toml +++ b/crates/dex-stable/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache 2.0" [dependencies] -serde = { version = "1.0.119", optional = true } +serde = { version = "1.0.119", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } @@ -32,7 +32,7 @@ sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0 [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", "scale-info/std", "sp-core/std", diff --git a/crates/dex-stable/rpc/Cargo.toml b/crates/dex-stable/rpc/Cargo.toml index bfe10058dd..1604360545 100644 --- a/crates/dex-stable/rpc/Cargo.toml +++ b/crates/dex-stable/rpc/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Zenlink Developers", "Interlay Ltd"] edition = "2021" [dependencies] -serde = { version = "1.0.119", features = ["derive"], optional = true } +serde = { version = "1.0.119", features = ["derive"] , default-features = false} codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } jsonrpsee = { version = "0.16.2", features = ["server", "macros"] } diff --git a/crates/dex-stable/src/lib.rs b/crates/dex-stable/src/lib.rs index a0c47c60b0..18cfb5f4f9 100644 --- a/crates/dex-stable/src/lib.rs +++ b/crates/dex-stable/src/lib.rs @@ -479,7 +479,7 @@ pub mod pallet { amounts: Vec, min_mint_amount: Balance, to: T::AccountId, - deadline: T::BlockNumber, + deadline: BlockNumberFor, ) -> DispatchResult { let who = ensure_signed(origin)?; @@ -512,7 +512,7 @@ pub mod pallet { in_amount: Balance, min_out_amount: Balance, to: T::AccountId, - deadline: T::BlockNumber, + deadline: BlockNumberFor, ) -> DispatchResult { let who = ensure_signed(origin)?; @@ -549,7 +549,7 @@ pub mod pallet { lp_amount: Balance, min_amounts: Vec, to: T::AccountId, - deadline: T::BlockNumber, + deadline: BlockNumberFor, ) -> DispatchResult { let who = ensure_signed(origin)?; @@ -580,7 +580,7 @@ pub mod pallet { index: u32, min_amount: Balance, to: T::AccountId, - deadline: T::BlockNumber, + deadline: BlockNumberFor, ) -> DispatchResult { let who = ensure_signed(origin)?; @@ -609,7 +609,7 @@ pub mod pallet { amounts: Vec, max_burn_amount: Balance, to: T::AccountId, - deadline: T::BlockNumber, + deadline: BlockNumberFor, ) -> DispatchResult { let who = ensure_signed(origin)?; @@ -646,7 +646,7 @@ pub mod pallet { base_amounts: Vec, min_to_mint: Balance, to: T::AccountId, - deadline: T::BlockNumber, + deadline: BlockNumberFor, ) -> DispatchResult { let who = ensure_signed(origin)?; let now = frame_system::Pallet::::block_number(); @@ -689,7 +689,7 @@ pub mod pallet { min_amounts_meta: Vec, min_amounts_base: Vec, to: T::AccountId, - deadline: T::BlockNumber, + deadline: BlockNumberFor, ) -> DispatchResult { let who = ensure_signed(origin)?; let now = frame_system::Pallet::::block_number(); @@ -730,7 +730,7 @@ pub mod pallet { i: u32, min_amount: Balance, to: T::AccountId, - deadline: T::BlockNumber, + deadline: BlockNumberFor, ) -> DispatchResult { let who = ensure_signed(origin)?; let now = frame_system::Pallet::::block_number(); @@ -773,7 +773,7 @@ pub mod pallet { dx: Balance, min_dy: Balance, to: T::AccountId, - deadline: T::BlockNumber, + deadline: BlockNumberFor, ) -> DispatchResult { let who = ensure_signed(origin)?; let now = frame_system::Pallet::::block_number(); @@ -808,7 +808,7 @@ pub mod pallet { dx: Balance, min_dy: Balance, to: T::AccountId, - deadline: T::BlockNumber, + deadline: BlockNumberFor, ) -> DispatchResult { let who = ensure_signed(origin)?; let now = frame_system::Pallet::::block_number(); @@ -830,7 +830,7 @@ pub mod pallet { dx: Balance, min_dy: Balance, to: T::AccountId, - deadline: T::BlockNumber, + deadline: BlockNumberFor, ) -> DispatchResult { let who = ensure_signed(origin)?; let now = frame_system::Pallet::::block_number(); diff --git a/crates/dex-stable/src/mock.rs b/crates/dex-stable/src/mock.rs index 06b2929b1a..c63754e813 100644 --- a/crates/dex-stable/src/mock.rs +++ b/crates/dex-stable/src/mock.rs @@ -10,13 +10,12 @@ use scale_info::TypeInfo; use serde::{Deserialize, Serialize}; use std::time::SystemTime; -use frame_support::{assert_ok, pallet_prelude::GenesisBuild, parameter_types, traits::Contains, PalletId}; +use frame_support::{assert_ok, parameter_types, traits::Contains, PalletId}; use frame_system::RawOrigin; use sp_core::H256; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup, Zero}, - RuntimeDebug, + BuildStorage, RuntimeDebug, }; use crate as dex_stable; @@ -26,7 +25,6 @@ use crate::{ }; use orml_traits::{parameter_type_with_key, MultiCurrency}; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; parameter_types! { @@ -58,8 +56,21 @@ impl Contains for MockDustRemovalWhitelist { } } -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, MaxEncodedLen, Ord, TypeInfo)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive( + Serialize, + Deserialize, + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + PartialOrd, + MaxEncodedLen, + Ord, + TypeInfo, +)] pub enum CurrencyId { Forbidden(TokenSymbol), Token(TokenSymbol), @@ -78,15 +89,41 @@ impl From for CurrencyId { } } -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, MaxEncodedLen, Ord, TypeInfo)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive( + Serialize, + Deserialize, + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + PartialOrd, + MaxEncodedLen, + Ord, + TypeInfo, +)] pub enum PoolToken { Token(TokenSymbol), StablePoolLp(PoolId), } -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, MaxEncodedLen, Ord, TypeInfo)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive( + Serialize, + Deserialize, + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + PartialOrd, + MaxEncodedLen, + Ord, + TypeInfo, +)] pub enum PoolType { P2(PoolToken, PoolToken), P3(PoolToken, PoolToken, PoolToken), @@ -98,14 +135,13 @@ pub enum PoolType { impl frame_system::Config for Test { type BaseCallFilter = frame_support::traits::Everything; type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; - type BlockNumber = u64; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = u128; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); @@ -146,7 +182,7 @@ impl pallet_balances::Config for Test { type MaxLocks = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxFreezes = (); type MaxHolds = (); @@ -181,8 +217,7 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build() -> sp_io::TestExternalities { - let storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); - + let storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); storage.into() } } @@ -223,12 +258,9 @@ where } frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, + System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 1, Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 8, @@ -259,10 +291,7 @@ pub const TOKEN3_UNIT: u128 = 1_000_000; pub const TOKEN4_UNIT: u128 = 1_000_000; pub fn new_test_ext() -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() - .unwrap() - .into(); + let mut t = frame_system::GenesisConfig::::default().build_storage().unwrap(); pallet_balances::GenesisConfig:: { balances: vec![(ALICE, u128::MAX)], } diff --git a/crates/dex-swap-router/Cargo.toml b/crates/dex-swap-router/Cargo.toml index 36feb8e937..37b4c0ffcc 100644 --- a/crates/dex-swap-router/Cargo.toml +++ b/crates/dex-swap-router/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache 2.0" [dependencies] -serde = { version = "1.0.119", optional = true } +serde = { version = "1.0.119", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } @@ -36,7 +36,7 @@ pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = " [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", "scale-info/std", "sp-core/std", diff --git a/crates/dex-swap-router/src/lib.rs b/crates/dex-swap-router/src/lib.rs index eaf7fa08b4..017c7183b1 100644 --- a/crates/dex-swap-router/src/lib.rs +++ b/crates/dex-swap-router/src/lib.rs @@ -156,7 +156,7 @@ pub mod pallet { amount_out_min: T::Balance, routes: Vec>, to: T::AccountId, - deadline: T::BlockNumber, + deadline: BlockNumberFor, ) -> DispatchResult { let who = ensure_signed(origin)?; diff --git a/crates/dex-swap-router/src/mock.rs b/crates/dex-swap-router/src/mock.rs index 7ee24cdd6c..25d015f842 100644 --- a/crates/dex-swap-router/src/mock.rs +++ b/crates/dex-swap-router/src/mock.rs @@ -2,14 +2,13 @@ // Licensed under Apache 2.0. use codec::{Decode, Encode, MaxEncodedLen}; -use frame_support::{pallet_prelude::GenesisBuild, parameter_types, traits::Contains, PalletId}; +use frame_support::{parameter_types, traits::Contains, PalletId}; use scale_info::TypeInfo; use serde::{Deserialize, Serialize}; use sp_core::H256; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, - RuntimeDebug, + BuildStorage, RuntimeDebug, }; use crate as dex_swap_router; @@ -18,7 +17,6 @@ use dex_general::{GenerateLpAssetId, ValidateAsset}; use dex_stable::traits::{StablePoolLpCurrencyIdGenerate, ValidateCurrency}; use orml_traits::parameter_type_with_key; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; parameter_types! { @@ -51,8 +49,21 @@ impl Contains for MockDustRemovalWhitelist { } } -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, MaxEncodedLen, Ord, TypeInfo)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive( + Serialize, + Deserialize, + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + PartialOrd, + MaxEncodedLen, + Ord, + TypeInfo, +)] pub enum CurrencyId { Forbidden(TokenSymbol), Token(TokenSymbol), @@ -88,15 +99,41 @@ impl From for CurrencyId { } } -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, MaxEncodedLen, Ord, TypeInfo)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive( + Serialize, + Deserialize, + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + PartialOrd, + MaxEncodedLen, + Ord, + TypeInfo, +)] pub enum PoolToken { Token(TokenSymbol), StablePoolLp(PoolId), } -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, PartialOrd, MaxEncodedLen, Ord, TypeInfo)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive( + Serialize, + Deserialize, + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + PartialOrd, + MaxEncodedLen, + Ord, + TypeInfo, +)] pub enum PoolType { P2(PoolToken, PoolToken), P3(PoolToken, PoolToken, PoolToken), @@ -108,14 +145,13 @@ pub enum PoolType { impl frame_system::Config for Test { type BaseCallFilter = frame_support::traits::Everything; type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; - type BlockNumber = u64; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = u128; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); @@ -249,19 +285,16 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build() -> sp_io::TestExternalities { - let storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); storage.into() } } frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, + System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 1, Tokens: orml_tokens::{Pallet, Storage, Event, Config} = 10, @@ -294,10 +327,7 @@ pub const TOKEN1_ASSET_ID: CurrencyId = CurrencyId::Token(1); pub const TOKEN2_ASSET_ID: CurrencyId = CurrencyId::Token(2); pub fn new_test_ext() -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() - .unwrap() - .into(); + let mut t = frame_system::GenesisConfig::::default().build_storage().unwrap(); orml_tokens::GenesisConfig:: { balances: vec![ diff --git a/crates/escrow/Cargo.toml b/crates/escrow/Cargo.toml index 33ad23596b..443d365948 100644 --- a/crates/escrow/Cargo.toml +++ b/crates/escrow/Cargo.toml @@ -6,7 +6,7 @@ name = "escrow" version = "1.0.0" [dependencies] -serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -34,7 +34,7 @@ pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "p [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", "scale-info/std", diff --git a/crates/escrow/src/lib.rs b/crates/escrow/src/lib.rs index 4351c69290..31cbf2bfb2 100644 --- a/crates/escrow/src/lib.rs +++ b/crates/escrow/src/lib.rs @@ -37,6 +37,7 @@ use frame_support::{ }, transactional, }; +use frame_system::pallet_prelude::BlockNumberFor; use reward::RewardsApi; use scale_info::TypeInfo; use sp_runtime::{ @@ -140,18 +141,18 @@ pub mod pallet { type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Convert the block number into a balance. - type BlockNumberToBalance: Convert>; + type BlockNumberToBalance: Convert, BalanceOf>; /// The currency trait. - type Currency: LockableCurrency; + type Currency: LockableCurrency>; /// All future times are rounded by this. #[pallet::constant] - type Span: Get; + type Span: Get>; /// The maximum time for locks. #[pallet::constant] - type MaxPeriod: Get; + type MaxPeriod: Get>; /// Escrow reward pool. type EscrowRewards: reward::RewardsApi<(), Self::AccountId, BalanceOf>; @@ -167,7 +168,7 @@ pub mod pallet { Deposit { who: T::AccountId, amount: BalanceOf, - unlock_height: T::BlockNumber, + unlock_height: BlockNumberFor, }, Withdraw { who: T::AccountId, @@ -206,7 +207,7 @@ pub mod pallet { } #[pallet::hooks] - impl Hooks for Pallet {} + impl Hooks> for Pallet {} #[pallet::storage] #[pallet::getter(fn reserved_balance)] @@ -215,14 +216,14 @@ pub mod pallet { #[pallet::storage] #[pallet::getter(fn locked_balance)] pub type Locked = - StorageMap<_, Blake2_128Concat, T::AccountId, LockedBalance, T::BlockNumber>, ValueQuery>; + StorageMap<_, Blake2_128Concat, T::AccountId, LockedBalance, BlockNumberFor>, ValueQuery>; #[pallet::storage] - pub type Epoch = StorageValue<_, T::Index, ValueQuery>; + pub type Epoch = StorageValue<_, T::Nonce, ValueQuery>; #[pallet::storage] pub type PointHistory = - StorageMap<_, Identity, T::Index, Point, T::BlockNumber>, ValueQuery>; + StorageMap<_, Identity, T::Nonce, Point, BlockNumberFor>, ValueQuery>; #[pallet::storage] pub type UserPointHistory = StorageDoubleMap< @@ -230,20 +231,20 @@ pub mod pallet { Blake2_128Concat, T::AccountId, Identity, - T::Index, - Point, T::BlockNumber>, + T::Nonce, + Point, BlockNumberFor>, ValueQuery, >; #[pallet::storage] - pub type UserPointEpoch = StorageMap<_, Blake2_128Concat, T::AccountId, T::Index, ValueQuery>; + pub type UserPointEpoch = StorageMap<_, Blake2_128Concat, T::AccountId, T::Nonce, ValueQuery>; #[pallet::storage] - pub type SlopeChanges = StorageMap<_, Blake2_128Concat, T::BlockNumber, BalanceOf, ValueQuery>; + pub type SlopeChanges = StorageMap<_, Blake2_128Concat, BlockNumberFor, BalanceOf, ValueQuery>; // Accounts that are limited in how much they can mint. #[pallet::storage] - pub type Limits = StorageMap<_, Blake2_128Concat, T::AccountId, (T::BlockNumber, T::BlockNumber)>; + pub type Limits = StorageMap<_, Blake2_128Concat, T::AccountId, (BlockNumberFor, BlockNumberFor)>; // Accounts that are prohibited from locking tokens for voting. #[pallet::storage] @@ -261,7 +262,7 @@ pub mod pallet { pub fn create_lock( origin: OriginFor, #[pallet::compact] amount: BalanceOf, - unlock_height: T::BlockNumber, + unlock_height: BlockNumberFor, ) -> DispatchResult { let who = ensure_signed(origin)?; let now = Self::current_height(); @@ -309,7 +310,7 @@ pub mod pallet { #[pallet::call_index(2)] #[pallet::weight(::WeightInfo::increase_unlock_height())] #[transactional] - pub fn increase_unlock_height(origin: OriginFor, unlock_height: T::BlockNumber) -> DispatchResult { + pub fn increase_unlock_height(origin: OriginFor, unlock_height: BlockNumberFor) -> DispatchResult { let who = ensure_signed(origin)?; let locked_balance = Self::locked_balance(&who); let now = Self::current_height(); @@ -348,8 +349,8 @@ pub mod pallet { pub fn set_account_limit( origin: OriginFor, who: T::AccountId, - start: T::BlockNumber, - end: T::BlockNumber, + start: BlockNumberFor, + end: BlockNumberFor, ) -> DispatchResultWithPostInfo { ensure_root(origin)?; >::insert(&who, (start, end)); @@ -382,16 +383,16 @@ pub mod pallet { } } -type DefaultPoint = Point, ::BlockNumber>; -type DefaultLockedBalance = LockedBalance, ::BlockNumber>; +type DefaultPoint = Point, BlockNumberFor>; +type DefaultLockedBalance = LockedBalance, BlockNumberFor>; // "Internal" functions, callable by code. impl Pallet { - fn current_height() -> T::BlockNumber { + fn current_height() -> BlockNumberFor { frame_system::Pallet::::block_number() } - fn round_height(height: T::BlockNumber) -> T::BlockNumber { + fn round_height(height: BlockNumberFor) -> BlockNumberFor { let span = T::Span::get(); (height / span) * span } @@ -508,7 +509,7 @@ impl Pallet { total_stakable.saturating_sub(used) } - fn deposit_for(who: &T::AccountId, amount: BalanceOf, unlock_height: T::BlockNumber) -> DispatchResult { + fn deposit_for(who: &T::AccountId, amount: BalanceOf, unlock_height: BlockNumberFor) -> DispatchResult { let old_locked = Self::locked_balance(who); let mut new_locked = old_locked.clone(); new_locked.amount.saturating_accrue(amount); @@ -548,7 +549,7 @@ impl Pallet { pub fn round_height_and_deposit_for( who: &T::AccountId, amount: BalanceOf, - unlock_height: T::BlockNumber, + unlock_height: BlockNumberFor, ) -> DispatchResult { Self::deposit_for(who, amount, Self::round_height(unlock_height)) } @@ -567,7 +568,7 @@ impl Pallet { Self::checkpoint(who, old_locked, Default::default()); T::Currency::remove_lock(LOCK_ID, &who); - let _ = >::clear_prefix(who, u32::max_value(), None); + let _ = >::clear_prefix(who, u32::MAX, None); Self::deposit_event(Event::::Withdraw { who: who.clone(), @@ -578,13 +579,13 @@ impl Pallet { } /// vKINT/vINTR balance at given height - pub fn balance_at(who: &T::AccountId, height: Option) -> BalanceOf { + pub fn balance_at(who: &T::AccountId, height: Option>) -> BalanceOf { let height = height.unwrap_or(Self::current_height()); let last_point = >::get(who, >::get(who)); last_point.balance_at::(height) } - pub fn supply_at(point: DefaultPoint, height: T::BlockNumber) -> BalanceOf { + pub fn supply_at(point: DefaultPoint, height: BlockNumberFor) -> BalanceOf { let mut last_point = point; let mut t_i = Self::round_height(last_point.ts); @@ -612,7 +613,7 @@ impl Pallet { last_point.bias } - pub fn total_supply(height: Option) -> BalanceOf { + pub fn total_supply(height: Option>) -> BalanceOf { let height = height.unwrap_or(Self::current_height()); let last_point = >::get(>::get()); Self::supply_at(last_point, height) diff --git a/crates/escrow/src/mock.rs b/crates/escrow/src/mock.rs index 32cebfcbaa..fcf3cf3286 100644 --- a/crates/escrow/src/mock.rs +++ b/crates/escrow/src/mock.rs @@ -1,5 +1,5 @@ use crate as escrow; -use crate::{Config, Error}; +use crate::{Config, Convert, Error}; use frame_support::{ parameter_types, traits::{ConstU32, Everything}, @@ -8,23 +8,17 @@ pub use primitives::{CurrencyId, CurrencyId::Token, TokenSymbol::*}; use sp_arithmetic::FixedI128; use sp_core::H256; use sp_runtime::{ - generic::Header as GenericHeader, - traits::{BlakeTwo256, Identity, IdentityLookup}, + traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, }; -type Header = GenericHeader; - -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Balances: pallet_balances::{Pallet, Call, Storage, Event}, Rewards: reward::{Pallet, Call, Storage, Event}, Escrow: escrow::{Pallet, Call, Storage, Event}, @@ -33,8 +27,7 @@ frame_support::construct_runtime!( pub type AccountId = u64; pub type Balance = u128; -pub type BlockNumber = u128; -pub type Index = u64; +pub type BlockNumber = u64; pub type SignedFixedPoint = FixedI128; parameter_types! { @@ -49,13 +42,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = Index; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -83,7 +75,7 @@ impl pallet_balances::Config for Test { type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxFreezes = (); type MaxHolds = (); @@ -103,9 +95,17 @@ parameter_types! { pub const MaxPeriod: BlockNumber = 100; } +pub struct BlockNumberToBalance; + +impl Convert for BlockNumberToBalance { + fn convert(a: BlockNumber) -> Balance { + a.into() + } +} + impl Config for Test { type RuntimeEvent = RuntimeEvent; - type BlockNumberToBalance = Identity; + type BlockNumberToBalance = BlockNumberToBalance; type Currency = Balances; type Span = Span; type MaxPeriod = MaxPeriod; @@ -121,7 +121,7 @@ pub const BOB: AccountId = 2; pub struct ExtBuilder; impl ExtBuilder { pub fn build() -> sp_io::TestExternalities { - let storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); storage.into() } } diff --git a/crates/escrow/src/tests.rs b/crates/escrow/src/tests.rs index d909d5ff00..4054698ead 100644 --- a/crates/escrow/src/tests.rs +++ b/crates/escrow/src/tests.rs @@ -29,11 +29,11 @@ fn should_lock_and_degrade_power() { let slope = amount / max_time; let bias = slope * (end_time - start_time); - create_lock(ALICE, amount, end_time); + create_lock(ALICE, amount.into(), end_time); for current_time in [0, 50, 100] { let balance = bias - (slope * (current_time - start_time)); - assert_eq!(Escrow::balance_at(&ALICE, Some(current_time)), balance); + assert_eq!(Escrow::balance_at(&ALICE, Some(current_time)), balance.into()); } }) } @@ -92,18 +92,18 @@ fn should_increase_unlock_height() { TestError::LockHasExpired ); - create_lock(ALICE, amount, max_time); + create_lock(ALICE, amount.into(), max_time); let half_time = max_time / 2; System::set_block_number(half_time); - assert_eq!(Escrow::balance_at(&ALICE, Some(half_time)), amount / 2); + assert_eq!(Escrow::balance_at(&ALICE, Some(half_time)), (amount / 2).into()); assert_ok!(Escrow::increase_unlock_height( RuntimeOrigin::signed(ALICE), half_time + max_time )); - assert_eq!(Escrow::balance_at(&ALICE, Some(half_time)), amount); + assert_eq!(Escrow::balance_at(&ALICE, Some(half_time)), amount.into()); }) } @@ -225,9 +225,9 @@ fn should_not_allow_amount_smaller_than_max_period() { let end_time = MaxPeriod::get(); let amount = end_time / 2; - >::make_free_balance_be(&ALICE, amount); + >::make_free_balance_be(&ALICE, amount.into()); assert_err!( - Escrow::create_lock(RuntimeOrigin::signed(ALICE), amount, end_time), + Escrow::create_lock(RuntimeOrigin::signed(ALICE), amount.into(), end_time), TestError::LockAmountTooLow ); }) diff --git a/crates/farming/Cargo.toml b/crates/farming/Cargo.toml index 26f9a00303..df71a96bc6 100644 --- a/crates/farming/Cargo.toml +++ b/crates/farming/Cargo.toml @@ -6,7 +6,7 @@ name = "farming" version = "1.0.0" [dependencies] -serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -38,7 +38,7 @@ pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "p [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", "scale-info/std", diff --git a/crates/farming/src/lib.rs b/crates/farming/src/lib.rs index b44ee808a3..17afa325bd 100644 --- a/crates/farming/src/lib.rs +++ b/crates/farming/src/lib.rs @@ -108,7 +108,7 @@ pub mod pallet { /// The period to accrue rewards. #[pallet::constant] - type RewardPeriod: Get; + type RewardPeriod: Get>; /// Reward pools to track stake. type RewardPools: RewardsApi< @@ -155,8 +155,8 @@ pub mod pallet { } #[pallet::hooks] - impl Hooks for Pallet { - fn on_initialize(now: T::BlockNumber) -> Weight { + impl Hooks> for Pallet { + fn on_initialize(now: BlockNumberFor) -> Weight { if now % T::RewardPeriod::get() == Zero::zero() { let mut count: u32 = 0; // collect first to avoid modifying in-place diff --git a/crates/farming/src/mock.rs b/crates/farming/src/mock.rs index add5686f41..ca2160d27a 100644 --- a/crates/farming/src/mock.rs +++ b/crates/farming/src/mock.rs @@ -9,23 +9,17 @@ pub use primitives::{CurrencyId, CurrencyId::Token, LpToken, TokenSymbol::*}; use sp_arithmetic::FixedI128; use sp_core::H256; use sp_runtime::{ - generic::Header as GenericHeader, traits::{AccountIdConversion, BlakeTwo256, IdentityLookup}, + BuildStorage, }; -type Header = GenericHeader; - -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Tokens: orml_tokens::{Pallet, Storage, Config, Event}, Rewards: reward::{Pallet, Call, Storage, Event}, Farming: farming::{Pallet, Call, Storage, Event}, @@ -34,8 +28,6 @@ frame_support::construct_runtime!( pub type AccountId = u64; pub type Balance = u128; -pub type BlockNumber = u128; -pub type Index = u64; pub type SignedFixedPoint = FixedI128; parameter_types! { @@ -50,13 +42,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = Index; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -106,7 +97,7 @@ impl reward::Config for Test { parameter_types! { pub const FarmingPalletId: PalletId = PalletId(*b"farmings"); pub TreasuryAccountId: AccountId = PalletId(*b"treasury").into_account_truncating(); - pub const RewardPeriod: BlockNumber = 10; + pub const RewardPeriod: u64 = 10; } impl Config for Test { @@ -126,7 +117,7 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build() -> sp_io::TestExternalities { - let storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); storage.into() } diff --git a/crates/fee/Cargo.toml b/crates/fee/Cargo.toml index b1c91e3c7e..dec346570e 100644 --- a/crates/fee/Cargo.toml +++ b/crates/fee/Cargo.toml @@ -6,7 +6,7 @@ name = "fee" version = "1.2.0" [dependencies] -serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -47,7 +47,7 @@ orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-li [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", "scale-info/std", diff --git a/crates/fee/src/lib.rs b/crates/fee/src/lib.rs index f068593be3..321efd28d4 100644 --- a/crates/fee/src/lib.rs +++ b/crates/fee/src/lib.rs @@ -86,9 +86,9 @@ pub mod pallet { >; /// Vault staking pool. - type VaultStaking: StakingApi, Self::Index, BalanceOf> + type VaultStaking: StakingApi, Self::Nonce, BalanceOf> + RewardsApi< - (Option, DefaultVaultId), + (Option, DefaultVaultId), Self::AccountId, BalanceOf, CurrencyId = CurrencyId, @@ -176,6 +176,7 @@ pub mod pallet { StorageMap<_, Blake2_128Concat, DefaultVaultId, UnsignedFixedPoint, OptionQuery>; #[pallet::genesis_config] + #[derive(frame_support::DefaultNoBound)] pub struct GenesisConfig { pub issue_fee: UnsignedFixedPoint, pub issue_griefing_collateral: UnsignedFixedPoint, @@ -185,22 +186,8 @@ pub mod pallet { pub replace_griefing_collateral: UnsignedFixedPoint, } - #[cfg(feature = "std")] - impl Default for GenesisConfig { - fn default() -> Self { - Self { - issue_fee: Default::default(), - issue_griefing_collateral: Default::default(), - redeem_fee: Default::default(), - premium_redeem_fee: Default::default(), - punishment_fee: Default::default(), - replace_griefing_collateral: Default::default(), - } - } - } - #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { IssueFee::::put(self.issue_fee); IssueGriefingCollateral::::put(self.issue_griefing_collateral); @@ -228,7 +215,7 @@ pub mod pallet { pub fn withdraw_rewards( origin: OriginFor, vault_id: DefaultVaultId, - index: Option, + index: Option, ) -> DispatchResultWithPostInfo { let nominator_id = ensure_signed(origin)?; for currency_id in [vault_id.wrapped_currency(), T::GetNativeCurrencyId::get()] { @@ -490,7 +477,7 @@ impl Pallet { fn withdraw_vault_rewards( vault_id: &DefaultVaultId, nominator_id: &T::AccountId, - index: Option, + index: Option, currency_id: CurrencyId, ) -> Result, DispatchError> { Self::distribute_vault_rewards(&vault_id, currency_id)?; diff --git a/crates/fee/src/mock.rs b/crates/fee/src/mock.rs index 4b91c2520e..7df104ddd5 100644 --- a/crates/fee/src/mock.rs +++ b/crates/fee/src/mock.rs @@ -12,22 +12,17 @@ pub use primitives::{CurrencyId, CurrencyId::Token, TokenSymbol::*}; use sp_arithmetic::{FixedI128, FixedU128}; use sp_core::H256; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup, Zero}, - DispatchError, FixedPointNumber, + BuildStorage, DispatchError, FixedPointNumber, }; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, // Tokens & Balances @@ -46,9 +41,7 @@ frame_support::construct_runtime!( pub type AccountId = u64; pub type Balance = u128; pub type RawAmount = i128; -pub type BlockNumber = u64; pub type Moment = u64; -pub type Index = u64; pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; pub type UnsignedFixedPoint = FixedU128; @@ -65,13 +58,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = Index; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -221,7 +213,7 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build() -> sp_io::TestExternalities { - let storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); storage.into() } diff --git a/crates/issue/Cargo.toml b/crates/issue/Cargo.toml index c43ffd3a35..fa5138c380 100644 --- a/crates/issue/Cargo.toml +++ b/crates/issue/Cargo.toml @@ -6,7 +6,7 @@ name = "issue" version = "1.2.0" [dependencies] -serde = { version = "1.0.130", default-features = false, features = ['derive'], optional = true } +serde = { version = "1.0.130", default-features = false, features = ['derive'] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } @@ -55,7 +55,7 @@ orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-li [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", "sp-io/std", diff --git a/crates/issue/src/ext.rs b/crates/issue/src/ext.rs index 69ed75a1a5..d548bb6b9f 100644 --- a/crates/issue/src/ext.rs +++ b/crates/issue/src/ext.rs @@ -6,6 +6,7 @@ pub(crate) mod btc_relay { use bitcoin::types::{FullTransactionProof, Value}; use btc_relay::BtcAddress; use frame_support::dispatch::DispatchError; + use frame_system::pallet_prelude::BlockNumberFor; use sp_std::convert::TryFrom; pub fn get_and_verify_issue_payment>( @@ -24,9 +25,9 @@ pub(crate) mod btc_relay { } pub fn has_request_expired( - opentime: T::BlockNumber, + opentime: BlockNumberFor, btc_open_height: u32, - period: T::BlockNumber, + period: BlockNumberFor, ) -> Result { >::has_request_expired(opentime, btc_open_height, period) } @@ -115,13 +116,14 @@ pub(crate) mod vault_registry { #[cfg_attr(test, mockable)] pub(crate) mod security { + use frame_system::pallet_prelude::BlockNumberFor; use sp_core::H256; pub fn get_secure_id(id: &T::AccountId) -> H256 { >::get_secure_id(id) } - pub fn active_block_number() -> T::BlockNumber { + pub fn active_block_number() -> BlockNumberFor { >::active_block_number() } } diff --git a/crates/issue/src/lib.rs b/crates/issue/src/lib.rs index 509422f5ca..f5a9af1a44 100644 --- a/crates/issue/src/lib.rs +++ b/crates/issue/src/lib.rs @@ -90,7 +90,7 @@ pub mod pallet { type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// Convert the block number into a balance. - type BlockNumberToBalance: Convert>; + type BlockNumberToBalance: Convert, BalanceOf>; /// Weight information for the extrinsics in this module. type WeightInfo: WeightInfo; @@ -129,7 +129,7 @@ pub mod pallet { griefing_collateral: BalanceOf, }, IssuePeriodChange { - period: T::BlockNumber, + period: BlockNumberFor, }, } @@ -167,7 +167,7 @@ pub mod pallet { /// to prevent griefing of vault collateral. #[pallet::storage] #[pallet::getter(fn issue_period)] - pub(super) type IssuePeriod = StorageValue<_, T::BlockNumber, ValueQuery>; + pub(super) type IssuePeriod = StorageValue<_, BlockNumberFor, ValueQuery>; /// The minimum amount of btc that is required for issue requests; lower values would /// risk the rejection of payment on Bitcoin. @@ -185,23 +185,14 @@ pub mod pallet { pub(super) type StorageVersion = StorageValue<_, Version, ValueQuery, DefaultForStorageVersion>; #[pallet::genesis_config] + #[derive(frame_support::DefaultNoBound)] pub struct GenesisConfig { - pub issue_period: T::BlockNumber, + pub issue_period: BlockNumberFor, pub issue_btc_dust_value: BalanceOf, } - #[cfg(feature = "std")] - impl Default for GenesisConfig { - fn default() -> Self { - Self { - issue_period: Default::default(), - issue_btc_dust_value: Default::default(), - } - } - } - #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { IssuePeriod::::put(self.issue_period); IssueBtcDustValue::::put(self.issue_btc_dust_value); @@ -285,7 +276,7 @@ pub mod pallet { #[pallet::call_index(3)] #[pallet::weight(::WeightInfo::set_issue_period())] #[transactional] - pub fn set_issue_period(origin: OriginFor, period: T::BlockNumber) -> DispatchResultWithPostInfo { + pub fn set_issue_period(origin: OriginFor, period: BlockNumberFor) -> DispatchResultWithPostInfo { ensure_root(origin)?; >::set(period); Self::deposit_event(Event::IssuePeriodChange { period }); diff --git a/crates/issue/src/migration.rs b/crates/issue/src/migration.rs index 216916123c..201e2cbdfa 100644 --- a/crates/issue/src/migration.rs +++ b/crates/issue/src/migration.rs @@ -8,6 +8,7 @@ const TARGET: &'static str = "runtime::issue::migration::v1"; /// The original data layout of the democracy pallet without a specific version number. mod v0 { use super::*; + use frame_system::pallet_prelude::BlockNumberFor; #[frame_support::storage_alias] pub(super) type IssueRequests = @@ -42,7 +43,7 @@ mod v0 { pub type DefaultIssueRequest = IssueRequest< ::AccountId, - ::BlockNumber, + BlockNumberFor, ::Balance, vault_registry::types::CurrencyId, >; @@ -51,11 +52,14 @@ mod v0 { pub mod v1 { use super::*; + #[cfg(feature = "try-runtime")] + use sp_runtime::TryRuntimeError; + pub struct Migration(sp_std::marker::PhantomData); impl> OnRuntimeUpgrade for Migration { #[cfg(feature = "try-runtime")] - fn pre_upgrade() -> Result, &'static str> { + fn pre_upgrade() -> Result, TryRuntimeError> { assert_eq!(StorageVersion::get::>(), 0, "can only upgrade from version 0"); let issue_count = v0::IssueRequests::::iter().count(); @@ -101,7 +105,7 @@ pub mod v1 { } #[cfg(feature = "try-runtime")] - fn post_upgrade(state: Vec) -> Result<(), &'static str> { + fn post_upgrade(state: Vec) -> Result<(), TryRuntimeError> { assert_eq!(StorageVersion::get::>(), 1, "must upgrade"); let old_issue_count: u32 = diff --git a/crates/issue/src/mock.rs b/crates/issue/src/mock.rs index b045e5bb67..633e1c67d8 100644 --- a/crates/issue/src/mock.rs +++ b/crates/issue/src/mock.rs @@ -3,7 +3,7 @@ use crate::{ext, Config, Error}; use currency::Amount; use frame_support::{ assert_ok, parameter_types, - traits::{ConstU32, Everything, GenesisBuild}, + traits::{ConstU32, Everything}, PalletId, }; use mocktopus::{macros::mockable, mocking::*}; @@ -13,22 +13,19 @@ use primitives::{VaultCurrencyPair, VaultId}; use sp_arithmetic::{FixedI128, FixedPointNumber, FixedU128}; use sp_core::H256; use sp_runtime::{ - testing::{Header, TestXt}, + testing::TestXt, traits::{BlakeTwo256, Convert, IdentityLookup, One, Zero}, + BuildStorage, }; type TestExtrinsic = TestXt; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, // Tokens & Balances @@ -46,7 +43,7 @@ frame_support::construct_runtime!( Issue: issue::{Pallet, Call, Config, Storage, Event}, Fee: fee::{Pallet, Call, Config, Storage}, Currency: currency::{Pallet}, - Nomination: nomination::{Pallet, Call, Config, Storage, Event}, + Nomination: nomination::{Pallet, Call, Storage, Config, Event}, } ); @@ -55,7 +52,6 @@ pub type Balance = u128; pub type RawAmount = i128; pub type BlockNumber = u64; pub type Moment = u64; -pub type Index = u64; pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; pub type UnsignedFixedPoint = FixedU128; @@ -72,13 +68,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = Index; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -294,7 +289,7 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build_with(balances: orml_tokens::GenesisConfig) -> sp_io::TestExternalities { - let mut storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let mut storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); balances.assimilate_storage(&mut storage).unwrap(); @@ -309,6 +304,13 @@ impl ExtBuilder { .assimilate_storage(&mut storage) .unwrap(); + nomination::GenesisConfig:: { + is_nomination_enabled: true, + _marker: Default::default(), + } + .assimilate_storage(&mut storage) + .unwrap(); + issue::GenesisConfig:: { issue_period: 10, issue_btc_dust_value: 0, diff --git a/crates/issue/src/types.rs b/crates/issue/src/types.rs index d1d1cadb2c..851cb7aa5a 100644 --- a/crates/issue/src/types.rs +++ b/crates/issue/src/types.rs @@ -1,5 +1,6 @@ use codec::{Decode, Encode, MaxEncodedLen}; use currency::Amount; +use frame_system::pallet_prelude::BlockNumberFor; pub use primitives::issue::{IssueRequest, IssueRequestStatus}; use primitives::VaultId; use scale_info::TypeInfo; @@ -26,12 +27,8 @@ pub(crate) type BalanceOf = ::Balance; pub(crate) type DefaultVaultId = VaultId<::AccountId, CurrencyId>; -pub type DefaultIssueRequest = IssueRequest< - ::AccountId, - ::BlockNumber, - BalanceOf, - CurrencyId, ->; +pub type DefaultIssueRequest = + IssueRequest<::AccountId, BlockNumberFor, BalanceOf, CurrencyId>; pub trait IssueRequestExt { fn amount(&self) -> Amount; diff --git a/crates/loans/Cargo.toml b/crates/loans/Cargo.toml index 288434c9d9..9852952375 100644 --- a/crates/loans/Cargo.toml +++ b/crates/loans/Cargo.toml @@ -8,7 +8,7 @@ version = "1.9.3" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -serde = { version = "1.0.136", default-features = false, features = ["derive"], optional = true } +serde = { version = "1.0.136", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } num-traits = { default-features = false, version = "0.2" } diff --git a/crates/loans/rpc/Cargo.toml b/crates/loans/rpc/Cargo.toml index 3bb933800c..bebce86fcf 100644 --- a/crates/loans/rpc/Cargo.toml +++ b/crates/loans/rpc/Cargo.toml @@ -8,7 +8,7 @@ version = "1.9.3" codec = { package = "parity-scale-codec", version = "3.1.5" } jsonrpsee = { version = "0.16.2", features = ["server", "macros"] } primitives = { package = "interbtc-primitives", path = "../../../primitives" } -serde = { version = "1.0.136", features = ["derive"] } +serde = { version = "1.0.136", features = ["derive"], default-features = false } sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.31" } sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.31" } sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.31" } diff --git a/crates/loans/src/farming.rs b/crates/loans/src/farming.rs index 59225496b1..3738b71610 100644 --- a/crates/loans/src/farming.rs +++ b/crates/loans/src/farming.rs @@ -29,7 +29,7 @@ impl Pallet { } fn calculate_reward_delta_index( - delta_block: T::BlockNumber, + delta_block: BlockNumberFor, reward_speed: BalanceOf, total_share: BalanceOf, ) -> Result { diff --git a/crates/loans/src/lib.rs b/crates/loans/src/lib.rs index 61e859ff58..e1f4d83227 100644 --- a/crates/loans/src/lib.rs +++ b/crates/loans/src/lib.rs @@ -531,13 +531,13 @@ pub mod pallet { #[pallet::storage] #[pallet::getter(fn reward_supply_state)] pub type RewardSupplyState = - StorageMap<_, Blake2_128Concat, CurrencyId, RewardMarketState>, ValueQuery>; + StorageMap<_, Blake2_128Concat, CurrencyId, RewardMarketState, BalanceOf>, ValueQuery>; /// The Reward market borrow state for each market #[pallet::storage] #[pallet::getter(fn reward_borrow_state)] pub type RewardBorrowState = - StorageMap<_, Blake2_128Concat, CurrencyId, RewardMarketState>, ValueQuery>; + StorageMap<_, Blake2_128Concat, CurrencyId, RewardMarketState, BalanceOf>, ValueQuery>; /// The incentive reward index for each market for each supplier as of the last time they accrued Reward #[pallet::storage] @@ -577,23 +577,15 @@ pub mod pallet { pub(crate) type StorageVersion = StorageValue<_, Versions, ValueQuery, DefaultVersion>; #[pallet::genesis_config] - pub struct GenesisConfig { + #[derive(frame_support::DefaultNoBound)] + pub struct GenesisConfig { pub max_exchange_rate: Rate, pub min_exchange_rate: Rate, - } - - #[cfg(feature = "std")] - impl Default for GenesisConfig { - fn default() -> Self { - Self { - max_exchange_rate: Rate::from_inner(DEFAULT_MAX_EXCHANGE_RATE), - min_exchange_rate: Rate::from_inner(DEFAULT_MIN_EXCHANGE_RATE), - } - } + pub _marker: PhantomData, } #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { MaxExchangeRate::::put(&self.max_exchange_rate); MinExchangeRate::::put(&self.min_exchange_rate); diff --git a/crates/loans/src/mock.rs b/crates/loans/src/mock.rs index b84f9d102a..d65ba061ed 100644 --- a/crates/loans/src/mock.rs +++ b/crates/loans/src/mock.rs @@ -34,21 +34,16 @@ use primitives::{ DOT, IBTC, INTR, KBTC, KINT, KSM, }; use sp_core::H256; -use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32, FixedI128}; -use sp_std::vec::Vec; +use sp_runtime::{traits::IdentityLookup, AccountId32, BuildStorage, FixedI128}; use traits::OracleApi; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Loans: loans::{Pallet, Storage, Call, Event, Config}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, + Loans: loans::{Pallet, Call, Storage, Event, Config}, TimestampPallet: pallet_timestamp::{Pallet, Call, Storage, Inherent}, Tokens: orml_tokens::{Pallet, Call, Storage, Config, Event}, Currency: currency::{Pallet}, @@ -71,13 +66,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -313,15 +307,14 @@ pub(crate) fn set_mock_balances() { pub(crate) fn new_test_ext() -> sp_io::TestExternalities { use mocktopus::mocking::Mockable; - let mut t = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let mut t = frame_system::GenesisConfig::::default().build_storage().unwrap(); - GenesisBuild::::assimilate_storage( - &loans::GenesisConfig { - max_exchange_rate: Rate::from_inner(DEFAULT_MAX_EXCHANGE_RATE), - min_exchange_rate: Rate::from_inner(DEFAULT_MIN_EXCHANGE_RATE), - }, - &mut t, - ) + loans::GenesisConfig:: { + max_exchange_rate: Rate::from_inner(DEFAULT_MAX_EXCHANGE_RATE), + min_exchange_rate: Rate::from_inner(DEFAULT_MIN_EXCHANGE_RATE), + _marker: Default::default(), + } + .assimilate_storage(&mut t) .unwrap(); let mut ext = sp_io::TestExternalities::new(t); @@ -354,15 +347,14 @@ pub(crate) fn new_test_ext() -> sp_io::TestExternalities { pub(crate) fn new_test_ext_no_markets() -> sp_io::TestExternalities { use mocktopus::mocking::Mockable; - let mut t = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let mut t = frame_system::GenesisConfig::::default().build_storage().unwrap(); - GenesisBuild::::assimilate_storage( - &loans::GenesisConfig { - max_exchange_rate: Rate::from_inner(DEFAULT_MAX_EXCHANGE_RATE), - min_exchange_rate: Rate::from_inner(DEFAULT_MIN_EXCHANGE_RATE), - }, - &mut t, - ) + loans::GenesisConfig:: { + max_exchange_rate: Rate::from_inner(DEFAULT_MAX_EXCHANGE_RATE), + min_exchange_rate: Rate::from_inner(DEFAULT_MIN_EXCHANGE_RATE), + _marker: Default::default(), + } + .assimilate_storage(&mut t) .unwrap(); let mut ext = sp_io::TestExternalities::new(t); diff --git a/crates/loans/src/rate_model.rs b/crates/loans/src/rate_model.rs index cc17bb45f5..2da4a4cdc3 100644 --- a/crates/loans/src/rate_model.rs +++ b/crates/loans/src/rate_model.rs @@ -23,8 +23,19 @@ use sp_runtime::traits::{CheckedAdd, CheckedDiv, CheckedSub, Saturating}; use crate::*; /// Parallel interest rate model -#[cfg_attr(feature = "std", derive(serde::Deserialize, serde::Serialize))] -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, TypeInfo, MaxEncodedLen)] +#[derive( + serde::Deserialize, + serde::Serialize, + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + TypeInfo, + MaxEncodedLen, +)] pub enum InterestRateModel { Jump(JumpModel), Curve(CurveModel), @@ -76,8 +87,20 @@ impl InterestRateModel { } /// The jump interest rate model -#[cfg_attr(feature = "std", derive(serde::Deserialize, serde::Serialize))] -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, Default, TypeInfo, MaxEncodedLen)] +#[derive( + serde::Deserialize, + serde::Serialize, + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + Default, + TypeInfo, + MaxEncodedLen, +)] pub struct JumpModel { /// The base interest rate when utilization rate is 0 pub base_rate: Rate, @@ -147,8 +170,20 @@ impl JumpModel { } /// The curve interest rate model -#[cfg_attr(feature = "std", derive(serde::Deserialize, serde::Serialize))] -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, Default, TypeInfo, MaxEncodedLen)] +#[derive( + serde::Deserialize, + serde::Serialize, + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + Default, + TypeInfo, + MaxEncodedLen, +)] pub struct CurveModel { pub base_rate: Rate, } diff --git a/crates/loans/src/types.rs b/crates/loans/src/types.rs index 871ab6765d..9bb916dfae 100644 --- a/crates/loans/src/types.rs +++ b/crates/loans/src/types.rs @@ -76,8 +76,19 @@ pub struct EarnedSnapshot { } /// The current state of a market. For more information, see [Market]. -#[cfg_attr(feature = "std", derive(serde::Deserialize, serde::Serialize))] -#[derive(Clone, Copy, PartialEq, Eq, codec::Decode, codec::Encode, RuntimeDebug, TypeInfo, MaxEncodedLen)] +#[derive( + serde::Deserialize, + serde::Serialize, + Clone, + Copy, + PartialEq, + Eq, + codec::Decode, + codec::Encode, + RuntimeDebug, + TypeInfo, + MaxEncodedLen, +)] pub enum MarketState { Active, Pending, @@ -89,8 +100,18 @@ pub enum MarketState { /// Market. /// /// A large pool of liquidity where accounts can lend and borrow. -#[cfg_attr(feature = "std", derive(serde::Deserialize, serde::Serialize))] -#[derive(Clone, PartialEq, Eq, codec::Decode, codec::Encode, RuntimeDebug, TypeInfo, MaxEncodedLen)] +#[derive( + serde::Deserialize, + serde::Serialize, + Clone, + PartialEq, + Eq, + codec::Decode, + codec::Encode, + RuntimeDebug, + TypeInfo, + MaxEncodedLen, +)] pub struct Market { /// The secure collateral ratio pub collateral_factor: Ratio, diff --git a/crates/multi-transaction-payment/Cargo.toml b/crates/multi-transaction-payment/Cargo.toml index 10d7b91b0e..e96fa59ce1 100644 --- a/crates/multi-transaction-payment/Cargo.toml +++ b/crates/multi-transaction-payment/Cargo.toml @@ -7,7 +7,7 @@ name = "multi-transaction-payment" version = "1.2.0" [dependencies] -serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -39,7 +39,7 @@ sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "pol [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", "scale-info/std", diff --git a/crates/multi-transaction-payment/src/mock.rs b/crates/multi-transaction-payment/src/mock.rs index deb13e842f..15bcae177a 100644 --- a/crates/multi-transaction-payment/src/mock.rs +++ b/crates/multi-transaction-payment/src/mock.rs @@ -19,11 +19,10 @@ pub use primitives::{CurrencyId, CurrencyId::*, TokenSymbol::*}; use sp_arithmetic::{FixedI128, FixedPointNumber, FixedU128, Perquintill}; use sp_core::{ConstU32, Get, H256}; use sp_runtime::{ - testing::Header, traits::{AccountIdConversion, BlakeTwo256, Bounded, IdentityLookup}, + BuildStorage, }; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; pub type NativeCurrency = CurrencyAdapter; pub type SlowAdjustingFeeUpdate = @@ -35,12 +34,9 @@ pub type SignedInner = i128; pub type UnsignedFixedPoint = FixedU128; frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Config, Storage, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, DexGeneral: dex_general::{Pallet, Call, Storage, Event}, Currency: currency::{Pallet}, Tokens: orml_tokens::{Pallet, Storage, Event, Config}, @@ -176,14 +172,13 @@ impl testing_helpers::Config for Test {} impl frame_system::Config for Test { type BaseCallFilter = frame_support::traits::Everything; type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; - type BlockNumber = u64; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = u128; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); @@ -251,11 +246,7 @@ impl dex_general::Config for Test { } pub fn new_test_ext() -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() - .unwrap() - .into(); - + let mut t = frame_system::GenesisConfig::::default().build_storage().unwrap(); dex_general::GenesisConfig:: { fee_receiver: None, fee_point: 5, diff --git a/crates/nomination/Cargo.toml b/crates/nomination/Cargo.toml index afeb13d1a3..aede9a3131 100644 --- a/crates/nomination/Cargo.toml +++ b/crates/nomination/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Interlay Ltd"] edition = "2021" [dependencies] -serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -49,7 +49,7 @@ orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-li [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", "sp-runtime/std", diff --git a/crates/nomination/src/ext.rs b/crates/nomination/src/ext.rs index 5124274e3f..5bd0a522e7 100644 --- a/crates/nomination/src/ext.rs +++ b/crates/nomination/src/ext.rs @@ -56,7 +56,7 @@ pub(crate) mod vault_registry { vault_id: &DefaultVaultId, nominator_id: &T::AccountId, maybe_amount: Option>, - nonce: Option<::Index>, + nonce: Option<::Nonce>, ) -> Result, DispatchError> { >::withdraw_collateral(vault_id, nominator_id, maybe_amount, nonce) } @@ -74,7 +74,7 @@ pub(crate) mod staking { use staking::{RewardsApi, StakingApi}; use vault_registry::DefaultVaultId; - pub fn nonce(vault_id: &DefaultVaultId) -> T::Index { + pub fn nonce(vault_id: &DefaultVaultId) -> T::Nonce { T::VaultStaking::nonce(vault_id) } diff --git a/crates/nomination/src/lib.rs b/crates/nomination/src/lib.rs index 2dfe9a2a05..843afb24a0 100644 --- a/crates/nomination/src/lib.rs +++ b/crates/nomination/src/lib.rs @@ -95,7 +95,7 @@ pub mod pallet { } #[pallet::hooks] - impl Hooks for Pallet {} + impl Hooks> for Pallet {} /// Flag indicating whether this feature is enabled #[pallet::storage] @@ -112,21 +112,14 @@ pub mod pallet { StorageMap<_, Blake2_128Concat, DefaultVaultId, BalanceOf, ValueQuery>; #[pallet::genesis_config] - pub struct GenesisConfig { + #[derive(frame_support::DefaultNoBound)] + pub struct GenesisConfig { pub is_nomination_enabled: bool, - } - - #[cfg(feature = "std")] - impl Default for GenesisConfig { - fn default() -> Self { - Self { - is_nomination_enabled: Default::default(), - } - } + pub _marker: PhantomData, } #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { { NominationEnabled::::put(self.is_nomination_enabled); @@ -198,7 +191,7 @@ pub mod pallet { origin: OriginFor, vault_id: DefaultVaultId, amount: Option>, - index: Option, + index: Option, ) -> DispatchResultWithPostInfo { let nominator_id = ensure_signed(origin)?; Self::_withdraw_collateral(&vault_id, &nominator_id, amount, index.unwrap_or_default())?; @@ -229,7 +222,7 @@ impl Pallet { vault_id: &DefaultVaultId, nominator_id: &T::AccountId, maybe_amount: Option>, - index: T::Index, + index: T::Nonce, ) -> DispatchResult { let nonce = ext::staking::nonce::(vault_id); let index = sp_std::cmp::min(index, nonce); diff --git a/crates/nomination/src/mock.rs b/crates/nomination/src/mock.rs index c1e00c0811..3b65ab6f07 100644 --- a/crates/nomination/src/mock.rs +++ b/crates/nomination/src/mock.rs @@ -3,7 +3,7 @@ use crate::{Config, Error}; use currency::Amount; use frame_support::{ assert_ok, parameter_types, - traits::{ConstU32, Everything, GenesisBuild}, + traits::{ConstU32, Everything}, PalletId, }; use frame_system::EnsureRoot; @@ -14,23 +14,19 @@ use primitives::{VaultCurrencyPair, VaultId}; use sp_arithmetic::{FixedI128, FixedU128}; use sp_core::H256; use sp_runtime::{ - testing::{Header, TestXt}, + testing::TestXt, traits::{BlakeTwo256, IdentityLookup, One, Zero}, - FixedPointNumber, + BuildStorage, FixedPointNumber, }; type TestExtrinsic = TestXt; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, // Tokens & Balances @@ -45,18 +41,16 @@ frame_support::construct_runtime!( VaultRegistry: vault_registry::{Pallet, Call, Config, Storage, Event}, Fee: fee::{Pallet, Call, Config, Storage}, Oracle: oracle::{Pallet, Call, Config, Storage, Event}, - Nomination: nomination::{Pallet, Call, Config, Storage, Event}, + Nomination: nomination::{Pallet, Call, Storage, Config, Event}, Currency: currency::{Pallet}, - Loans: loans::{Pallet, Storage, Call, Event, Config}, + Loans: loans::{Pallet, Call, Storage, Event, Config}, } ); pub type AccountId = u64; pub type Balance = u128; pub type RawAmount = i128; -pub type BlockNumber = u64; pub type Moment = u64; -pub type Index = u64; pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; pub type UnsignedFixedPoint = FixedU128; @@ -73,13 +67,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = Index; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -294,16 +287,15 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build_with(balances: orml_tokens::GenesisConfig) -> sp_io::TestExternalities { - let mut storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let mut storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); balances.assimilate_storage(&mut storage).unwrap(); - frame_support::traits::GenesisBuild::::assimilate_storage( - &nomination::GenesisConfig { - is_nomination_enabled: true, - }, - &mut storage, - ) + nomination::GenesisConfig:: { + is_nomination_enabled: true, + _marker: Default::default(), + } + .assimilate_storage(&mut storage) .unwrap(); fee::GenesisConfig:: { diff --git a/crates/oracle/src/lib.rs b/crates/oracle/src/lib.rs index a9abc3e2cb..3af135edb9 100644 --- a/crates/oracle/src/lib.rs +++ b/crates/oracle/src/lib.rs @@ -36,7 +36,7 @@ use frame_support::{ weights::Weight, BoundedVec, }; -use frame_system::{ensure_root, ensure_signed}; +use frame_system::{ensure_root, ensure_signed, pallet_prelude::BlockNumberFor}; use scale_info::TypeInfo; use sp_runtime::traits::*; use sp_std::{convert::TryInto, vec::Vec}; @@ -111,8 +111,8 @@ pub mod pallet { } #[pallet::hooks] - impl Hooks for Pallet { - fn on_initialize(n: T::BlockNumber) -> Weight { + impl Hooks> for Pallet { + fn on_initialize(n: BlockNumberFor) -> Weight { let iterations = Self::begin_block(n); ::WeightInfo::on_initialize(iterations) } @@ -161,23 +161,14 @@ pub mod pallet { pub(super) type StorageVersion = StorageValue<_, Version, ValueQuery, DefaultForStorageVersion>; #[pallet::genesis_config] + #[derive(frame_support::DefaultNoBound)] pub struct GenesisConfig { pub max_delay: u32, pub authorized_oracles: Vec<(T::AccountId, NameOf)>, } - #[cfg(feature = "std")] - impl Default for GenesisConfig { - fn default() -> Self { - Self { - max_delay: Default::default(), - authorized_oracles: Default::default(), - } - } - } - #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { // T::Moment doesn't implement serialize so we use // From as bound by AtLeast32Bit @@ -257,7 +248,7 @@ pub mod pallet { #[cfg_attr(test, mockable)] impl Pallet { // public only for testing purposes - pub fn begin_block(_height: T::BlockNumber) -> u32 { + pub fn begin_block(_height: BlockNumberFor) -> u32 { // read to a temporary value, because we can't alter the map while we iterate over it let raw_values_updated: Vec<_> = RawValuesUpdated::::iter().collect(); diff --git a/crates/oracle/src/mock.rs b/crates/oracle/src/mock.rs index 16a74ebbec..57882d2dbf 100644 --- a/crates/oracle/src/mock.rs +++ b/crates/oracle/src/mock.rs @@ -2,7 +2,7 @@ use crate as oracle; use crate::{Config, Error}; use frame_support::{ parameter_types, - traits::{ConstU32, Everything, GenesisBuild}, + traits::{ConstU32, Everything}, BoundedVec, }; use mocktopus::mocking::clear_mocks; @@ -11,22 +11,18 @@ pub use primitives::{CurrencyId::Token, TokenSymbol::*}; use sp_arithmetic::{FixedI128, FixedU128}; use sp_core::H256; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, }; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { // substrate pallets - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, Tokens: orml_tokens::{Pallet, Storage, Config, Event}, @@ -40,13 +36,11 @@ frame_support::construct_runtime!( pub type AccountId = u64; pub type Balance = u128; -pub type BlockNumber = u64; pub type UnsignedFixedPoint = FixedU128; pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; pub type CurrencyId = primitives::CurrencyId; pub type Moment = u64; -pub type Index = u64; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -60,13 +54,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = Index; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -170,7 +163,7 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build() -> sp_io::TestExternalities { - let mut storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let mut storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); oracle::GenesisConfig:: { authorized_oracles: vec![(0, BoundedVec::try_from("test".as_bytes().to_vec()).unwrap())], diff --git a/crates/redeem/Cargo.toml b/crates/redeem/Cargo.toml index 4853f80647..fb47125adb 100644 --- a/crates/redeem/Cargo.toml +++ b/crates/redeem/Cargo.toml @@ -6,7 +6,7 @@ name = "redeem" version = "1.2.0" [dependencies] -serde = { version = "1.0.130", default-features = false, features = ['derive'], optional = true } +serde = { version = "1.0.130", default-features = false, features = ['derive'] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -54,7 +54,7 @@ orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-li [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", "sp-io/std", diff --git a/crates/redeem/src/ext.rs b/crates/redeem/src/ext.rs index a1156eb7e9..eb82f90acf 100644 --- a/crates/redeem/src/ext.rs +++ b/crates/redeem/src/ext.rs @@ -6,6 +6,7 @@ pub(crate) mod btc_relay { use bitcoin::types::{FullTransactionProof, Value}; use btc_relay::BtcAddress; use frame_support::dispatch::DispatchError; + use frame_system::pallet_prelude::BlockNumberFor; use sp_core::H256; use sp_std::convert::TryInto; @@ -28,9 +29,9 @@ pub(crate) mod btc_relay { } pub fn has_request_expired( - opentime: T::BlockNumber, + opentime: BlockNumberFor, btc_open_height: u32, - period: T::BlockNumber, + period: BlockNumberFor, ) -> Result { >::has_request_expired(opentime, btc_open_height, period) } @@ -180,13 +181,14 @@ pub(crate) mod treasury { #[cfg_attr(test, mockable)] pub(crate) mod security { + use frame_system::pallet_prelude::BlockNumberFor; use sp_core::H256; pub fn get_secure_id(id: &T::AccountId) -> H256 { >::get_secure_id(id) } - pub fn active_block_number() -> T::BlockNumber { + pub fn active_block_number() -> BlockNumberFor { >::active_block_number() } } diff --git a/crates/redeem/src/lib.rs b/crates/redeem/src/lib.rs index ffd3acc3f3..2cbccaf2ec 100644 --- a/crates/redeem/src/lib.rs +++ b/crates/redeem/src/lib.rs @@ -130,7 +130,7 @@ pub mod pallet { amount: BalanceOf, }, RedeemPeriodChange { - period: T::BlockNumber, + period: BlockNumberFor, }, SelfRedeem { vault_id: DefaultVaultId, @@ -166,7 +166,7 @@ pub mod pallet { /// punish a vault for inactivity or stealing BTC. #[pallet::storage] #[pallet::getter(fn redeem_period)] - pub(super) type RedeemPeriod = StorageValue<_, T::BlockNumber, ValueQuery>; + pub(super) type RedeemPeriod = StorageValue<_, BlockNumberFor, ValueQuery>; /// Users create redeem requests to receive BTC in return for their previously issued tokens. /// This mapping provides access from a unique hash redeemId to a Redeem struct. @@ -197,25 +197,15 @@ pub mod pallet { pub(super) type StorageVersion = StorageValue<_, Version, ValueQuery, DefaultForStorageVersion>; #[pallet::genesis_config] + #[derive(frame_support::DefaultNoBound)] pub struct GenesisConfig { - pub redeem_period: T::BlockNumber, + pub redeem_period: BlockNumberFor, pub redeem_btc_dust_value: BalanceOf, pub redeem_transaction_size: u32, } - #[cfg(feature = "std")] - impl Default for GenesisConfig { - fn default() -> Self { - Self { - redeem_period: Default::default(), - redeem_btc_dust_value: Default::default(), - redeem_transaction_size: Default::default(), - } - } - } - #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { RedeemPeriod::::put(self.redeem_period); RedeemBtcDustValue::::put(self.redeem_btc_dust_value); @@ -224,7 +214,7 @@ pub mod pallet { } #[pallet::hooks] - impl Hooks for Pallet {} + impl Hooks> for Pallet {} #[pallet::pallet] pub struct Pallet(_); @@ -338,7 +328,7 @@ pub mod pallet { #[pallet::call_index(4)] #[pallet::weight(::WeightInfo::set_redeem_period())] #[transactional] - pub fn set_redeem_period(origin: OriginFor, period: T::BlockNumber) -> DispatchResultWithPostInfo { + pub fn set_redeem_period(origin: OriginFor, period: BlockNumberFor) -> DispatchResultWithPostInfo { ensure_root(origin)?; >::set(period); Self::deposit_event(Event::RedeemPeriodChange { period }); diff --git a/crates/redeem/src/mock.rs b/crates/redeem/src/mock.rs index 1f1294819d..12b9f17331 100644 --- a/crates/redeem/src/mock.rs +++ b/crates/redeem/src/mock.rs @@ -2,7 +2,7 @@ use crate as redeem; use crate::{Config, Error}; use frame_support::{ assert_ok, parameter_types, - traits::{ConstU32, Everything, GenesisBuild}, + traits::{ConstU32, Everything}, BoundedVec, PalletId, }; use frame_system::EnsureRoot; @@ -14,22 +14,19 @@ use primitives::{Rate, VaultCurrencyPair, VaultId}; pub use sp_arithmetic::{FixedI128, FixedPointNumber, FixedU128}; use sp_core::H256; use sp_runtime::{ - testing::{Header, TestXt}, + testing::TestXt, traits::{BlakeTwo256, IdentityLookup, Zero}, + BuildStorage, }; type TestExtrinsic = TestXt; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, // Tokens & Balances @@ -47,8 +44,8 @@ frame_support::construct_runtime!( Redeem: redeem::{Pallet, Call, Config, Storage, Event}, Fee: fee::{Pallet, Call, Config, Storage}, Currency: currency::{Pallet}, - Nomination: nomination::{Pallet, Call, Config, Storage, Event}, - Loans: loans::{Pallet, Storage, Call, Event, Config}, + Nomination: nomination::{Pallet, Call, Storage, Config, Event}, + Loans: loans::{Pallet, Call, Storage, Event, Config}, } ); @@ -57,7 +54,6 @@ pub type Balance = u128; pub type RawAmount = i128; pub type BlockNumber = u64; pub type Moment = u64; -pub type Index = u64; pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; pub type UnsignedFixedPoint = FixedU128; @@ -74,13 +70,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = Index; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -296,7 +291,7 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build_with(balances: orml_tokens::GenesisConfig) -> sp_io::TestExternalities { - let mut storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let mut storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); balances.assimilate_storage(&mut storage).unwrap(); @@ -346,13 +341,19 @@ impl ExtBuilder { .assimilate_storage(&mut storage) .unwrap(); - GenesisBuild::::assimilate_storage( - &loans::GenesisConfig { - max_exchange_rate: Rate::from_inner(DEFAULT_MAX_EXCHANGE_RATE), - min_exchange_rate: Rate::from_inner(DEFAULT_MIN_EXCHANGE_RATE), - }, - &mut storage, - ) + loans::GenesisConfig:: { + max_exchange_rate: Rate::from_inner(DEFAULT_MAX_EXCHANGE_RATE), + min_exchange_rate: Rate::from_inner(DEFAULT_MIN_EXCHANGE_RATE), + _marker: Default::default(), + } + .assimilate_storage(&mut storage) + .unwrap(); + + nomination::GenesisConfig:: { + is_nomination_enabled: true, + _marker: Default::default(), + } + .assimilate_storage(&mut storage) .unwrap(); storage.into() diff --git a/crates/redeem/src/types.rs b/crates/redeem/src/types.rs index c14ddc4c6a..74f3d4b7f6 100644 --- a/crates/redeem/src/types.rs +++ b/crates/redeem/src/types.rs @@ -7,6 +7,7 @@ use vault_registry::types::CurrencyId; use crate::Config; use codec::{Decode, Encode, MaxEncodedLen}; use currency::Amount; +use frame_system::pallet_prelude::BlockNumberFor; /// Storage version. #[derive(Encode, Decode, Eq, PartialEq, TypeInfo, MaxEncodedLen)] @@ -19,12 +20,8 @@ pub(crate) type BalanceOf = ::Balance; pub(crate) type DefaultVaultId = VaultId<::AccountId, CurrencyId>; -pub type DefaultRedeemRequest = RedeemRequest< - ::AccountId, - ::BlockNumber, - BalanceOf, - CurrencyId, ->; +pub type DefaultRedeemRequest = + RedeemRequest<::AccountId, BlockNumberFor, BalanceOf, CurrencyId>; pub trait RedeemRequestExt { fn amount_btc(&self) -> Amount; @@ -33,7 +30,7 @@ pub trait RedeemRequestExt { fn transfer_fee_btc(&self) -> Amount; } -impl RedeemRequestExt for RedeemRequest, CurrencyId> { +impl RedeemRequestExt for RedeemRequest, BalanceOf, CurrencyId> { fn amount_btc(&self) -> Amount { Amount::new(self.amount_btc, self.vault.wrapped_currency()) } diff --git a/crates/replace/Cargo.toml b/crates/replace/Cargo.toml index 0ec5e8595f..18e8cf9da7 100644 --- a/crates/replace/Cargo.toml +++ b/crates/replace/Cargo.toml @@ -6,7 +6,7 @@ name = "replace" version = "1.2.0" [dependencies] -serde = { version = "1.0.130", default-features = false, features = ['derive'], optional = true } +serde = { version = "1.0.130", default-features = false, features = ['derive'] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -53,7 +53,7 @@ orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-li [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", "sp-io/std", diff --git a/crates/replace/src/ext.rs b/crates/replace/src/ext.rs index dc8d2a77d2..730d59c8cb 100644 --- a/crates/replace/src/ext.rs +++ b/crates/replace/src/ext.rs @@ -6,6 +6,7 @@ pub(crate) mod btc_relay { use bitcoin::types::{FullTransactionProof, Value}; use btc_relay::BtcAddress; use frame_support::dispatch::DispatchError; + use frame_system::pallet_prelude::BlockNumberFor; use sp_core::H256; use sp_std::convert::TryInto; @@ -28,9 +29,9 @@ pub(crate) mod btc_relay { } pub fn has_request_expired( - opentime: T::BlockNumber, + opentime: BlockNumberFor, btc_open_height: u32, - period: T::BlockNumber, + period: BlockNumberFor, ) -> Result { >::has_request_expired(opentime, btc_open_height, period) } @@ -149,13 +150,14 @@ pub(crate) mod vault_registry { #[cfg_attr(test, mockable)] pub(crate) mod security { + use frame_system::pallet_prelude::BlockNumberFor; use sp_core::H256; pub fn get_secure_id(id: &T::AccountId) -> H256 { >::get_secure_id(id) } - pub fn active_block_number() -> T::BlockNumber { + pub fn active_block_number() -> BlockNumberFor { >::active_block_number() } } diff --git a/crates/replace/src/lib.rs b/crates/replace/src/lib.rs index 3187c8d4a3..d3a1c9020f 100644 --- a/crates/replace/src/lib.rs +++ b/crates/replace/src/lib.rs @@ -130,7 +130,7 @@ pub mod pallet { griefing_collateral: BalanceOf, }, ReplacePeriodChange { - period: T::BlockNumber, + period: BlockNumberFor, }, } @@ -171,7 +171,7 @@ pub mod pallet { /// to prevent griefing of vault collateral. #[pallet::storage] #[pallet::getter(fn replace_period)] - pub(super) type ReplacePeriod = StorageValue<_, T::BlockNumber, ValueQuery>; + pub(super) type ReplacePeriod = StorageValue<_, BlockNumberFor, ValueQuery>; /// The minimum amount of btc that is accepted for replace requests; any lower values would /// risk the bitcoin client to reject the payment @@ -190,23 +190,14 @@ pub mod pallet { pub(super) type StorageVersion = StorageValue<_, Version, ValueQuery, DefaultForStorageVersion>; #[pallet::genesis_config] + #[derive(frame_support::DefaultNoBound)] pub struct GenesisConfig { - pub replace_period: T::BlockNumber, + pub replace_period: BlockNumberFor, pub replace_btc_dust_value: BalanceOf, } - #[cfg(feature = "std")] - impl Default for GenesisConfig { - fn default() -> Self { - Self { - replace_period: Default::default(), - replace_btc_dust_value: Default::default(), - } - } - } - #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { ReplacePeriod::::put(self.replace_period); ReplaceBtcDustValue::::put(self.replace_btc_dust_value); @@ -214,7 +205,7 @@ pub mod pallet { } #[pallet::hooks] - impl Hooks for Pallet {} + impl Hooks> for Pallet {} #[pallet::pallet] pub struct Pallet(_); @@ -332,7 +323,7 @@ pub mod pallet { #[pallet::call_index(5)] #[pallet::weight(::WeightInfo::set_replace_period())] #[transactional] - pub fn set_replace_period(origin: OriginFor, period: T::BlockNumber) -> DispatchResultWithPostInfo { + pub fn set_replace_period(origin: OriginFor, period: BlockNumberFor) -> DispatchResultWithPostInfo { ensure_root(origin)?; >::set(period); Self::deposit_event(Event::ReplacePeriodChange { period }); diff --git a/crates/replace/src/mock.rs b/crates/replace/src/mock.rs index ad728c297d..30cdf7a405 100644 --- a/crates/replace/src/mock.rs +++ b/crates/replace/src/mock.rs @@ -3,7 +3,7 @@ use crate::{Config, Error}; use currency::Amount; use frame_support::{ assert_ok, parameter_types, - traits::{ConstU32, Everything, GenesisBuild}, + traits::{ConstU32, Everything}, PalletId, }; use mocktopus::{macros::mockable, mocking::clear_mocks}; @@ -13,22 +13,19 @@ use primitives::{VaultCurrencyPair, VaultId}; use sp_arithmetic::{FixedI128, FixedPointNumber, FixedU128}; use sp_core::H256; use sp_runtime::{ - testing::{Header, TestXt}, + testing::TestXt, traits::{BlakeTwo256, IdentityLookup, One, Zero}, + BuildStorage, }; type TestExtrinsic = TestXt; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, // Tokens & Balances @@ -45,7 +42,7 @@ frame_support::construct_runtime!( Oracle: oracle::{Pallet, Call, Config, Storage, Event}, Replace: replace::{Pallet, Call, Config, Storage, Event}, Fee: fee::{Pallet, Call, Config, Storage}, - Nomination: nomination::{Pallet, Call, Config, Storage, Event}, + Nomination: nomination::{Pallet, Call, Storage, Config, Event}, Currency: currency::{Pallet}, } ); @@ -55,7 +52,6 @@ pub type Balance = u128; pub type RawAmount = i128; pub type BlockNumber = u64; pub type Moment = u64; -pub type Index = u64; pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; pub type UnsignedFixedPoint = FixedU128; @@ -72,13 +68,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = Index; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -284,7 +279,7 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build_with(balances: orml_tokens::GenesisConfig) -> sp_io::TestExternalities { - let mut storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let mut storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); balances.assimilate_storage(&mut storage).unwrap(); @@ -299,6 +294,13 @@ impl ExtBuilder { .assimilate_storage(&mut storage) .unwrap(); + nomination::GenesisConfig:: { + is_nomination_enabled: true, + _marker: Default::default(), + } + .assimilate_storage(&mut storage) + .unwrap(); + const PAIR: VaultCurrencyPair = VaultCurrencyPair { collateral: DEFAULT_COLLATERAL_CURRENCY, wrapped: DEFAULT_WRAPPED_CURRENCY, diff --git a/crates/replace/src/types.rs b/crates/replace/src/types.rs index 849151a643..bb4e2da672 100644 --- a/crates/replace/src/types.rs +++ b/crates/replace/src/types.rs @@ -2,6 +2,7 @@ use crate::Config; use codec::{Decode, Encode, MaxEncodedLen}; use currency::Amount; use frame_support::traits::Get; +use frame_system::pallet_prelude::BlockNumberFor; pub use primitives::replace::{ReplaceRequest, ReplaceRequestStatus}; use primitives::VaultId; use scale_info::TypeInfo; @@ -33,12 +34,8 @@ pub(crate) struct ReplaceRequestV0 { pub completed: bool, } -pub type DefaultReplaceRequest = ReplaceRequest< - ::AccountId, - ::BlockNumber, - BalanceOf, - CurrencyId, ->; +pub type DefaultReplaceRequest = + ReplaceRequest<::AccountId, BlockNumberFor, BalanceOf, CurrencyId>; pub trait ReplaceRequestExt { fn amount(&self) -> Amount; diff --git a/crates/reward/Cargo.toml b/crates/reward/Cargo.toml index 61cd3cb286..a3a2d99812 100644 --- a/crates/reward/Cargo.toml +++ b/crates/reward/Cargo.toml @@ -7,7 +7,7 @@ version = "1.2.0" [dependencies] log = { version = "0.4.17", default-features = false } -serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -35,7 +35,7 @@ pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = " default = ["std"] std = [ "log/std", - "serde", + "serde/std", "codec/std", "primitives/std", diff --git a/crates/reward/src/lib.rs b/crates/reward/src/lib.rs index a66614a21a..f64eac3f09 100644 --- a/crates/reward/src/lib.rs +++ b/crates/reward/src/lib.rs @@ -28,8 +28,8 @@ use sp_std::{cmp::PartialOrd, convert::TryInto, fmt::Debug}; pub(crate) type SignedFixedPoint = >::SignedFixedPoint; +use frame_system::pallet_prelude::*; pub use pallet::*; - #[frame_support::pallet] pub mod pallet { use super::*; @@ -104,7 +104,7 @@ pub mod pallet { } #[pallet::hooks] - impl, I: 'static> Hooks for Pallet {} + impl, I: 'static> Hooks> for Pallet {} /// The total stake deposited to this reward pool. #[pallet::storage] diff --git a/crates/reward/src/mock.rs b/crates/reward/src/mock.rs index b446ba208b..029bf0744e 100644 --- a/crates/reward/src/mock.rs +++ b/crates/reward/src/mock.rs @@ -13,28 +13,22 @@ pub use primitives::{ use sp_arithmetic::FixedI128; use sp_core::H256; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, }; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Reward: reward::{Pallet, Call, Storage, Event}, } ); pub type AccountId = u64; -pub type BlockNumber = u64; -pub type Index = u64; pub type SignedFixedPoint = FixedI128; parameter_types! { @@ -49,13 +43,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = Index; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -87,7 +80,7 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build() -> sp_io::TestExternalities { - let storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); storage.into() } diff --git a/crates/security/Cargo.toml b/crates/security/Cargo.toml index a2031bcb98..8c03d11627 100644 --- a/crates/security/Cargo.toml +++ b/crates/security/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } sha2 = { version = "0.8.2", default-features = false } -serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } # Substrate dependencies @@ -25,7 +25,7 @@ sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0 [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", "sha2/std", diff --git a/crates/security/src/lib.rs b/crates/security/src/lib.rs index 5b5cc402bd..dd9592cf9b 100644 --- a/crates/security/src/lib.rs +++ b/crates/security/src/lib.rs @@ -28,6 +28,7 @@ use mocktopus::macros::mockable; use codec::Encode; use frame_support::{dispatch::DispatchError, weights::Weight}; +use frame_system::pallet_prelude::BlockNumberFor; pub use pallet::*; use sha2::{Digest, Sha256}; use sp_core::{H256, U256}; @@ -53,7 +54,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] pub enum Event { - UpdateActiveBlock { block_number: T::BlockNumber }, + UpdateActiveBlock { block_number: BlockNumberFor }, Activated, Deactivated, } @@ -62,8 +63,8 @@ pub mod pallet { pub enum Error {} #[pallet::hooks] - impl Hooks for Pallet { - fn on_initialize(_n: T::BlockNumber) -> Weight { + impl Hooks> for Pallet { + fn on_initialize(_n: BlockNumberFor) -> Weight { Self::increment_active_block(); ::WeightInfo::on_initialize() } @@ -81,7 +82,7 @@ pub mod pallet { /// proof. #[pallet::storage] #[pallet::getter(fn active_block_number)] - pub type ActiveBlockCount = StorageValue<_, T::BlockNumber, ValueQuery>; + pub type ActiveBlockCount = StorageValue<_, BlockNumberFor, ValueQuery>; #[pallet::storage] pub type IsDeactivated = StorageValue<_, bool, ValueQuery>; @@ -110,11 +111,13 @@ pub mod pallet { } } } - // "Internal" functions, callable by code. #[cfg_attr(test, mockable)] impl Pallet { - pub fn parachain_block_expired(opentime: T::BlockNumber, period: T::BlockNumber) -> Result { + pub fn parachain_block_expired( + opentime: BlockNumberFor, + period: BlockNumberFor, + ) -> Result { let expiration_block = opentime.checked_add(&period).ok_or(ArithmeticError::Overflow)?; Ok(Self::active_block_number() > expiration_block) } @@ -159,7 +162,7 @@ impl Pallet { } /// for testing purposes only! - pub fn set_active_block_number(n: T::BlockNumber) { + pub fn set_active_block_number(n: BlockNumberFor) { ActiveBlockCount::::set(n); } } diff --git a/crates/security/src/mock.rs b/crates/security/src/mock.rs index a864b9ba31..90a35bdfb1 100644 --- a/crates/security/src/mock.rs +++ b/crates/security/src/mock.rs @@ -5,28 +5,22 @@ use frame_support::{parameter_types, traits::ConstU32}; use mocktopus::mocking::clear_mocks; use sp_core::H256; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, }; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Security: security::{Pallet, Call, Storage, Event}, } ); pub type AccountId = u64; -pub type BlockNumber = u64; -pub type Index = u64; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -39,13 +33,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = Index; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -68,7 +61,7 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build() -> sp_io::TestExternalities { - let storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); storage.into() } diff --git a/crates/staking/Cargo.toml b/crates/staking/Cargo.toml index bb5584d8b2..8bd37e2ad5 100644 --- a/crates/staking/Cargo.toml +++ b/crates/staking/Cargo.toml @@ -6,7 +6,7 @@ name = "staking" version = "1.2.0" [dependencies] -serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -38,8 +38,10 @@ pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = " [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", + "orml-tokens/std", + "orml-traits/std", "primitives/std", "reward/std", diff --git a/crates/staking/src/lib.rs b/crates/staking/src/lib.rs index 9183b6880b..61a758313e 100644 --- a/crates/staking/src/lib.rs +++ b/crates/staking/src/lib.rs @@ -133,7 +133,7 @@ pub mod pallet { amount: T::SignedFixedPoint, }, WithdrawReward { - nonce: T::Index, + nonce: T::Nonce, currency_id: T::CurrencyId, vault_id: DefaultVaultId, nominator_id: T::AccountId, @@ -144,7 +144,7 @@ pub mod pallet { }, IncreaseNonce { vault_id: DefaultVaultId, - new_nonce: T::Index, + new_nonce: T::Nonce, }, } @@ -158,8 +158,9 @@ pub mod pallet { SlashZeroTotalStake, } + use frame_system::pallet_prelude::BlockNumberFor; #[pallet::hooks] - impl Hooks for Pallet {} + impl Hooks> for Pallet {} /// The total stake - this will increase on deposit and decrease on withdrawal. #[pallet::storage] @@ -167,7 +168,7 @@ pub mod pallet { pub type TotalStake = StorageDoubleMap< _, Blake2_128Concat, - T::Index, + T::Nonce, Blake2_128Concat, DefaultVaultId, SignedFixedPoint, @@ -180,7 +181,7 @@ pub mod pallet { pub type TotalCurrentStake = StorageDoubleMap< _, Blake2_128Concat, - T::Index, + T::Nonce, Blake2_128Concat, DefaultVaultId, SignedFixedPoint, @@ -197,7 +198,7 @@ pub mod pallet { Blake2_128Concat, T::CurrencyId, Blake2_128Concat, - (T::Index, DefaultVaultId), + (T::Nonce, DefaultVaultId), SignedFixedPoint, ValueQuery, >; @@ -210,7 +211,7 @@ pub mod pallet { Blake2_128Concat, T::CurrencyId, Blake2_128Concat, - (T::Index, DefaultVaultId), + (T::Nonce, DefaultVaultId), SignedFixedPoint, ValueQuery, >; @@ -220,7 +221,7 @@ pub mod pallet { pub type SlashPerToken = StorageDoubleMap< _, Blake2_128Concat, - T::Index, + T::Nonce, Blake2_128Concat, DefaultVaultId, SignedFixedPoint, @@ -232,7 +233,7 @@ pub mod pallet { pub type Stake = StorageDoubleMap< _, Blake2_128Concat, - T::Index, + T::Nonce, Blake2_128Concat, (DefaultVaultId, T::AccountId), SignedFixedPoint, @@ -246,7 +247,7 @@ pub mod pallet { Blake2_128Concat, T::CurrencyId, Blake2_128Concat, - (T::Index, DefaultVaultId, T::AccountId), + (T::Nonce, DefaultVaultId, T::AccountId), SignedFixedPoint, ValueQuery, >; @@ -256,7 +257,7 @@ pub mod pallet { pub type SlashTally = StorageDoubleMap< _, Blake2_128Concat, - T::Index, + T::Nonce, Blake2_128Concat, (DefaultVaultId, T::AccountId), SignedFixedPoint, @@ -266,7 +267,7 @@ pub mod pallet { /// The nonce of the current staking pool, used in force refunds. /// This is a strictly increasing value. #[pallet::storage] - pub type Nonce = StorageMap<_, Blake2_128Concat, DefaultVaultId, T::Index, ValueQuery>; + pub type Nonce = StorageMap<_, Blake2_128Concat, DefaultVaultId, T::Nonce, ValueQuery>; #[pallet::pallet] pub struct Pallet(_); @@ -315,7 +316,7 @@ impl Pallet { } fn stake_at_index( - nonce: T::Index, + nonce: T::Nonce, vault_id: &DefaultVaultId, nominator_id: &T::AccountId, ) -> SignedFixedPoint { @@ -332,7 +333,7 @@ impl Pallet { } fn reward_tally( - nonce: T::Index, + nonce: T::Nonce, currency_id: T::CurrencyId, vault_id: &DefaultVaultId, nominator_id: &T::AccountId, @@ -347,7 +348,7 @@ impl Pallet { } fn slash_tally_at_index( - nonce: T::Index, + nonce: T::Nonce, vault_id: &DefaultVaultId, nominator_id: &T::AccountId, ) -> SignedFixedPoint { @@ -355,7 +356,7 @@ impl Pallet { } /// Get the newest nonce for the staking pool. - pub fn nonce(vault_id: &DefaultVaultId) -> T::Index { + pub fn nonce(vault_id: &DefaultVaultId) -> T::Nonce { >::get(vault_id) } @@ -365,7 +366,7 @@ impl Pallet { Self::slash_per_token_at_index(nonce, vault_id) } - fn slash_per_token_at_index(nonce: T::Index, vault_id: &DefaultVaultId) -> SignedFixedPoint { + fn slash_per_token_at_index(nonce: T::Nonce, vault_id: &DefaultVaultId) -> SignedFixedPoint { >::get(nonce, vault_id) } @@ -499,7 +500,7 @@ impl Pallet { /// Compute the stake in `vault_id` owned by `nominator_id`. pub fn compute_stake_at_index( - nonce: T::Index, + nonce: T::Nonce, vault_id: &DefaultVaultId, nominator_id: &T::AccountId, ) -> Result< as FixedPointNumber>::Inner, DispatchError> { @@ -509,7 +510,7 @@ impl Pallet { } pub fn compute_precise_stake_at_index( - nonce: T::Index, + nonce: T::Nonce, vault_id: &DefaultVaultId, nominator_id: &T::AccountId, ) -> Result, DispatchError> { @@ -523,7 +524,7 @@ impl Pallet { } fn increase_rewards( - nonce: T::Index, + nonce: T::Nonce, currency_id: T::CurrencyId, vault_id: &DefaultVaultId, reward: SignedFixedPoint, @@ -580,7 +581,7 @@ impl Pallet { /// Compute the expected reward for `nominator_id` who is nominating `vault_id`. fn compute_reward_at_index( - nonce: T::Index, + nonce: T::Nonce, currency_id: T::CurrencyId, vault_id: &DefaultVaultId, nominator_id: &T::AccountId, @@ -626,7 +627,7 @@ impl Pallet { vault_id: &DefaultVaultId, nominator_id: &T::AccountId, amount: SignedFixedPoint, - index: Option, + index: Option, ) -> DispatchResult { let nonce = index.unwrap_or(Self::nonce(vault_id)); let stake = Self::apply_slash(vault_id, nominator_id)?; @@ -690,7 +691,7 @@ impl Pallet { /// Withdraw all rewards earned by `vault_id` for the `nominator_id`. fn withdraw_reward_at_index( - nonce: T::Index, + nonce: T::Nonce, currency_id: T::CurrencyId, vault_id: &DefaultVaultId, nominator_id: &T::AccountId, @@ -754,7 +755,7 @@ impl Pallet { fn increment_nonce(vault_id: &DefaultVaultId) -> DispatchResult { >::mutate(vault_id, |nonce| { - *nonce = nonce.checked_add(&T::Index::one()).ok_or(ArithmeticError::Overflow)?; + *nonce = nonce.checked_add(&T::Nonce::one()).ok_or(ArithmeticError::Overflow)?; Ok::<_, DispatchError>(()) })?; Self::deposit_event(Event::::IncreaseNonce { @@ -775,7 +776,7 @@ impl Pallet { } } -impl RewardsApi<(Option, DefaultVaultId), T::AccountId, Balance> for Pallet +impl RewardsApi<(Option, DefaultVaultId), T::AccountId, Balance> for Pallet where T: Config, Balance: BalanceToFixedPoint> + Saturating + PartialOrd + Copy, @@ -783,12 +784,12 @@ where { type CurrencyId = T::CurrencyId; - fn reward_currencies_len(_: &(Option, DefaultVaultId)) -> u32 { + fn reward_currencies_len(_: &(Option, DefaultVaultId)) -> u32 { 2 } fn distribute_reward( - (_, vault_id): &(Option, DefaultVaultId), + (_, vault_id): &(Option, DefaultVaultId), currency_id: T::CurrencyId, amount: Balance, ) -> DispatchResult { @@ -805,7 +806,7 @@ where } fn compute_reward( - (nonce, vault_id): &(Option, DefaultVaultId), + (nonce, vault_id): &(Option, DefaultVaultId), nominator_id: &T::AccountId, currency_id: T::CurrencyId, ) -> Result { @@ -816,7 +817,7 @@ where } fn withdraw_reward( - (nonce, vault_id): &(Option, DefaultVaultId), + (nonce, vault_id): &(Option, DefaultVaultId), nominator_id: &T::AccountId, currency_id: T::CurrencyId, ) -> Result { @@ -827,7 +828,7 @@ where } fn deposit_stake( - (_, vault_id): &(Option, DefaultVaultId), + (_, vault_id): &(Option, DefaultVaultId), nominator_id: &T::AccountId, amount: Balance, ) -> DispatchResult { @@ -839,7 +840,7 @@ where } fn withdraw_stake( - (nonce, vault_id): &(Option, DefaultVaultId), + (nonce, vault_id): &(Option, DefaultVaultId), nominator_id: &T::AccountId, amount: Balance, ) -> DispatchResult { @@ -852,7 +853,7 @@ where } fn withdraw_all_stake( - (nonce, vault_id): &(Option, DefaultVaultId), + (nonce, vault_id): &(Option, DefaultVaultId), nominator_id: &T::AccountId, ) -> Result { let nonce = nonce.unwrap_or(Pallet::::nonce(vault_id)); @@ -866,14 +867,14 @@ where .map_err(|_| Error::::TryIntoIntError.into()) } - fn get_total_stake((_, vault_id): &(Option, DefaultVaultId)) -> Result { + fn get_total_stake((_, vault_id): &(Option, DefaultVaultId)) -> Result { Pallet::::total_current_stake(vault_id)? .try_into() .map_err(|_| Error::::TryIntoIntError.into()) } fn get_stake( - (nonce, vault_id): &(Option, DefaultVaultId), + (nonce, vault_id): &(Option, DefaultVaultId), nominator_id: &T::AccountId, ) -> Result { let nonce = nonce.unwrap_or(Pallet::::nonce(vault_id)); @@ -894,13 +895,13 @@ pub trait StakingApi { fn force_refund(pool_id: &PoolId) -> Result; } -impl StakingApi, T::Index, Balance> for Pallet +impl StakingApi, T::Nonce, Balance> for Pallet where T: Config, Balance: BalanceToFixedPoint>, ::Inner: TryInto, { - fn nonce(vault_id: &DefaultVaultId) -> T::Index { + fn nonce(vault_id: &DefaultVaultId) -> T::Nonce { Pallet::::nonce(vault_id) } @@ -928,7 +929,7 @@ pub mod migration { /// The code as implemented befor the fix fn legacy_withdraw_reward_at_index( - nonce: T::Index, + nonce: T::Nonce, currency_id: T::CurrencyId, vault_id: &DefaultVaultId, nominator_id: &T::AccountId, diff --git a/crates/staking/src/mock.rs b/crates/staking/src/mock.rs index 9e12aeb8ed..7d056c6b97 100644 --- a/crates/staking/src/mock.rs +++ b/crates/staking/src/mock.rs @@ -10,29 +10,23 @@ use primitives::{VaultCurrencyPair, VaultId}; use sp_arithmetic::FixedI128; use sp_core::H256; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, }; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Staking: staking::{Pallet, Call, Storage, Event}, Tokens: orml_tokens::{Pallet, Call, Storage, Event}, } ); pub type AccountId = u64; -pub type BlockNumber = u64; -pub type Index = u64; pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; @@ -48,13 +42,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = Index; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -132,7 +125,7 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build() -> sp_io::TestExternalities { - let storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); storage.into() } diff --git a/crates/supply/Cargo.toml b/crates/supply/Cargo.toml index dd39af06c3..8e40ef8895 100644 --- a/crates/supply/Cargo.toml +++ b/crates/supply/Cargo.toml @@ -6,12 +6,12 @@ name = "supply" version = "1.2.0" [dependencies] -serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } # Parachain dependencies -primitives = { package = "interbtc-primitives", path = "../../primitives", default-features = false } +primitives = { package = "interbtc-primitives", path = "../../primitives", default-features = false, features = ["substrate-compat"] } # Substrate dependencies sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false } @@ -33,7 +33,7 @@ pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "p [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", "primitives/std", diff --git a/crates/supply/src/lib.rs b/crates/supply/src/lib.rs index 68ab198559..60d9a64f8d 100644 --- a/crates/supply/src/lib.rs +++ b/crates/supply/src/lib.rs @@ -22,7 +22,7 @@ use frame_support::{ weights::Weight, PalletId, }; -use frame_system::ensure_root; +use frame_system::{ensure_root, pallet_prelude::BlockNumberFor}; use primitives::TruncateFixedPointToInt; use scale_info::TypeInfo; use sp_arithmetic::ArithmeticError; @@ -67,7 +67,7 @@ pub mod pallet { /// The period between inflation updates. #[pallet::constant] - type InflationPeriod: Get; + type InflationPeriod: Get>; /// Handler for when the total supply has inflated. type OnInflation: OnInflation; @@ -87,8 +87,8 @@ pub mod pallet { pub enum Error {} #[pallet::hooks] - impl Hooks for Pallet { - fn on_initialize(n: T::BlockNumber) -> Weight { + impl Hooks> for Pallet { + fn on_initialize(n: BlockNumberFor) -> Weight { if let Err(e) = Self::begin_block(n) { sp_runtime::print(e); } @@ -99,7 +99,7 @@ pub mod pallet { #[pallet::storage] #[pallet::whitelist_storage] #[pallet::getter(fn start_height)] - pub type StartHeight = StorageValue<_, T::BlockNumber, OptionQuery>; + pub type StartHeight = StorageValue<_, BlockNumberFor, OptionQuery>; #[pallet::storage] #[pallet::getter(fn last_emission)] @@ -110,25 +110,15 @@ pub mod pallet { pub type Inflation = StorageValue<_, T::UnsignedFixedPoint, ValueQuery>; #[pallet::genesis_config] + #[derive(frame_support::DefaultNoBound)] pub struct GenesisConfig { pub initial_supply: BalanceOf, - pub start_height: T::BlockNumber, + pub start_height: BlockNumberFor, pub inflation: T::UnsignedFixedPoint, } - #[cfg(feature = "std")] - impl Default for GenesisConfig { - fn default() -> Self { - Self { - initial_supply: Default::default(), - start_height: Default::default(), - inflation: Default::default(), - } - } - } - #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { T::Currency::deposit_creating(&T::SupplyPalletId::get().into_account_truncating(), self.initial_supply); StartHeight::::put(self.start_height); @@ -147,7 +137,7 @@ pub mod pallet { #[transactional] pub fn set_start_height_and_inflation( origin: OriginFor, - start_height: T::BlockNumber, + start_height: BlockNumberFor, inflation: T::UnsignedFixedPoint, ) -> DispatchResultWithPostInfo { ensure_root(origin)?; @@ -164,7 +154,7 @@ impl Pallet { T::SupplyPalletId::get().into_account_truncating() } - pub(crate) fn begin_block(height: T::BlockNumber) -> DispatchResult { + pub(crate) fn begin_block(height: BlockNumberFor) -> DispatchResult { // ignore if uninitialized or not start height if let Some(start_height) = >::get().filter(|&start_height| height == start_height) { let end_height = start_height + T::InflationPeriod::get(); diff --git a/crates/supply/src/mock.rs b/crates/supply/src/mock.rs index f280f90007..6762a06669 100644 --- a/crates/supply/src/mock.rs +++ b/crates/supply/src/mock.rs @@ -1,28 +1,20 @@ use crate::{self as supply, Config, OnInflation}; -use frame_support::{ - parameter_types, - traits::{Everything, GenesisBuild}, - PalletId, -}; +use frame_support::{parameter_types, traits::Everything, PalletId}; pub use primitives::{CurrencyId, UnsignedFixedPoint}; use sp_core::H256; pub use sp_runtime::FixedPointNumber; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, }; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Balances: pallet_balances::{Pallet, Call, Storage, Event}, Supply: supply::{Pallet, Call, Storage, Config, Event}, } @@ -31,7 +23,6 @@ frame_support::construct_runtime!( pub type AccountId = u64; pub type Balance = u128; pub type BlockNumber = u64; -pub type Index = u64; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -45,13 +36,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = Index; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -79,7 +69,7 @@ impl pallet_balances::Config for Test { type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxFreezes = (); type MaxHolds = (); @@ -118,7 +108,7 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build() -> sp_io::TestExternalities { - let mut storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let mut storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); supply::GenesisConfig:: { initial_supply: 10_000_000, diff --git a/crates/traits/Cargo.toml b/crates/traits/Cargo.toml index 134bacfca4..375f192448 100644 --- a/crates/traits/Cargo.toml +++ b/crates/traits/Cargo.toml @@ -10,7 +10,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] serde = { version = "1.0.136", default-features = false, features = [ "derive", -], optional = true } +] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = [ "derive", diff --git a/crates/tx-pause/src/lib.rs b/crates/tx-pause/src/lib.rs index 3d892fb89a..037daef470 100644 --- a/crates/tx-pause/src/lib.rs +++ b/crates/tx-pause/src/lib.rs @@ -190,26 +190,15 @@ pub mod pallet { /// Configure the initial state of this pallet in the genesis block. #[pallet::genesis_config] + #[derive(frame_support::DefaultNoBound)] pub struct GenesisConfig { /// The initially paused calls. pub paused: Vec>, pub _phantom: PhantomData, } - #[cfg(feature = "std")] - impl Default for GenesisConfig { - // NOTE: `derive(Default)` does not work together with `#[pallet::genesis_config]`. - // We therefore need to add a trivial default impl. - fn default() -> Self { - Self { - paused: Default::default(), - _phantom: PhantomData, - } - } - } - #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { for (pallet_name, maybe_call_name) in &self.paused { PausedCalls::::insert((pallet_name, maybe_call_name), ()); diff --git a/crates/tx-pause/src/mock.rs b/crates/tx-pause/src/mock.rs index 1a51eb0fca..ef916ac7e6 100644 --- a/crates/tx-pause/src/mock.rs +++ b/crates/tx-pause/src/mock.rs @@ -27,8 +27,8 @@ use frame_support::{ use frame_system::{EnsureRoot, EnsureSignedBy}; use sp_core::H256; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, }; parameter_types! { @@ -40,13 +40,12 @@ impl frame_system::Config for Test { type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = u64; - type BlockNumber = u64; + type Nonce = u32; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = u64; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); @@ -75,7 +74,7 @@ impl pallet_balances::Config for Test { type MaxLocks = MaxLocks; type MaxReserves = (); type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxFreezes = (); type MaxHolds = (); @@ -194,14 +193,10 @@ impl Config for Test { type WeightInfo = (); } -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { System: frame_system, Balances: pallet_balances, @@ -210,9 +205,8 @@ frame_support::construct_runtime!( TxPause: pallet_tx_pause, } ); - pub fn new_test_ext() -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let mut t = frame_system::GenesisConfig::::default().build_storage().unwrap(); pallet_balances::GenesisConfig:: { // The 0 account is NOT a special origin. The rest may be: @@ -221,13 +215,11 @@ pub fn new_test_ext() -> sp_io::TestExternalities { .assimilate_storage(&mut t) .unwrap(); - GenesisBuild::::assimilate_storage( - &pallet_tx_pause::GenesisConfig { - paused: vec![], - _phantom: Default::default(), - }, - &mut t, - ) + pallet_tx_pause::GenesisConfig:: { + paused: vec![], + _phantom: Default::default(), + } + .assimilate_storage(&mut t) .unwrap(); let mut ext = sp_io::TestExternalities::new(t); diff --git a/crates/vault-registry/Cargo.toml b/crates/vault-registry/Cargo.toml index ce4757dd24..c40a558ccf 100644 --- a/crates/vault-registry/Cargo.toml +++ b/crates/vault-registry/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Interlay Ltd"] edition = "2021" [dependencies] -serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -52,7 +52,7 @@ visibility = { version = "0.0.1" } [features] default = ["std"] std = [ - "serde", + "serde/std", "codec/std", "sp-runtime/std", diff --git a/crates/vault-registry/src/ext.rs b/crates/vault-registry/src/ext.rs index 299c0acdc7..72a3571cf4 100644 --- a/crates/vault-registry/src/ext.rs +++ b/crates/vault-registry/src/ext.rs @@ -17,7 +17,9 @@ pub(crate) mod currency { #[cfg_attr(test, mockable)] pub(crate) mod security { - pub fn active_block_number() -> T::BlockNumber { + use frame_system::pallet_prelude::BlockNumberFor; + + pub fn active_block_number() -> BlockNumberFor { >::active_block_number() } } @@ -41,7 +43,7 @@ pub(crate) mod staking { vault_id: &DefaultVaultId, nominator_id: &T::AccountId, maybe_amount: Option>, - nonce: Option<::Index>, + nonce: Option<::Nonce>, ) -> Result, DispatchError> { if let Some(amount) = maybe_amount { T::VaultStaking::withdraw_stake(&(nonce, vault_id.clone()), nominator_id, amount.amount())?; diff --git a/crates/vault-registry/src/lib.rs b/crates/vault-registry/src/lib.rs index c6321504d0..e6359400da 100644 --- a/crates/vault-registry/src/lib.rs +++ b/crates/vault-registry/src/lib.rs @@ -105,7 +105,7 @@ pub mod pallet { #[pallet::hooks] impl Hooks> for Pallet { - fn offchain_worker(n: T::BlockNumber) { + fn offchain_worker(n: BlockNumberFor) { log::info!("Off-chain worker started on block {:?}", n); Self::_offchain_worker(); } @@ -486,7 +486,7 @@ pub mod pallet { }, BanVault { vault_id: DefaultVaultId, - banned_until: T::BlockNumber, + banned_until: BlockNumberFor, }, SetAcceptNewIssues { vault_id: DefaultVaultId, @@ -579,7 +579,7 @@ pub mod pallet { /// of this ban (in number of blocks) . #[pallet::storage] #[pallet::getter(fn punishment_delay)] - pub(super) type PunishmentDelay = StorageValue<_, T::BlockNumber, ValueQuery>; + pub(super) type PunishmentDelay = StorageValue<_, BlockNumberFor, ValueQuery>; /// Determines the over-collateralization rate for collateral locked by Vaults, necessary for /// wrapped tokens. This threshold should be greater than the LiquidationCollateralThreshold. @@ -643,31 +643,18 @@ pub mod pallet { pub(super) type StorageVersion = StorageValue<_, Version, ValueQuery, DefaultForStorageVersion>; #[pallet::genesis_config] + #[derive(frame_support::DefaultNoBound)] pub struct GenesisConfig { pub minimum_collateral_vault: Vec<(CurrencyId, BalanceOf)>, - pub punishment_delay: T::BlockNumber, + pub punishment_delay: BlockNumberFor, pub system_collateral_ceiling: Vec<(DefaultVaultCurrencyPair, BalanceOf)>, pub secure_collateral_threshold: Vec<(DefaultVaultCurrencyPair, UnsignedFixedPoint)>, pub premium_redeem_threshold: Vec<(DefaultVaultCurrencyPair, UnsignedFixedPoint)>, pub liquidation_collateral_threshold: Vec<(DefaultVaultCurrencyPair, UnsignedFixedPoint)>, } - #[cfg(feature = "std")] - impl Default for GenesisConfig { - fn default() -> Self { - Self { - minimum_collateral_vault: Default::default(), - punishment_delay: Default::default(), - system_collateral_ceiling: Default::default(), - secure_collateral_threshold: Default::default(), - premium_redeem_threshold: Default::default(), - liquidation_collateral_threshold: Default::default(), - } - } - } - #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { PunishmentDelay::::put(self.punishment_delay); for (currency_id, minimum) in self.minimum_collateral_vault.iter() { diff --git a/crates/vault-registry/src/mock.rs b/crates/vault-registry/src/mock.rs index dbe11826e1..9e79375d11 100644 --- a/crates/vault-registry/src/mock.rs +++ b/crates/vault-registry/src/mock.rs @@ -3,7 +3,7 @@ use crate::{Config, Error}; use currency::CurrencyConversion; use frame_support::{ parameter_types, - traits::{ConstU32, Everything, GenesisBuild}, + traits::{ConstU32, Everything}, PalletId, }; use frame_system::EnsureRoot; @@ -14,23 +14,19 @@ use primitives::{Rate, VaultCurrencyPair, VaultId}; use sp_arithmetic::{FixedI128, FixedPointNumber, FixedU128}; use sp_core::H256; use sp_runtime::{ - testing::{Header, TestXt}, + testing::TestXt, traits::{BlakeTwo256, IdentityLookup, One, Zero}, - DispatchError, + BuildStorage, DispatchError, }; pub(crate) type Extrinsic = TestXt; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, // Tokens & Balances @@ -46,7 +42,7 @@ frame_support::construct_runtime!( Oracle: oracle::{Pallet, Call, Config, Storage, Event}, Fee: fee::{Pallet, Call, Config, Storage}, Currency: currency::{Pallet}, - Loans: loans::{Pallet, Storage, Call, Event, Config}, + Loans: loans::{Pallet, Call, Storage, Event, Config}, } ); @@ -55,7 +51,6 @@ pub type Balance = u128; pub type RawAmount = i128; pub type BlockNumber = u64; pub type Moment = u64; -pub type Index = u64; pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; pub type UnsignedFixedPoint = FixedU128; @@ -72,13 +67,12 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = Index; - type BlockNumber = BlockNumber; + type Nonce = u32; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -269,7 +263,7 @@ impl traits::NominationApi, currency::Amount) -> Result<(), DispatchError> { + fn ensure_opted_in_to_nomination(_vault_id: &VaultId) -> Result<(), DispatchError> { Ok(()) } #[cfg(any(feature = "runtime-benchmarks", test))] @@ -330,19 +324,10 @@ pub const MULTI_VAULT_TEST_COLLATERAL: u128 = 100000; impl ExtBuilder { pub fn build_with(conf: orml_tokens::GenesisConfig) -> sp_io::TestExternalities { - let mut storage = frame_system::GenesisConfig::default().build_storage::().unwrap(); + let mut storage = frame_system::GenesisConfig::::default().build_storage().unwrap(); conf.assimilate_storage(&mut storage).unwrap(); - GenesisBuild::::assimilate_storage( - &loans::GenesisConfig { - max_exchange_rate: Rate::from_inner(DEFAULT_MAX_EXCHANGE_RATE), - min_exchange_rate: Rate::from_inner(DEFAULT_MIN_EXCHANGE_RATE), - }, - &mut storage, - ) - .unwrap(); - // Parameters to be set in tests vault_registry::GenesisConfig:: { minimum_collateral_vault: vec![(DEFAULT_COLLATERAL_CURRENCY, 0), (WORST_CASE_COLLATERAL_CURRENCY, 0)], @@ -367,6 +352,14 @@ impl ExtBuilder { .assimilate_storage(&mut storage) .unwrap(); + loans::GenesisConfig:: { + max_exchange_rate: Rate::from_inner(DEFAULT_MAX_EXCHANGE_RATE), + min_exchange_rate: Rate::from_inner(DEFAULT_MIN_EXCHANGE_RATE), + _marker: Default::default(), + } + .assimilate_storage(&mut storage) + .unwrap(); + sp_io::TestExternalities::from(storage) } pub fn build() -> sp_io::TestExternalities { diff --git a/crates/vault-registry/src/pool_manager.rs b/crates/vault-registry/src/pool_manager.rs index 09bb0597bd..3cce4e1c41 100644 --- a/crates/vault-registry/src/pool_manager.rs +++ b/crates/vault-registry/src/pool_manager.rs @@ -20,7 +20,7 @@ impl PoolManager { vault_id: &DefaultVaultId, nominator_id: &T::AccountId, maybe_amount: Option>, - nonce: Option<::Index>, + nonce: Option<::Nonce>, ) -> Result, DispatchError> { ext::fee::distribute_all_vault_rewards::(vault_id)?; let amount = ext::staking::withdraw_stake(vault_id, nominator_id, maybe_amount, nonce)?; diff --git a/crates/vault-registry/src/types.rs b/crates/vault-registry/src/types.rs index 7570ac6c6f..d96a7760f3 100644 --- a/crates/vault-registry/src/types.rs +++ b/crates/vault-registry/src/types.rs @@ -6,6 +6,7 @@ use frame_support::{ ensure, traits::Get, }; +use frame_system::pallet_prelude::BlockNumberFor; pub use primitives::{VaultCurrencyPair, VaultId}; use scale_info::TypeInfo; use sp_core::H256; @@ -170,8 +171,8 @@ pub struct Vault { // Number of tokens pending issue pub to_be_issued_tokens: Balance, @@ -223,7 +224,7 @@ impl< pub type DefaultVault = Vault< ::AccountId, - ::BlockNumber, + BlockNumberFor, BalanceOf, CurrencyId, UnsignedFixedPoint, @@ -640,7 +641,7 @@ impl RichVault { } } - pub fn ban_until(&mut self, height: T::BlockNumber) { + pub fn ban_until(&mut self, height: BlockNumberFor) { let _ = self.update(|v| { v.banned_until = Some(height); Ok(()) diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml index 29e46babfc..8bdc336c87 100644 --- a/parachain/Cargo.toml +++ b/parachain/Cargo.toml @@ -19,7 +19,7 @@ async-trait = "0.1" clap = { version = "4.0.9", features = [ "derive" ] } log = "0.4.8" codec = { package = "parity-scale-codec", version = "3.1.5" } -serde = { version = "1.0.130", features = ["derive"] } +serde = { version = "1.0.130", features = ["derive"], default-features = false } hex-literal = "0.2.1" futures = "0.3.15" jsonrpsee = { version = "0.16.2", features = ["server", "macros"] } @@ -48,6 +48,8 @@ dex-general-rpc-runtime-api = { path = "../crates/dex-general/rpc/runtime-api" } dex-stable-rpc-runtime-api = { path = "../crates/dex-stable/rpc/runtime-api" } # Substrate dependencies +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } diff --git a/parachain/runtime/common/src/benchmarking/orml_vesting.rs b/parachain/runtime/common/src/benchmarking/orml_vesting.rs index 050110bdc9..af275a7b3b 100644 --- a/parachain/runtime/common/src/benchmarking/orml_vesting.rs +++ b/parachain/runtime/common/src/benchmarking/orml_vesting.rs @@ -3,7 +3,7 @@ use frame_support::{ assert_ok, traits::{Currency, Get}, }; -use frame_system::RawOrigin; +use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin}; use orml_traits::MultiCurrency; use orml_vesting::VestingSchedule; use primitives::CurrencyId; @@ -22,7 +22,7 @@ pub fn lookup_of_account( pub(crate) type BalanceOf = <::Currency as Currency<::AccountId>>::Balance; -pub(crate) type VestingScheduleOf = VestingSchedule<::BlockNumber, BalanceOf>; +pub(crate) type VestingScheduleOf = VestingSchedule, BalanceOf>; fn dummy_schedule() -> VestingScheduleOf { VestingSchedule { diff --git a/parachain/runtime/common/src/evm/mod.rs b/parachain/runtime/common/src/evm/mod.rs index 92787363c5..2e15d72fa2 100644 --- a/parachain/runtime/common/src/evm/mod.rs +++ b/parachain/runtime/common/src/evm/mod.rs @@ -5,6 +5,8 @@ use frame_support::{ use pallet_ethereum::{Transaction, TransactionAction}; use sp_core::Get; use sp_runtime::Permill; +#[cfg(feature = "try-runtime")] +use sp_runtime::TryRuntimeError; use sp_std::marker::PhantomData; pub mod precompiles; @@ -60,12 +62,12 @@ where } #[cfg(feature = "try-runtime")] - fn pre_upgrade() -> Result, &'static str> { + fn pre_upgrade() -> Result, TryRuntimeError> { Ok(Default::default()) } #[cfg(feature = "try-runtime")] - fn post_upgrade(_: sp_std::vec::Vec) -> Result<(), &'static str> { + fn post_upgrade(_: sp_std::vec::Vec) -> Result<(), TryRuntimeError> { Ok(()) } } diff --git a/parachain/runtime/common/src/lib.rs b/parachain/runtime/common/src/lib.rs index a39590d6bb..5ab23e127f 100644 --- a/parachain/runtime/common/src/lib.rs +++ b/parachain/runtime/common/src/lib.rs @@ -9,6 +9,7 @@ use frame_support::{ use primitives::{BlockNumber, UnsignedFixedPoint}; use sp_runtime::{DispatchError, FixedPointNumber}; use sp_std::prelude::*; +use xcm_executor::traits::Properties; #[cfg(feature = "runtime-benchmarks")] pub mod benchmarking; @@ -41,7 +42,7 @@ pub fn estimate_escrow_reward_rate Result where T: currency::Config - + escrow::Config + + escrow::Config + annuity::Config, EscrowAnnuityInstance: 'static, EscrowRewardsApi: reward::RewardsApi<(), AccountId, Balance, CurrencyId = CurrencyId>, @@ -54,7 +55,7 @@ where escrow::Pallet::::round_height_and_deposit_for( &account_id, amount.unwrap_or_default(), - lock_time.unwrap_or_default(), + lock_time.unwrap_or_default().into(), )?; // distribute rewards accrued over block count let reward = annuity::Pallet::::min_reward_per_block().saturating_mul(YEARS.into()); @@ -96,16 +97,15 @@ where } pub struct AndBarrier(PhantomData<(T, U)>); - impl ShouldExecute for AndBarrier { fn should_execute( origin: &MultiLocation, instructions: &mut [Instruction], max_weight: Weight, - weight_credit: &mut Weight, + properties: &mut Properties, ) -> Result<(), ProcessMessageError> { - T::should_execute(origin, instructions, max_weight, weight_credit)?; - U::should_execute(origin, instructions, max_weight, weight_credit)?; + T::should_execute(origin, instructions, max_weight, properties)?; + U::should_execute(origin, instructions, max_weight, properties)?; // only if both returned ok, we return ok Ok(()) } @@ -118,7 +118,7 @@ impl ShouldExecute for Transactless { origin: &MultiLocation, instructions: &mut [Instruction], max_weight: Weight, - weight_credit: &mut Weight, + properties: &mut Properties, ) -> Result<(), ProcessMessageError> { // filter any outer-level Transacts. Any Transact calls sent to other chain should still work. let has_transact = instructions.iter().any(|x| matches!(x, Instruction::Transact { .. })); @@ -126,7 +126,7 @@ impl ShouldExecute for Transactless { return Err(ProcessMessageError::Unsupported); } // No transact - return result of the wrapped barrier - T::should_execute(origin, instructions, max_weight, weight_credit) + T::should_execute(origin, instructions, max_weight, properties) } } diff --git a/parachain/runtime/interlay/Cargo.toml b/parachain/runtime/interlay/Cargo.toml index 43d729e0d2..c3ef365255 100644 --- a/parachain/runtime/interlay/Cargo.toml +++ b/parachain/runtime/interlay/Cargo.toml @@ -8,7 +8,7 @@ version = "1.2.0" targets = ['x86_64-unknown-linux-gnu'] [dependencies] -serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } hex-literal = { version = "0.3.1" } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -133,7 +133,7 @@ orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-m # Frontier dependencies fp-rpc = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42", default-features = false } -fp-self-contained = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42", default-features = false } +fp-self-contained = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42", default-features = false, features = ["serde"] } pallet-base-fee = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42", default-features = false } pallet-ethereum = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42", default-features = false } pallet-evm = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42", default-features = false } @@ -155,7 +155,7 @@ default = ["std"] disable-runtime-api = [] vesting-any = [] std = [ - "serde", + "serde/std", "codec/std", "sp-std/std", @@ -294,6 +294,7 @@ runtime-benchmarks = [ "pallet-society/runtime-benchmarks", "cumulus-pallet-xcmp-queue/runtime-benchmarks", + "cumulus-pallet-parachain-system/runtime-benchmarks", "pallet-xcm/runtime-benchmarks", "pallet-xcm-benchmarks/runtime-benchmarks", diff --git a/parachain/runtime/interlay/src/dex.rs b/parachain/runtime/interlay/src/dex.rs index 0b240d8a7d..3e1b67cfe6 100644 --- a/parachain/runtime/interlay/src/dex.rs +++ b/parachain/runtime/interlay/src/dex.rs @@ -6,6 +6,8 @@ use sp_runtime::traits::Zero; #[cfg(feature = "try-runtime")] use frame_support::ensure; +#[cfg(feature = "try-runtime")] +use sp_runtime::TryRuntimeError; pub use dex_general::{AssetBalance, GenerateLpAssetId, PairInfo, ValidateAsset}; pub use dex_stable::traits::{StablePoolLpCurrencyIdGenerate, ValidateCurrency}; @@ -107,7 +109,7 @@ impl OnRuntimeUpgrade for SetLoansExchangeRates { } #[cfg(feature = "try-runtime")] - fn post_upgrade(_state: sp_std::vec::Vec) -> Result<(), &'static str> { + fn post_upgrade(_state: sp_std::vec::Vec) -> Result<(), TryRuntimeError> { let min_exchange_rate = loans::MinExchangeRate::::get(); let max_exchange_rate = loans::MaxExchangeRate::::get(); ensure!( diff --git a/parachain/runtime/interlay/src/lib.rs b/parachain/runtime/interlay/src/lib.rs index aa9ee24427..3ac6e11f39 100644 --- a/parachain/runtime/interlay/src/lib.rs +++ b/parachain/runtime/interlay/src/lib.rs @@ -1,8 +1,8 @@ //! The interlay runtime. This can be compiled with `#[no_std]`, ready for Wasm. #![cfg_attr(not(feature = "std"), no_std)] -// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. -#![recursion_limit = "256"] +// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 512. +#![recursion_limit = "512"] // Make the WASM binary available. #[cfg(feature = "std")] @@ -15,7 +15,7 @@ use currency::Amount; use frame_support::{ dispatch::{DispatchError, DispatchResult}, traits::{ - ConstU32, Contains, Currency as PalletCurrency, EitherOfDiverse, EnsureOrigin, EnsureOriginWithArg, + ConstBool, ConstU32, Contains, Currency as PalletCurrency, EitherOfDiverse, EnsureOrigin, EnsureOriginWithArg, EqualPrivilegeOnly, ExistenceRequirement, Imbalance, InstanceFilter, OnUnbalanced, }, weights::ConstantMultiplier, @@ -112,10 +112,13 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("interlay-parachain"), impl_name: create_runtime_str!("interlay-parachain"), authoring_version: 1, - spec_version: 1025000, + spec_version: 1025002, impl_version: 1, - transaction_version: 4, + #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, + #[cfg(feature = "disable-runtime-api")] + apis: sp_version::create_apis_vec![[]], + transaction_version: 4, state_version: 0, }; @@ -197,11 +200,15 @@ impl Contains for BaseCallFilter { ) { // always allow core calls true - } else if let RuntimeCall::PolkadotXcm(_) = call { - // For security reasons, disallow usage of the xcm package by users. Sudo and + } else if let RuntimeCall::PolkadotXcm(polkadot_xcm_call) = call { + // For security reasons, disallow most usage of the xcm package by users. Sudo and // governance are still able to call these (sudo is explicitly white-listed, while // governance bypasses this call filter). - false + + // We do allow PolkadotXcm.send - it's needed for e.g. wormhole interactions on + // moonbeam/moonriver. We could probably also allow other functions, but this way + // we don't need to worry about security implications of these functions + matches!(polkadot_xcm_call, pallet_xcm::Call::::send { .. }) } else if let RuntimeCall::EVM(_) = call { // disable non-root EVM access false @@ -213,6 +220,7 @@ impl Contains for BaseCallFilter { } impl frame_system::Config for Runtime { + type Block = Block; /// The identifier used to distinguish between accounts. type AccountId = AccountId; /// The aggregated dispatch type that is available for extrinsics. @@ -220,15 +228,11 @@ impl frame_system::Config for Runtime { /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = IdentityLookup; /// The index type for storing how many extrinsics an account has signed. - type Index = Nonce; - /// The index type for blocks. - type BlockNumber = BlockNumber; + type Nonce = Nonce; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = Header; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -318,6 +322,7 @@ impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; type DisabledValidators = (); type MaxAuthorities = MaxAuthorities; + type AllowMultipleBlocksPerSlot = ConstBool; } parameter_types! { @@ -390,6 +395,7 @@ impl pallet_transaction_payment::Config for Runtime { impl pallet_sudo::Config for Runtime { type RuntimeCall = RuntimeCall; type RuntimeEvent = RuntimeEvent; + type WeightInfo = (); } impl pallet_utility::Config for Runtime { @@ -492,7 +498,7 @@ type EnsureRootOrAllTechnicalCommittee = EitherOfDiverse< >; parameter_types! { - pub const LaunchPeriod: u64 = 1000 * 60 * 60 * 24 * 7; // one week + pub const LaunchPeriod: u64 = 60 * 60 * 24 * 7; // one week (seconds) pub const VotingPeriod: BlockNumber = 7 * DAYS; pub const FastTrackVotingPeriod: BlockNumber = 3 * HOURS; // Require 250 vINTR to make a proposal. Given the crowdloan airdrop, this qualifies about 7500 @@ -724,12 +730,12 @@ impl EnsureOriginWithArg> for AssetAuthority { type Success = (); fn try_origin(origin: RuntimeOrigin, _asset_id: &Option) -> Result { - EnsureRoot::try_origin(origin) + as EnsureOrigin>::try_origin(origin) } #[cfg(feature = "runtime-benchmarks")] fn try_successful_origin(_: &Option) -> Result { - EnsureRoot::try_successful_origin() + as EnsureOrigin>::try_successful_origin() } } @@ -1201,12 +1207,9 @@ impl loans::Config for Runtime { } construct_runtime! { - pub enum Runtime where - Block = Block, - NodeBlock = primitives::Block, - UncheckedExtrinsic = UncheckedExtrinsic + pub enum Runtime { - System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, + System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 1, Sudo: pallet_sudo::{Pallet, Call, Storage, Config, Event} = 2, Utility: pallet_utility::{Pallet, Call, Event} = 3, @@ -1251,7 +1254,7 @@ construct_runtime! { Replace: replace::{Pallet, Call, Config, Storage, Event} = 65, Fee: fee::{Pallet, Call, Config, Storage} = 66, // Refund: 67 - Nomination: nomination::{Pallet, Call, Config, Storage, Event} = 68, + Nomination: nomination::{Pallet, Call, Storage, Config, Event} = 68, ClientsInfo: clients_info::{Pallet, Call, Storage, Event} = 69, // # Governance @@ -1264,13 +1267,13 @@ construct_runtime! { CollatorSelection: collator_selection::{Pallet, Call, Storage, Event, Config} = 81, Session: pallet_session::{Pallet, Call, Storage, Event, Config} = 82, Aura: pallet_aura::{Pallet, Storage, Config} = 83, - AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config} = 84, - ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event} = 85, - ParachainInfo: parachain_info::{Pallet, Storage, Config} = 86, + AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config} = 84, + ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event} = 85, + ParachainInfo: parachain_info::{Pallet, Storage, Config} = 86, // # XCM Helpers XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event} = 90, - PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event, Origin, Config} = 91, + PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event, Origin, Config} = 91, CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event, Origin} = 92, DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event} = 93, @@ -1278,16 +1281,16 @@ construct_runtime! { UnknownTokens: orml_unknown_tokens::{Pallet, Storage, Event} = 95, // # Lending & AMM - Loans: loans::{Pallet, Call, Storage, Event, Config} = 100, + Loans: loans::{Pallet, Call, Storage, Event, Config} = 100, DexGeneral: dex_general::{Pallet, Call, Storage, Event} = 101, DexStable: dex_stable::{Pallet, Call, Storage, Event} = 102, DexSwapRouter: dex_swap_router::{Pallet, Call, Event} = 103, // # Smart contracts - BaseFee: pallet_base_fee::{Pallet, Call, Storage, Event, Config} = 111, - Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Config, Origin} = 112, - EVM: pallet_evm::{Pallet, Call, Storage, Event, Config} = 113, - EVMChainId: pallet_evm_chain_id::{Pallet, Storage, Config} = 114, + BaseFee: pallet_base_fee::{Pallet, Call, Storage, Event,Config } = 111, + Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event,Config, Origin} = 112, + EVM: pallet_evm::{Pallet, Call, Storage, Event, Config} = 113, + EVMChainId: pallet_evm_chain_id::{Pallet, Storage, Config} = 114, } } @@ -1320,13 +1323,7 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPalletsWithSystem, - ( - orml_asset_registry::Migration, - orml_unknown_tokens::Migration, - dex::SetLoansExchangeRates, - issue::migration::v1::Migration, - evm::SetEvmChainId, - ), + (evm::SetEvmChainId,), >; impl fp_self_contained::SelfContainedCall for RuntimeCall { @@ -1741,8 +1738,16 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey}; - impl frame_system_benchmarking::Config for Runtime {} + use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey, BenchmarkError}; + impl frame_system_benchmarking::Config for Runtime { + fn setup_set_code_requirements(code: &sp_std::vec::Vec) -> Result<(), BenchmarkError> { + ParachainSystem::initialize_for_set_code_benchmark(code.len() as u32); + Ok(()) + } + fn verify_set_code() { + System::assert_last_event(cumulus_pallet_parachain_system::Event::::ValidationFunctionStored.into()); + } + } impl runtime_common::benchmarking::orml_tokens::Config for Runtime {} impl runtime_common::benchmarking::orml_vesting::Config for Runtime {} impl runtime_common::benchmarking::orml_asset_registry::Config for Runtime {} diff --git a/parachain/runtime/interlay/src/weights/annuity_escrow_annuity.rs b/parachain/runtime/interlay/src/weights/annuity_escrow_annuity.rs index 0c462ec7e4..984ac5a0a5 100644 --- a/parachain/runtime/interlay/src/weights/annuity_escrow_annuity.rs +++ b/parachain/runtime/interlay/src/weights/annuity_escrow_annuity.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for annuity //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -44,8 +44,8 @@ impl annuity::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 15_962_000 picoseconds. - Weight::from_parts(16_652_000, 0) + // Minimum execution time: 13_878_000 picoseconds. + Weight::from_parts(14_369_000, 0) } /// Storage: EscrowRewards Stake (r:1 w:0) /// Proof: EscrowRewards Stake (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) @@ -61,10 +61,10 @@ impl annuity::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn withdraw_rewards () -> Weight { // Proof Size summary in bytes: - // Measured: `747` - // Estimated: `23880` - // Minimum execution time: 144_859_000 picoseconds. - Weight::from_parts(150_600_000, 23880) + // Measured: `1014` + // Estimated: `6170` + // Minimum execution time: 125_391_000 picoseconds. + Weight::from_parts(130_662_000, 6170) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -72,17 +72,17 @@ impl annuity::WeightInfo for WeightInfo { /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) fn update_rewards () -> Weight { // Proof Size summary in bytes: - // Measured: `319` + // Measured: `536` // Estimated: `3580` - // Minimum execution time: 26_200_000 picoseconds. - Weight::from_parts(27_770_000, 3580) + // Minimum execution time: 23_708_000 picoseconds. + Weight::from_parts(25_200_000, 3580) .saturating_add(T::DbWeight::get().reads(1_u64)) } fn set_reward_per_wrapped () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_013_000 picoseconds. - Weight::from_parts(10_547_000, 0) + // Minimum execution time: 9_058_000 picoseconds. + Weight::from_parts(9_459_000, 0) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/annuity_vault_annuity.rs b/parachain/runtime/interlay/src/weights/annuity_vault_annuity.rs index cd70a7a700..42ba284b23 100644 --- a/parachain/runtime/interlay/src/weights/annuity_vault_annuity.rs +++ b/parachain/runtime/interlay/src/weights/annuity_vault_annuity.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for annuity //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -44,8 +44,8 @@ impl annuity::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 16_456_000 picoseconds. - Weight::from_parts(16_919_000, 0) + // Minimum execution time: 14_750_000 picoseconds. + Weight::from_parts(15_390_000, 0) } fn withdraw_rewards () -> Weight { // Proof Size summary in bytes: @@ -58,17 +58,17 @@ impl annuity::WeightInfo for WeightInfo { /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) fn update_rewards () -> Weight { // Proof Size summary in bytes: - // Measured: `319` + // Measured: `536` // Estimated: `3580` - // Minimum execution time: 25_859_000 picoseconds. - Weight::from_parts(27_884_000, 3580) + // Minimum execution time: 23_998_000 picoseconds. + Weight::from_parts(25_060_000, 3580) .saturating_add(T::DbWeight::get().reads(1_u64)) } fn set_reward_per_wrapped () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_298_000 picoseconds. - Weight::from_parts(10_736_000, 0) + // Minimum execution time: 9_028_000 picoseconds. + Weight::from_parts(9_399_000, 0) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/btc_relay.rs b/parachain/runtime/interlay/src/weights/btc_relay.rs index 49ed445af2..0958e8c733 100644 --- a/parachain/runtime/interlay/src/weights/btc_relay.rs +++ b/parachain/runtime/interlay/src/weights/btc_relay.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for btc_relay //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -62,10 +62,10 @@ impl btc_relay::WeightInfo for WeightInfo { /// Proof: BTCRelay BlockHeaders (max_values: None, max_size: Some(200), added: 2675, mode: MaxEncodedLen) fn initialize () -> Weight { // Proof Size summary in bytes: - // Measured: `430` - // Estimated: `9470` - // Minimum execution time: 84_891_000 picoseconds. - Weight::from_parts(89_997_000, 9470) + // Measured: `403` + // Estimated: `3489` + // Minimum execution time: 71_783_000 picoseconds. + Weight::from_parts(74_009_000, 3489) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -87,10 +87,10 @@ impl btc_relay::WeightInfo for WeightInfo { /// Proof: BTCRelay BestBlockHeight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) fn store_block_header () -> Weight { // Proof Size summary in bytes: - // Measured: `901` - // Estimated: `17838` - // Minimum execution time: 96_734_000 picoseconds. - Weight::from_parts(104_906_000, 17838) + // Measured: `874` + // Estimated: `6340` + // Minimum execution time: 88_808_000 picoseconds. + Weight::from_parts(90_482_000, 6340) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -113,16 +113,16 @@ impl btc_relay::WeightInfo for WeightInfo { /// The range of component `f` is `[1, 6]`. fn store_block_header_new_fork_sorted (f: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `841 + f * (92 ±0)` - // Estimated: `16800 + f * (5006 ±0)` - // Minimum execution time: 122_921_000 picoseconds. - Weight::from_parts(115_873_657, 16800) - // Standard Error: 233_264 - .saturating_add(Weight::from_parts(13_772_544, 0).saturating_mul(f.into())) + // Measured: `806 + f * (101 ±0)` + // Estimated: `6340 + f * (2507 ±0)` + // Minimum execution time: 101_073_000 picoseconds. + Weight::from_parts(95_176_412, 6340) + // Standard Error: 452_083 + .saturating_add(Weight::from_parts(11_888_980, 0).saturating_mul(f.into())) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(f.into()))) .saturating_add(T::DbWeight::get().writes(5_u64)) - .saturating_add(Weight::from_parts(0, 5006).saturating_mul(f.into())) + .saturating_add(Weight::from_parts(0, 2507).saturating_mul(f.into())) } /// Storage: BTCRelay ChainCounter (r:1 w:1) /// Proof: BTCRelay ChainCounter (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -143,17 +143,17 @@ impl btc_relay::WeightInfo for WeightInfo { /// The range of component `f` is `[1, 6]`. fn store_block_header_new_fork_unsorted (f: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `920 + f * (98 ±0)` - // Estimated: `19871 + f * (2975 ±31)` - // Minimum execution time: 124_552_000 picoseconds. - Weight::from_parts(119_807_286, 19871) - // Standard Error: 219_739 - .saturating_add(Weight::from_parts(16_025_685, 0).saturating_mul(f.into())) + // Measured: `842 + f * (99 ±0)` + // Estimated: `6340 + f * (2499 ±0)` + // Minimum execution time: 97_675_000 picoseconds. + Weight::from_parts(89_104_041, 6340) + // Standard Error: 196_333 + .saturating_add(Weight::from_parts(14_328_939, 0).saturating_mul(f.into())) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(f.into()))) .saturating_add(T::DbWeight::get().writes(4_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(f.into()))) - .saturating_add(Weight::from_parts(0, 2975).saturating_mul(f.into())) + .saturating_add(Weight::from_parts(0, 2499).saturating_mul(f.into())) } /// Storage: BTCRelay ChainCounter (r:1 w:0) /// Proof: BTCRelay ChainCounter (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -178,12 +178,12 @@ impl btc_relay::WeightInfo for WeightInfo { /// The range of component `f` is `[3, 6]`. fn store_block_header_reorganize_chains (f: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `4937 + f * (199 ±0)` - // Estimated: `109561 + f * (1340 ±45)` - // Minimum execution time: 650_977_000 picoseconds. - Weight::from_parts(615_353_151, 109561) - // Standard Error: 994_819 - .saturating_add(Weight::from_parts(22_332_173, 0).saturating_mul(f.into())) + // Measured: `4741 + f * (240 ±0)` + // Estimated: `54490 + f * (1340 ±45)` + // Minimum execution time: 506_604_000 picoseconds. + Weight::from_parts(465_095_071, 54490) + // Standard Error: 430_820 + .saturating_add(Weight::from_parts(18_597_675, 0).saturating_mul(f.into())) .saturating_add(T::DbWeight::get().reads(42_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(f.into()))) .saturating_add(T::DbWeight::get().writes(46_u64)) diff --git a/parachain/runtime/interlay/src/weights/clients_info.rs b/parachain/runtime/interlay/src/weights/clients_info.rs index a9522240b7..c40bdf0157 100644 --- a/parachain/runtime/interlay/src/weights/clients_info.rs +++ b/parachain/runtime/interlay/src/weights/clients_info.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for clients_info //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -44,16 +44,12 @@ impl clients_info::WeightInfo for WeightInfo { /// Proof: ClientsInfo CurrentClientReleases (max_values: None, max_size: Some(562), added: 3037, mode: MaxEncodedLen) /// The range of component `n` is `[0, 255]`. /// The range of component `u` is `[0, 255]`. - fn set_current_client_release (n: u32, u: u32, ) -> Weight { + fn set_current_client_release (_n: u32, _u: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 28_286_000 picoseconds. - Weight::from_parts(29_757_758, 0) - // Standard Error: 1_555 - .saturating_add(Weight::from_parts(7_981, 0).saturating_mul(n.into())) - // Standard Error: 1_555 - .saturating_add(Weight::from_parts(5_543, 0).saturating_mul(u.into())) + // Minimum execution time: 23_357_000 picoseconds. + Weight::from_parts(26_197_179, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: ClientsInfo PendingClientReleases (r:0 w:1) @@ -64,12 +60,12 @@ impl clients_info::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 28_745_000 picoseconds. - Weight::from_parts(28_862_679, 0) - // Standard Error: 1_669 - .saturating_add(Weight::from_parts(9_826, 0).saturating_mul(n.into())) - // Standard Error: 1_669 - .saturating_add(Weight::from_parts(9_079, 0).saturating_mul(u.into())) + // Minimum execution time: 22_976_000 picoseconds. + Weight::from_parts(24_221_268, 0) + // Standard Error: 615 + .saturating_add(Weight::from_parts(3_577, 0).saturating_mul(n.into())) + // Standard Error: 615 + .saturating_add(Weight::from_parts(1_267, 0).saturating_mul(u.into())) .saturating_add(T::DbWeight::get().writes(1_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/collator_selection.rs b/parachain/runtime/interlay/src/weights/collator_selection.rs index f06d0b06c1..d9532fcc8f 100644 --- a/parachain/runtime/interlay/src/weights/collator_selection.rs +++ b/parachain/runtime/interlay/src/weights/collator_selection.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for collator_selection //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -47,12 +47,12 @@ impl collator_selection::WeightInfo for WeightInfo { /// The range of component `b` is `[1, 100]`. fn set_invulnerables (b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `217 + b * (78 ±0)` - // Estimated: `1207 + b * (2554 ±0)` - // Minimum execution time: 33_665_000 picoseconds. - Weight::from_parts(36_494_050, 1207) - // Standard Error: 24_862 - .saturating_add(Weight::from_parts(6_432_343, 0).saturating_mul(b.into())) + // Measured: `252 + b * (78 ±0)` + // Estimated: `1241 + b * (2554 ±0)` + // Minimum execution time: 28_387_000 picoseconds. + Weight::from_parts(19_586_047, 1241) + // Standard Error: 104_765 + .saturating_add(Weight::from_parts(5_569_637, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(Weight::from_parts(0, 2554).saturating_mul(b.into())) @@ -63,8 +63,8 @@ impl collator_selection::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 17_101_000 picoseconds. - Weight::from_parts(18_058_000, 0) + // Minimum execution time: 17_825_000 picoseconds. + Weight::from_parts(24_970_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: CollatorSelection CandidacyBond (r:0 w:1) @@ -73,8 +73,8 @@ impl collator_selection::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 18_328_000 picoseconds. - Weight::from_parts(18_909_000, 0) + // Minimum execution time: 26_052_000 picoseconds. + Weight::from_parts(27_986_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: CollatorSelection Candidates (r:1 w:1) @@ -95,18 +95,18 @@ impl collator_selection::WeightInfo for WeightInfo { /// Proof: Escrow Reserved (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) /// Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) /// Proof: CollatorSelection LastAuthoredBlock (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) - /// The range of component `c` is `[1, 999]`. + /// The range of component `c` is `[1, 19]`. fn register_as_candidate (c: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `2801 + c * (49 ±0)` - // Estimated: `73766 + c * (50 ±0)` - // Minimum execution time: 96_633_000 picoseconds. - Weight::from_parts(128_853_656, 73766) - // Standard Error: 3_768 - .saturating_add(Weight::from_parts(280_459, 0).saturating_mul(c.into())) + // Measured: `902 + c * (96 ±0)` + // Estimated: `49487 + c * (97 ±0)` + // Minimum execution time: 78_588_000 picoseconds. + Weight::from_parts(82_310_845, 49487) + // Standard Error: 88_497 + .saturating_add(Weight::from_parts(487_436, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 50).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 97).saturating_mul(c.into())) } /// Storage: CollatorSelection Candidates (r:1 w:1) /// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(48002), added: 48497, mode: MaxEncodedLen) @@ -114,15 +114,15 @@ impl collator_selection::WeightInfo for WeightInfo { /// Proof: Escrow Reserved (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) /// Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) /// Proof: CollatorSelection LastAuthoredBlock (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) - /// The range of component `c` is `[6, 1000]`. + /// The range of component `c` is `[6, 20]`. fn leave_intent (c: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `983 + c * (48 ±0)` - // Estimated: `53016` - // Minimum execution time: 54_720_000 picoseconds. - Weight::from_parts(71_237_061, 53016) - // Standard Error: 3_387 - .saturating_add(Weight::from_parts(270_577, 0).saturating_mul(c.into())) + // Measured: `402 + c * (64 ±0)` + // Estimated: `49487` + // Minimum execution time: 41_573_000 picoseconds. + Weight::from_parts(42_921_116, 49487) + // Standard Error: 17_308 + .saturating_add(Weight::from_parts(209_885, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -134,10 +134,10 @@ impl collator_selection::WeightInfo for WeightInfo { /// Proof: CollatorSelection LastAuthoredBlock (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) fn note_author () -> Weight { // Proof Size summary in bytes: - // Measured: `319` - // Estimated: `9763` - // Minimum execution time: 80_950_000 picoseconds. - Weight::from_parts(84_539_000, 9763) + // Measured: `650` + // Estimated: `6170` + // Minimum execution time: 72_686_000 picoseconds. + Weight::from_parts(73_928_000, 6170) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -145,30 +145,30 @@ impl collator_selection::WeightInfo for WeightInfo { /// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(48002), added: 48497, mode: MaxEncodedLen) /// Storage: CollatorSelection CandidacyBond (r:1 w:0) /// Proof: CollatorSelection CandidacyBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - /// Storage: CollatorSelection LastAuthoredBlock (r:999 w:0) + /// Storage: CollatorSelection LastAuthoredBlock (r:20 w:0) /// Proof: CollatorSelection LastAuthoredBlock (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) - /// Storage: Escrow UserPointEpoch (r:999 w:0) + /// Storage: Escrow UserPointEpoch (r:20 w:0) /// Proof: Escrow UserPointEpoch (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen) - /// Storage: Escrow UserPointHistory (r:999 w:0) + /// Storage: Escrow UserPointHistory (r:20 w:0) /// Proof: Escrow UserPointHistory (max_values: None, max_size: Some(88), added: 2563, mode: MaxEncodedLen) /// Storage: CollatorSelection Invulnerables (r:1 w:0) /// Proof: CollatorSelection Invulnerables (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) - /// Storage: Escrow Reserved (r:995 w:995) + /// Storage: Escrow Reserved (r:15 w:15) /// Proof: Escrow Reserved (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) - /// The range of component `r` is `[1, 1000]`. - /// The range of component `c` is `[1, 1000]`. + /// The range of component `r` is `[1, 20]`. + /// The range of component `c` is `[1, 20]`. fn new_session (r: u32, c: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `23641 + r * (50 ±0) + c * (193 ±0)` - // Estimated: `58645 + c * (7610 ±0) + r * (2538 ±0)` - // Minimum execution time: 66_169_000 picoseconds. - Weight::from_parts(66_765_000, 58645) - // Standard Error: 1_569_335 - .saturating_add(Weight::from_parts(87_957_359, 0).saturating_mul(c.into())) + // Measured: `793 + c * (194 ±0) + r * (47 ±0)` + // Estimated: `49487 + c * (2563 ±0) + r * (2207 ±23)` + // Minimum execution time: 51_603_000 picoseconds. + Weight::from_parts(53_327_000, 49487) + // Standard Error: 385_035 + .saturating_add(Weight::from_parts(25_609_068, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(c.into()))) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into()))) - .saturating_add(Weight::from_parts(0, 7610).saturating_mul(c.into())) - .saturating_add(Weight::from_parts(0, 2538).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2563).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 2207).saturating_mul(r.into())) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/cumulus_pallet_xcmp_queue.rs b/parachain/runtime/interlay/src/weights/cumulus_pallet_xcmp_queue.rs index 996be1bfca..834dd5a395 100644 --- a/parachain/runtime/interlay/src/weights/cumulus_pallet_xcmp_queue.rs +++ b/parachain/runtime/interlay/src/weights/cumulus_pallet_xcmp_queue.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for cumulus_pallet_xcmp_queue //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -46,8 +46,8 @@ impl cumulus_pallet_xcmp_queue::WeightInfo for WeightIn // Proof Size summary in bytes: // Measured: `4` // Estimated: `1489` - // Minimum execution time: 13_471_000 picoseconds. - Weight::from_parts(13_943_000, 1489) + // Minimum execution time: 10_290_000 picoseconds. + Weight::from_parts(10_882_000, 1489) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -57,8 +57,8 @@ impl cumulus_pallet_xcmp_queue::WeightInfo for WeightIn // Proof Size summary in bytes: // Measured: `4` // Estimated: `1489` - // Minimum execution time: 13_530_000 picoseconds. - Weight::from_parts(14_547_000, 1489) + // Minimum execution time: 10_611_000 picoseconds. + Weight::from_parts(11_673_000, 1489) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/parachain/runtime/interlay/src/weights/democracy.rs b/parachain/runtime/interlay/src/weights/democracy.rs index 33f0b5cf48..08bad28c7f 100644 --- a/parachain/runtime/interlay/src/weights/democracy.rs +++ b/parachain/runtime/interlay/src/weights/democracy.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for democracy //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -54,10 +54,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen) fn propose () -> Weight { // Proof Size summary in bytes: - // Measured: `6110` - // Estimated: `30275` - // Minimum execution time: 114_600_000 picoseconds. - Weight::from_parts(120_562_000, 30275) + // Measured: `6137` + // Estimated: `18187` + // Minimum execution time: 93_467_000 picoseconds. + Weight::from_parts(129_309_000, 18187) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -71,10 +71,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: Escrow Reserved (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) fn second () -> Weight { // Proof Size summary in bytes: - // Measured: `4802` - // Estimated: `17294` - // Minimum execution time: 88_005_000 picoseconds. - Weight::from_parts(100_713_000, 17294) + // Measured: `4829` + // Estimated: `6695` + // Minimum execution time: 62_655_000 picoseconds. + Weight::from_parts(64_308_000, 6695) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -90,10 +90,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: Democracy VotingOf (max_values: None, max_size: Some(2142), added: 4617, mode: MaxEncodedLen) fn vote_new () -> Weight { // Proof Size summary in bytes: - // Measured: `3160` - // Estimated: `19872` - // Minimum execution time: 98_079_000 picoseconds. - Weight::from_parts(115_463_000, 19872) + // Measured: `3187` + // Estimated: `5607` + // Minimum execution time: 66_814_000 picoseconds. + Weight::from_parts(70_581_000, 5607) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -109,10 +109,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: Democracy VotingOf (max_values: None, max_size: Some(2142), added: 4617, mode: MaxEncodedLen) fn vote_existing () -> Weight { // Proof Size summary in bytes: - // Measured: `3181` - // Estimated: `19872` - // Minimum execution time: 89_689_000 picoseconds. - Weight::from_parts(99_828_000, 19872) + // Measured: `3208` + // Estimated: `5607` + // Minimum execution time: 75_491_000 picoseconds. + Weight::from_parts(89_820_000, 5607) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -128,10 +128,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen) fn fast_track () -> Weight { // Proof Size summary in bytes: - // Measured: `398` - // Estimated: `29900` - // Minimum execution time: 70_470_000 picoseconds. - Weight::from_parts(71_922_000, 29900) + // Measured: `425` + // Estimated: `18187` + // Minimum execution time: 61_484_000 picoseconds. + Weight::from_parts(63_477_000, 18187) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -139,10 +139,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen) fn fast_track_referendum () -> Weight { // Proof Size summary in bytes: - // Measured: `221` + // Measured: `248` // Estimated: `3666` - // Minimum execution time: 38_562_000 picoseconds. - Weight::from_parts(39_311_000, 3666) + // Minimum execution time: 34_058_000 picoseconds. + Weight::from_parts(35_220_000, 3666) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -154,10 +154,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: Escrow Reserved (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) fn cancel_proposal () -> Weight { // Proof Size summary in bytes: - // Measured: `6169` - // Estimated: `28411` - // Minimum execution time: 161_254_000 picoseconds. - Weight::from_parts(171_109_000, 28411) + // Measured: `6196` + // Estimated: `18187` + // Minimum execution time: 105_050_000 picoseconds. + Weight::from_parts(123_808_000, 18187) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -165,10 +165,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen) fn cancel_referendum () -> Weight { // Proof Size summary in bytes: - // Measured: `221` + // Measured: `248` // Estimated: `3666` - // Minimum execution time: 33_858_000 picoseconds. - Weight::from_parts(37_949_000, 3666) + // Minimum execution time: 29_239_000 picoseconds. + Weight::from_parts(29_700_000, 3666) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -195,12 +195,12 @@ impl democracy::WeightInfo for WeightInfo { /// The range of component `r` is `[0, 99]`. fn on_initialize_public (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `426 + r * (86 ±0)` - // Estimated: `40282 + r * (2677 ±0)` - // Minimum execution time: 80_172_000 picoseconds. - Weight::from_parts(95_107_339, 40282) - // Standard Error: 60_742 - .saturating_add(Weight::from_parts(22_858_429, 0).saturating_mul(r.into())) + // Measured: `453 + r * (86 ±0)` + // Estimated: `18187 + r * (2677 ±0)` + // Minimum execution time: 74_709_000 picoseconds. + Weight::from_parts(144_257_239, 18187) + // Standard Error: 307_991 + .saturating_add(Weight::from_parts(18_937_404, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(6_u64)) @@ -222,12 +222,12 @@ impl democracy::WeightInfo for WeightInfo { /// The range of component `r` is `[0, 99]`. fn on_initialize_base (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `144 + r * (86 ±0)` - // Estimated: `25141 + r * (2676 ±0)` - // Minimum execution time: 20_896_000 picoseconds. - Weight::from_parts(16_533_498, 25141) - // Standard Error: 32_240 - .saturating_add(Weight::from_parts(6_780_742, 0).saturating_mul(r.into())) + // Measured: `171 + r * (86 ±0)` + // Estimated: `18187 + r * (2676 ±0)` + // Minimum execution time: 19_750_000 picoseconds. + Weight::from_parts(23_636_151, 18187) + // Standard Error: 11_079 + .saturating_add(Weight::from_parts(4_983_882, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) @@ -248,12 +248,12 @@ impl democracy::WeightInfo for WeightInfo { /// The range of component `r` is `[0, 99]`. fn on_initialize_base_with_launch_period (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `144 + r * (86 ±0)` - // Estimated: `25141 + r * (2676 ±0)` - // Minimum execution time: 20_738_000 picoseconds. - Weight::from_parts(15_781_900, 25141) - // Standard Error: 35_897 - .saturating_add(Weight::from_parts(6_785_581, 0).saturating_mul(r.into())) + // Measured: `171 + r * (86 ±0)` + // Estimated: `18187 + r * (2676 ±0)` + // Minimum execution time: 19_560_000 picoseconds. + Weight::from_parts(19_961_000, 18187) + // Standard Error: 10_127 + .saturating_add(Weight::from_parts(5_053_754, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) @@ -265,8 +265,8 @@ impl democracy::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 9_406_000 picoseconds. - Weight::from_parts(10_445_000, 0) + // Minimum execution time: 6_784_000 picoseconds. + Weight::from_parts(6_964_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Democracy ReferendumInfoOf (r:1 w:1) @@ -276,12 +276,12 @@ impl democracy::WeightInfo for WeightInfo { /// The range of component `r` is `[1, 100]`. fn remove_vote (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `598 + r * (25 ±0)` - // Estimated: `9273` - // Minimum execution time: 34_563_000 picoseconds. - Weight::from_parts(43_648_351, 9273) - // Standard Error: 11_539 - .saturating_add(Weight::from_parts(322_493, 0).saturating_mul(r.into())) + // Measured: `625 + r * (25 ±0)` + // Estimated: `5607` + // Minimum execution time: 28_156_000 picoseconds. + Weight::from_parts(32_747_776, 5607) + // Standard Error: 5_899 + .saturating_add(Weight::from_parts(121_274, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -291,10 +291,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn spend_from_treasury () -> Weight { // Proof Size summary in bytes: - // Measured: `319` - // Estimated: `9763` - // Minimum execution time: 81_377_000 picoseconds. - Weight::from_parts(83_931_000, 9763) + // Measured: `536` + // Estimated: `6170` + // Minimum execution time: 66_633_000 picoseconds. + Weight::from_parts(67_405_000, 6170) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } diff --git a/parachain/runtime/interlay/src/weights/dex_general.rs b/parachain/runtime/interlay/src/weights/dex_general.rs index b58e14869c..031edce72c 100644 --- a/parachain/runtime/interlay/src/weights/dex_general.rs +++ b/parachain/runtime/interlay/src/weights/dex_general.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for dex_general //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -44,10 +44,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: DexGeneral FeeMeta (max_values: Some(1), max_size: Some(34), added: 529, mode: MaxEncodedLen) fn set_fee_receiver () -> Weight { // Proof Size summary in bytes: - // Measured: `3` + // Measured: `4` // Estimated: `1519` - // Minimum execution time: 15_919_000 picoseconds. - Weight::from_parts(16_728_000, 1519) + // Minimum execution time: 13_066_000 picoseconds. + Weight::from_parts(13_848_000, 1519) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -55,10 +55,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: DexGeneral FeeMeta (max_values: Some(1), max_size: Some(34), added: 529, mode: MaxEncodedLen) fn set_fee_point () -> Weight { // Proof Size summary in bytes: - // Measured: `3` + // Measured: `4` // Estimated: `1519` - // Minimum execution time: 26_414_000 picoseconds. - Weight::from_parts(26_871_000, 1519) + // Minimum execution time: 21_603_000 picoseconds. + Weight::from_parts(22_054_000, 1519) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -68,10 +68,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: DexGeneral LiquidityPairs (max_values: None, max_size: Some(50), added: 2525, mode: MaxEncodedLen) fn create_pair () -> Weight { // Proof Size summary in bytes: - // Measured: `3` + // Measured: `4` // Estimated: `3628` - // Minimum execution time: 39_508_000 picoseconds. - Weight::from_parts(41_610_000, 3628) + // Minimum execution time: 31_944_000 picoseconds. + Weight::from_parts(32_956_000, 3628) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -85,14 +85,14 @@ impl dex_general::WeightInfo for WeightInfo { /// The range of component `l` is `[1, 10]`. fn bootstrap_create (r: u32, l: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `3` + // Measured: `4` // Estimated: `3628` - // Minimum execution time: 46_807_000 picoseconds. - Weight::from_parts(49_800_031, 3628) - // Standard Error: 55_147 - .saturating_add(Weight::from_parts(120_739, 0).saturating_mul(r.into())) - // Standard Error: 55_147 - .saturating_add(Weight::from_parts(229_186, 0).saturating_mul(l.into())) + // Minimum execution time: 37_816_000 picoseconds. + Weight::from_parts(29_977_579, 3628) + // Standard Error: 119_682 + .saturating_add(Weight::from_parts(499_256, 0).saturating_mul(r.into())) + // Standard Error: 119_682 + .saturating_add(Weight::from_parts(1_107_001, 0).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -108,10 +108,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn bootstrap_contribute () -> Weight { // Proof Size summary in bytes: - // Measured: `671` - // Estimated: `52635` - // Minimum execution time: 185_711_000 picoseconds. - Weight::from_parts(199_156_000, 52635) + // Measured: `941` + // Estimated: `30497` + // Minimum execution time: 153_948_000 picoseconds. + Weight::from_parts(156_744_000, 30497) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -131,10 +131,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: DexGeneral BootstrapRewards (max_values: None, max_size: Some(27032), added: 29507, mode: MaxEncodedLen) fn bootstrap_claim () -> Weight { // Proof Size summary in bytes: - // Measured: `1231` - // Estimated: `54598` - // Minimum execution time: 169_864_000 picoseconds. - Weight::from_parts(181_561_000, 54598) + // Measured: `1486` + // Estimated: `30497` + // Minimum execution time: 131_704_000 picoseconds. + Weight::from_parts(132_755_000, 30497) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -152,10 +152,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: DexGeneral BootstrapEndStatus (max_values: None, max_size: Some(163), added: 2638, mode: MaxEncodedLen) fn bootstrap_end () -> Weight { // Proof Size summary in bytes: - // Measured: `893` - // Estimated: `27264` - // Minimum execution time: 240_023_000 picoseconds. - Weight::from_parts(253_923_000, 27264) + // Measured: `1200` + // Estimated: `13940` + // Minimum execution time: 192_676_000 picoseconds. + Weight::from_parts(193_828_000, 13940) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(10_u64)) } @@ -169,14 +169,14 @@ impl dex_general::WeightInfo for WeightInfo { /// The range of component `l` is `[1, 10]`. fn bootstrap_update (r: u32, l: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `259 + r * (21 ±0)` - // Estimated: `34125` - // Minimum execution time: 57_936_000 picoseconds. - Weight::from_parts(57_288_965, 34125) - // Standard Error: 53_814 - .saturating_add(Weight::from_parts(572_652, 0).saturating_mul(r.into())) - // Standard Error: 53_814 - .saturating_add(Weight::from_parts(371_921, 0).saturating_mul(l.into())) + // Measured: `260 + r * (21 ±0)` + // Estimated: `30497` + // Minimum execution time: 46_433_000 picoseconds. + Weight::from_parts(45_194_974, 30497) + // Standard Error: 144_589 + .saturating_add(Weight::from_parts(153_960, 0).saturating_mul(r.into())) + // Standard Error: 144_589 + .saturating_add(Weight::from_parts(754_676, 0).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -190,10 +190,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn bootstrap_refund () -> Weight { // Proof Size summary in bytes: - // Measured: `1046` - // Estimated: `22138` - // Minimum execution time: 152_230_000 picoseconds. - Weight::from_parts(168_048_000, 22138) + // Measured: `1301` + // Estimated: `11350` + // Minimum execution time: 122_856_000 picoseconds. + Weight::from_parts(127_425_000, 11350) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } @@ -213,10 +213,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn add_liquidity () -> Weight { // Proof Size summary in bytes: - // Measured: `704` - // Estimated: `33222` - // Minimum execution time: 265_466_000 picoseconds. - Weight::from_parts(294_876_000, 33222) + // Measured: `974` + // Estimated: `13940` + // Minimum execution time: 213_548_000 picoseconds. + Weight::from_parts(214_830_000, 13940) .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(9_u64)) } @@ -236,10 +236,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn remove_liquidity () -> Weight { // Proof Size summary in bytes: - // Measured: `1188` - // Estimated: `33222` - // Minimum execution time: 224_704_000 picoseconds. - Weight::from_parts(228_516_000, 33222) + // Measured: `1443` + // Estimated: `13940` + // Minimum execution time: 182_185_000 picoseconds. + Weight::from_parts(183_037_000, 13940) .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -252,16 +252,16 @@ impl dex_general::WeightInfo for WeightInfo { /// The range of component `a` is `[2, 10]`. fn swap_exact_assets_for_assets (a: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `0 + a * (435 ±0)` - // Estimated: `8211 + a * (8825 ±21)` - // Minimum execution time: 161_917_000 picoseconds. - Weight::from_parts(12_273_386, 8211) - // Standard Error: 283_655 - .saturating_add(Weight::from_parts(78_807_907, 0).saturating_mul(a.into())) + // Measured: `224 + a * (459 ±0)` + // Estimated: `3628 + a * (5180 ±21)` + // Minimum execution time: 134_600_000 picoseconds. + Weight::from_parts(11_419_585, 3628) + // Standard Error: 109_224 + .saturating_add(Weight::from_parts(63_887_910, 0).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into()))) - .saturating_add(Weight::from_parts(0, 8825).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(0, 5180).saturating_mul(a.into())) } /// Storage: Tokens Accounts (r:20 w:20) /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) @@ -272,16 +272,16 @@ impl dex_general::WeightInfo for WeightInfo { /// The range of component `a` is `[2, 10]`. fn swap_assets_for_exact_assets (a: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `0 + a * (435 ±0)` - // Estimated: `8211 + a * (8825 ±0)` - // Minimum execution time: 163_640_000 picoseconds. - Weight::from_parts(14_064_501, 8211) - // Standard Error: 299_174 - .saturating_add(Weight::from_parts(79_120_950, 0).saturating_mul(a.into())) + // Measured: `224 + a * (459 ±0)` + // Estimated: `3628 + a * (5180 ±22)` + // Minimum execution time: 134_940_000 picoseconds. + Weight::from_parts(10_824_127, 3628) + // Standard Error: 93_262 + .saturating_add(Weight::from_parts(63_943_649, 0).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into()))) - .saturating_add(Weight::from_parts(0, 8825).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(0, 5180).saturating_mul(a.into())) } /// Storage: DexGeneral BootstrapRewards (r:1 w:1) /// Proof: DexGeneral BootstrapRewards (max_values: None, max_size: Some(27032), added: 29507, mode: MaxEncodedLen) @@ -292,12 +292,12 @@ impl dex_general::WeightInfo for WeightInfo { /// The range of component `r` is `[1, 10]`. fn bootstrap_charge_reward (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `376 + r * (88 ±0)` - // Estimated: `35080 + r * (5180 ±0)` - // Minimum execution time: 108_140_000 picoseconds. - Weight::from_parts(68_067_108, 35080) - // Standard Error: 227_743 - .saturating_add(Weight::from_parts(53_817_168, 0).saturating_mul(r.into())) + // Measured: `646 + r * (88 ±0)` + // Estimated: `30497 + r * (5180 ±0)` + // Minimum execution time: 92_285_000 picoseconds. + Weight::from_parts(51_599_752, 30497) + // Standard Error: 35_906 + .saturating_add(Weight::from_parts(43_455_215, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(2_u64)) @@ -308,10 +308,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: DexGeneral BootstrapRewards (max_values: None, max_size: Some(27032), added: 29507, mode: MaxEncodedLen) fn bootstrap_withdraw_reward () -> Weight { // Proof Size summary in bytes: - // Measured: `135` + // Measured: `136` // Estimated: `30497` - // Minimum execution time: 37_512_000 picoseconds. - Weight::from_parts(44_039_000, 30497) + // Minimum execution time: 29_279_000 picoseconds. + Weight::from_parts(29_900_000, 30497) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/parachain/runtime/interlay/src/weights/dex_stable.rs b/parachain/runtime/interlay/src/weights/dex_stable.rs index fd2d52d05e..633ebcfff8 100644 --- a/parachain/runtime/interlay/src/weights/dex_stable.rs +++ b/parachain/runtime/interlay/src/weights/dex_stable.rs @@ -2,17 +2,17 @@ //! Autogenerated weights for dex_stable //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-07-10, STEPS: `10`, REPEAT: `1`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: ``, CPU: `Intel(R) Core(TM) i7-6700 CPU @ 3.40GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: -// ./target/debug/interbtc-parachain +// target/release/interbtc-parachain // benchmark // pallet // --pallet -// dex-stable +// * // --extrinsic // * // --chain @@ -20,11 +20,11 @@ // --execution=wasm // --wasm-execution=compiled // --steps -// 10 +// 50 // --repeat -// 1 +// 10 // --output -// parachain/runtime/interlay/src/weights +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -52,14 +52,14 @@ impl dex_stable::WeightInfo for WeightInfo { /// The range of component `s` is `[0, 50]`. fn create_base_pool (b: u32, s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `175` + // Measured: `227` // Estimated: `4281` - // Minimum execution time: 926_937_000 picoseconds. - Weight::from_parts(892_440_860, 4281) - // Standard Error: 2_385_481 - .saturating_add(Weight::from_parts(4_499_300, 0).saturating_mul(b.into())) - // Standard Error: 411_324 - .saturating_add(Weight::from_parts(458_537, 0).saturating_mul(s.into())) + // Minimum execution time: 54_269_000 picoseconds. + Weight::from_parts(54_997_240, 4281) + // Standard Error: 17_665 + .saturating_add(Weight::from_parts(183_582, 0).saturating_mul(b.into())) + // Standard Error: 2_939 + .saturating_add(Weight::from_parts(825, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -77,16 +77,14 @@ impl dex_stable::WeightInfo for WeightInfo { /// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(35), added: 2510, mode: MaxEncodedLen) /// The range of component `m` is `[2, 10]`. /// The range of component `s` is `[0, 50]`. - fn create_meta_pool (m: u32, s: u32, ) -> Weight { + fn create_meta_pool (m: u32, _s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `1327` + // Measured: `1398` // Estimated: `7572` - // Minimum execution time: 1_499_976_000 picoseconds. - Weight::from_parts(1_481_261_840, 7572) - // Standard Error: 1_427_994 - .saturating_add(Weight::from_parts(2_331_903, 0).saturating_mul(m.into())) - // Standard Error: 246_226 - .saturating_add(Weight::from_parts(413_815, 0).saturating_mul(s.into())) + // Minimum execution time: 103_989_000 picoseconds. + Weight::from_parts(106_056_384, 7572) + // Standard Error: 27_983 + .saturating_add(Weight::from_parts(148_173, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -103,12 +101,12 @@ impl dex_stable::WeightInfo for WeightInfo { /// The range of component `b` is `[2, 10]`. fn add_liquidity (b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `955 + b * (121 ±0)` + // Measured: `1272 + b * (121 ±0)` // Estimated: `4281 + b * (5180 ±0)` - // Minimum execution time: 3_243_974_000 picoseconds. - Weight::from_parts(1_456_375_387, 4281) - // Standard Error: 1_551_618 - .saturating_add(Weight::from_parts(895_259_645, 0).saturating_mul(b.into())) + // Minimum execution time: 196_183_000 picoseconds. + Weight::from_parts(93_408_237, 4281) + // Standard Error: 1_465_469 + .saturating_add(Weight::from_parts(53_655_462, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().writes(4_u64)) @@ -125,10 +123,10 @@ impl dex_stable::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn swap () -> Weight { // Proof Size summary in bytes: - // Measured: `2108` + // Measured: `2366` // Estimated: `11350` - // Minimum execution time: 2_268_129_000 picoseconds. - Weight::from_parts(2_268_129_000, 11350) + // Minimum execution time: 155_952_000 picoseconds. + Weight::from_parts(157_205_000, 11350) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -143,12 +141,12 @@ impl dex_stable::WeightInfo for WeightInfo { /// The range of component `b` is `[2, 10]`. fn remove_liquidity (b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `1064 + b * (189 ±0)` + // Measured: `1326 + b * (189 ±0)` // Estimated: `4281 + b * (5180 ±0)` - // Minimum execution time: 2_524_661_000 picoseconds. - Weight::from_parts(1_324_272_155, 4281) - // Standard Error: 2_684_950 - .saturating_add(Weight::from_parts(601_291_454, 0).saturating_mul(b.into())) + // Minimum execution time: 152_916_000 picoseconds. + Weight::from_parts(78_803_054, 4281) + // Standard Error: 652_838 + .saturating_add(Weight::from_parts(35_960_644, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) @@ -167,10 +165,10 @@ impl dex_stable::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn remove_liquidity_one_currency () -> Weight { // Proof Size summary in bytes: - // Measured: `2179` + // Measured: `2437` // Estimated: `8760` - // Minimum execution time: 2_160_817_000 picoseconds. - Weight::from_parts(2_160_817_000, 8760) + // Minimum execution time: 178_146_000 picoseconds. + Weight::from_parts(179_620_000, 8760) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -187,12 +185,12 @@ impl dex_stable::WeightInfo for WeightInfo { /// The range of component `b` is `[2, 10]`. fn remove_liquidity_imbalance (b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `1106 + b * (189 ±0)` + // Measured: `1368 + b * (189 ±0)` // Estimated: `4281 + b * (5180 ±0)` - // Minimum execution time: 2_605_230_000 picoseconds. - Weight::from_parts(1_378_223_306, 4281) - // Standard Error: 3_145_876 - .saturating_add(Weight::from_parts(610_722_427, 0).saturating_mul(b.into())) + // Minimum execution time: 177_185_000 picoseconds. + Weight::from_parts(108_143_142, 4281) + // Standard Error: 537_782 + .saturating_add(Weight::from_parts(39_454_173, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) @@ -213,14 +211,14 @@ impl dex_stable::WeightInfo for WeightInfo { /// The range of component `m` is `[2, 10]`. fn add_pool_and_base_pool_liquidity (b: u32, m: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `1410 + b * (187 ±0) + m * (121 ±0)` + // Measured: `1708 + b * (187 ±0) + m * (117 ±0)` // Estimated: `7572 + b * (5180 ±0) + m * (5180 ±0)` - // Minimum execution time: 11_645_469_000 picoseconds. - Weight::from_parts(2_289_802_814, 7572) - // Standard Error: 4_386_612 - .saturating_add(Weight::from_parts(750_338_420, 0).saturating_mul(b.into())) - // Standard Error: 4_386_612 - .saturating_add(Weight::from_parts(918_351_372, 0).saturating_mul(m.into())) + // Minimum execution time: 699_882_000 picoseconds. + Weight::from_parts(148_335_738, 7572) + // Standard Error: 161_576 + .saturating_add(Weight::from_parts(45_050_514, 0).saturating_mul(b.into())) + // Standard Error: 161_576 + .saturating_add(Weight::from_parts(55_322_501, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(m.into()))) @@ -242,14 +240,14 @@ impl dex_stable::WeightInfo for WeightInfo { /// The range of component `m` is `[2, 10]`. fn remove_pool_and_base_pool_liquidity (b: u32, m: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `1630 + b * (187 ±0) + m * (187 ±0)` + // Measured: `1951 + b * (187 ±0) + m * (184 ±0)` // Estimated: `7572 + b * (5180 ±0) + m * (5180 ±0)` - // Minimum execution time: 9_647_145_000 picoseconds. - Weight::from_parts(2_035_313_491, 7572) - // Standard Error: 17_444_707 - .saturating_add(Weight::from_parts(636_796_544, 0).saturating_mul(b.into())) - // Standard Error: 17_444_707 - .saturating_add(Weight::from_parts(628_853_533, 0).saturating_mul(m.into())) + // Minimum execution time: 556_133_000 picoseconds. + Weight::from_parts(182_776_140, 7572) + // Standard Error: 257_496 + .saturating_add(Weight::from_parts(32_276_393, 0).saturating_mul(b.into())) + // Standard Error: 257_496 + .saturating_add(Weight::from_parts(31_958_805, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(m.into()))) @@ -271,10 +269,10 @@ impl dex_stable::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn remove_pool_and_base_pool_liquidity_one_currency () -> Weight { // Proof Size summary in bytes: - // Measured: `3983` + // Measured: `4278` // Estimated: `13940` - // Minimum execution time: 4_155_522_000 picoseconds. - Weight::from_parts(4_155_522_000, 13940) + // Minimum execution time: 350_151_000 picoseconds. + Weight::from_parts(353_107_000, 13940) .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().writes(9_u64)) } @@ -290,10 +288,10 @@ impl dex_stable::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn swap_pool_from_base () -> Weight { // Proof Size summary in bytes: - // Measured: `4250` + // Measured: `4508` // Estimated: `39840` - // Minimum execution time: 5_762_939_000 picoseconds. - Weight::from_parts(5_762_939_000, 39840) + // Minimum execution time: 422_676_000 picoseconds. + Weight::from_parts(427_075_000, 39840) .saturating_add(T::DbWeight::get().reads(20_u64)) .saturating_add(T::DbWeight::get().writes(9_u64)) } @@ -309,10 +307,10 @@ impl dex_stable::WeightInfo for WeightInfo { /// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(35), added: 2510, mode: MaxEncodedLen) fn swap_pool_to_base () -> Weight { // Proof Size summary in bytes: - // Measured: `4013` + // Measured: `4308` // Estimated: `16530` - // Minimum execution time: 4_159_755_000 picoseconds. - Weight::from_parts(4_159_755_000, 16530) + // Minimum execution time: 331_324_000 picoseconds. + Weight::from_parts(337_195_000, 16530) .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().writes(9_u64)) } @@ -326,10 +324,10 @@ impl dex_stable::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn swap_meta_pool_underlying () -> Weight { // Proof Size summary in bytes: - // Measured: `2459` + // Measured: `2680` // Estimated: `11350` - // Minimum execution time: 2_205_825_000 picoseconds. - Weight::from_parts(2_205_825_000, 11350) + // Minimum execution time: 163_748_000 picoseconds. + Weight::from_parts(164_570_000, 11350) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -339,8 +337,8 @@ impl dex_stable::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `874` // Estimated: `4281` - // Minimum execution time: 509_216_000 picoseconds. - Weight::from_parts(509_216_000, 4281) + // Minimum execution time: 32_756_000 picoseconds. + Weight::from_parts(33_778_000, 4281) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -350,8 +348,8 @@ impl dex_stable::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `874` // Estimated: `4281` - // Minimum execution time: 519_106_000 picoseconds. - Weight::from_parts(519_106_000, 4281) + // Minimum execution time: 32_465_000 picoseconds. + Weight::from_parts(33_146_000, 4281) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -361,8 +359,8 @@ impl dex_stable::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `874` // Estimated: `4281` - // Minimum execution time: 511_217_000 picoseconds. - Weight::from_parts(511_217_000, 4281) + // Minimum execution time: 32_365_000 picoseconds. + Weight::from_parts(33_006_000, 4281) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -374,8 +372,8 @@ impl dex_stable::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `968` // Estimated: `4281` - // Minimum execution time: 644_410_000 picoseconds. - Weight::from_parts(644_410_000, 4281) + // Minimum execution time: 40_401_000 picoseconds. + Weight::from_parts(41_092_000, 4281) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -387,8 +385,8 @@ impl dex_stable::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `968` // Estimated: `4281` - // Minimum execution time: 643_830_000 picoseconds. - Weight::from_parts(643_830_000, 4281) + // Minimum execution time: 40_571_000 picoseconds. + Weight::from_parts(40_812_000, 4281) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -398,10 +396,10 @@ impl dex_stable::WeightInfo for WeightInfo { /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) fn withdraw_admin_fee () -> Weight { // Proof Size summary in bytes: - // Measured: `1843` + // Measured: `2064` // Estimated: `26890` - // Minimum execution time: 2_884_467_000 picoseconds. - Weight::from_parts(2_884_467_000, 26890) + // Minimum execution time: 167_655_000 picoseconds. + Weight::from_parts(168_567_000, 26890) .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/parachain/runtime/interlay/src/weights/dex_swap_router.rs b/parachain/runtime/interlay/src/weights/dex_swap_router.rs index 4e9780d3ce..bd292ea62d 100644 --- a/parachain/runtime/interlay/src/weights/dex_swap_router.rs +++ b/parachain/runtime/interlay/src/weights/dex_swap_router.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for dex_swap_router //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -45,9 +45,9 @@ impl dex_swap_router::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 750_000 picoseconds. - Weight::from_parts(642_654, 0) - // Standard Error: 1_383 - .saturating_add(Weight::from_parts(123_062, 0).saturating_mul(a.into())) + // Minimum execution time: 631_000 picoseconds. + Weight::from_parts(545_230, 0) + // Standard Error: 725 + .saturating_add(Weight::from_parts(102_563, 0).saturating_mul(a.into())) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/escrow.rs b/parachain/runtime/interlay/src/weights/escrow.rs index 04598944d3..80ba563917 100644 --- a/parachain/runtime/interlay/src/weights/escrow.rs +++ b/parachain/runtime/interlay/src/weights/escrow.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for escrow //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -65,17 +65,21 @@ impl escrow::WeightInfo for WeightInfo { /// Storage: EscrowRewards TotalStake (r:1 w:1) /// Proof: EscrowRewards TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: EscrowRewards RewardCurrencies (r:1 w:0) - /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen) + /// Storage: EscrowRewards RewardTally (r:1 w:1) + /// Proof: EscrowRewards RewardTally (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) + /// Storage: EscrowRewards RewardPerToken (r:1 w:0) + /// Proof: EscrowRewards RewardPerToken (max_values: None, max_size: Some(59), added: 2534, mode: MaxEncodedLen) /// Storage: Escrow UserPointHistory (r:0 w:1) /// Proof: Escrow UserPointHistory (max_values: None, max_size: Some(88), added: 2563, mode: MaxEncodedLen) fn create_lock () -> Weight { // Proof Size summary in bytes: - // Measured: `540` - // Estimated: `178187` - // Minimum execution time: 517_938_000 picoseconds. - Weight::from_parts(542_454_000, 178187) - .saturating_add(T::DbWeight::get().reads(66_u64)) - .saturating_add(T::DbWeight::get().writes(62_u64)) + // Measured: `1094` + // Estimated: `136584` + // Minimum execution time: 460_452_000 picoseconds. + Weight::from_parts(464_921_000, 136584) + .saturating_add(T::DbWeight::get().reads(68_u64)) + .saturating_add(T::DbWeight::get().writes(63_u64)) } /// Storage: Escrow Locked (r:1 w:1) /// Proof: Escrow Locked (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen) @@ -100,17 +104,21 @@ impl escrow::WeightInfo for WeightInfo { /// Storage: EscrowRewards TotalStake (r:1 w:1) /// Proof: EscrowRewards TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: EscrowRewards RewardCurrencies (r:1 w:0) - /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen) + /// Storage: EscrowRewards RewardTally (r:1 w:1) + /// Proof: EscrowRewards RewardTally (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) + /// Storage: EscrowRewards RewardPerToken (r:1 w:0) + /// Proof: EscrowRewards RewardPerToken (max_values: None, max_size: Some(59), added: 2534, mode: MaxEncodedLen) /// Storage: Escrow UserPointHistory (r:0 w:1) /// Proof: Escrow UserPointHistory (max_values: None, max_size: Some(88), added: 2563, mode: MaxEncodedLen) fn increase_amount () -> Weight { // Proof Size summary in bytes: - // Measured: `1273` - // Estimated: `41511` - // Minimum execution time: 227_462_000 picoseconds. - Weight::from_parts(242_306_000, 41511) - .saturating_add(T::DbWeight::get().reads(12_u64)) - .saturating_add(T::DbWeight::get().writes(10_u64)) + // Measured: `1683` + // Estimated: `4733` + // Minimum execution time: 205_251_000 picoseconds. + Weight::from_parts(206_143_000, 4733) + .saturating_add(T::DbWeight::get().reads(14_u64)) + .saturating_add(T::DbWeight::get().writes(11_u64)) } /// Storage: Escrow Locked (r:1 w:1) /// Proof: Escrow Locked (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen) @@ -135,17 +143,21 @@ impl escrow::WeightInfo for WeightInfo { /// Storage: EscrowRewards TotalStake (r:1 w:1) /// Proof: EscrowRewards TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: EscrowRewards RewardCurrencies (r:1 w:0) - /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen) + /// Storage: EscrowRewards RewardTally (r:1 w:1) + /// Proof: EscrowRewards RewardTally (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) + /// Storage: EscrowRewards RewardPerToken (r:1 w:0) + /// Proof: EscrowRewards RewardPerToken (max_values: None, max_size: Some(59), added: 2534, mode: MaxEncodedLen) /// Storage: Escrow UserPointHistory (r:0 w:1) /// Proof: Escrow UserPointHistory (max_values: None, max_size: Some(88), added: 2563, mode: MaxEncodedLen) fn increase_unlock_height () -> Weight { // Proof Size summary in bytes: - // Measured: `1273` - // Estimated: `523623` - // Minimum execution time: 1_447_368_000 picoseconds. - Weight::from_parts(1_499_422_000, 523623) - .saturating_add(T::DbWeight::get().reads(204_u64)) - .saturating_add(T::DbWeight::get().writes(201_u64)) + // Measured: `1683` + // Estimated: `485613` + // Minimum execution time: 1_203_991_000 picoseconds. + Weight::from_parts(1_215_614_000, 485613) + .saturating_add(T::DbWeight::get().reads(206_u64)) + .saturating_add(T::DbWeight::get().writes(202_u64)) } /// Storage: Escrow Locked (r:1 w:1) /// Proof: Escrow Locked (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen) @@ -154,7 +166,11 @@ impl escrow::WeightInfo for WeightInfo { /// Storage: EscrowRewards TotalStake (r:1 w:1) /// Proof: EscrowRewards TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: EscrowRewards RewardCurrencies (r:1 w:0) - /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen) + /// Storage: EscrowRewards RewardTally (r:1 w:1) + /// Proof: EscrowRewards RewardTally (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) + /// Storage: EscrowRewards RewardPerToken (r:1 w:0) + /// Proof: EscrowRewards RewardPerToken (max_values: None, max_size: Some(59), added: 2534, mode: MaxEncodedLen) /// Storage: Escrow SlopeChanges (r:193 w:0) /// Proof: Escrow SlopeChanges (max_values: None, max_size: Some(36), added: 2511, mode: MaxEncodedLen) /// Storage: Escrow Epoch (r:1 w:1) @@ -173,15 +189,33 @@ impl escrow::WeightInfo for WeightInfo { /// Proof: Escrow UserPointHistory (max_values: None, max_size: Some(88), added: 2563, mode: MaxEncodedLen) fn withdraw () -> Weight { // Proof Size summary in bytes: - // Measured: `1455` - // Estimated: `523734` - // Minimum execution time: 1_474_654_000 picoseconds. - Weight::from_parts(1_503_680_000, 523734) - .saturating_add(T::DbWeight::get().reads(204_u64)) - .saturating_add(T::DbWeight::get().writes(203_u64)) + // Measured: `1902` + // Estimated: `485613` + // Minimum execution time: 1_187_508_000 picoseconds. + Weight::from_parts(1_208_961_000, 485613) + .saturating_add(T::DbWeight::get().reads(206_u64)) + .saturating_add(T::DbWeight::get().writes(204_u64)) + } + /// Storage: Escrow Limits (r:0 w:1) + /// Proof: Escrow Limits (max_values: None, max_size: Some(56), added: 2531, mode: MaxEncodedLen) + fn set_account_limit () -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 10_060_000 picoseconds. + Weight::from_parts(10_421_000, 0) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: Escrow Blocks (r:0 w:1) + /// Proof: Escrow Blocks (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen) + fn set_account_block () -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 10_020_000 picoseconds. + Weight::from_parts(10_881_000, 0) + .saturating_add(T::DbWeight::get().writes(1_u64)) } - /// Storage: EscrowRewards Stake (r:1 w:1) - /// Proof: EscrowRewards Stake (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) /// Storage: Escrow Locked (r:1 w:1) /// Proof: Escrow Locked (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen) /// Storage: Tokens Accounts (r:1 w:1) @@ -192,49 +226,29 @@ impl escrow::WeightInfo for WeightInfo { /// Proof: Escrow Limits (max_values: None, max_size: Some(56), added: 2531, mode: MaxEncodedLen) /// Storage: Tokens Locks (r:1 w:1) /// Proof: Tokens Locks (max_values: None, max_size: Some(1268), added: 3743, mode: MaxEncodedLen) - /// Storage: Escrow SlopeChanges (r:96 w:1) + /// Storage: Escrow SlopeChanges (r:192 w:1) /// Proof: Escrow SlopeChanges (max_values: None, max_size: Some(36), added: 2511, mode: MaxEncodedLen) /// Storage: Escrow Epoch (r:1 w:1) /// Proof: Escrow Epoch (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) - /// Storage: Escrow PointHistory (r:1 w:95) + /// Storage: Escrow PointHistory (r:1 w:191) /// Proof: Escrow PointHistory (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen) /// Storage: Escrow UserPointEpoch (r:1 w:1) /// Proof: Escrow UserPointEpoch (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen) + /// Storage: EscrowRewards Stake (r:1 w:1) + /// Proof: EscrowRewards Stake (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) /// Storage: EscrowRewards TotalStake (r:1 w:1) /// Proof: EscrowRewards TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: EscrowRewards RewardCurrencies (r:1 w:0) - /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) - /// Storage: Escrow ThresholdPercentage (r:1 w:0) - /// Proof: Escrow ThresholdPercentage (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) + /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen) /// Storage: Escrow UserPointHistory (r:0 w:1) /// Proof: Escrow UserPointHistory (max_values: None, max_size: Some(88), added: 2563, mode: MaxEncodedLen) fn update_user_stake () -> Weight { // Proof Size summary in bytes: - // Measured: `1273` - // Estimated: `281542` - // Minimum execution time: 359_000_000 picoseconds. - Weight::from_parts(363_000_000, 281542) - .saturating_add(T::DbWeight::get().reads(108_u64)) - .saturating_add(T::DbWeight::get().writes(104_u64)) - } - - fn set_account_limit () -> Weight { - // Proof Size summary in bytes: - // Measured: `1273` - // Estimated: `281542` - // Minimum execution time: 359_000_000 picoseconds. - Weight::from_parts(363_000_000, 281542) - .saturating_add(T::DbWeight::get().reads(108_u64)) - .saturating_add(T::DbWeight::get().writes(104_u64)) - } - - fn set_account_block () -> Weight { - // Proof Size summary in bytes: - // Measured: `1273` - // Estimated: `281542` - // Minimum execution time: 359_000_000 picoseconds. - Weight::from_parts(363_000_000, 281542) - .saturating_add(T::DbWeight::get().reads(108_u64)) - .saturating_add(T::DbWeight::get().writes(104_u64)) + // Measured: `1490` + // Estimated: `483102` + // Minimum execution time: 1_173_299_000 picoseconds. + Weight::from_parts(1_186_816_000, 483102) + .saturating_add(T::DbWeight::get().reads(203_u64)) + .saturating_add(T::DbWeight::get().writes(200_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/farming.rs b/parachain/runtime/interlay/src/weights/farming.rs index a9cc2be95b..9a4cebd139 100644 --- a/parachain/runtime/interlay/src/weights/farming.rs +++ b/parachain/runtime/interlay/src/weights/farming.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for farming //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -47,15 +47,15 @@ impl farming::WeightInfo for WeightInfo { /// The range of component `c` is `[1, 4]`. fn on_initialize (c: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `189 + c * (41 ±0)` - // Estimated: `6342 + c * (3717 ±0)` - // Minimum execution time: 36_335_000 picoseconds. - Weight::from_parts(26_116_063, 6342) - // Standard Error: 179_842 - .saturating_add(Weight::from_parts(13_707_478, 0).saturating_mul(c.into())) + // Measured: `208 + c * (41 ±0)` + // Estimated: `3539 + c * (2549 ±45)` + // Minimum execution time: 29_038_000 picoseconds. + Weight::from_parts(25_341_704, 3539) + // Standard Error: 136_097 + .saturating_add(Weight::from_parts(9_901_018, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into()))) - .saturating_add(Weight::from_parts(0, 3717).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 2549).saturating_mul(c.into())) } /// Storage: Tokens Accounts (r:2 w:2) /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) @@ -65,10 +65,10 @@ impl farming::WeightInfo for WeightInfo { /// Proof: Farming RewardSchedules (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen) fn update_reward_schedule () -> Weight { // Proof Size summary in bytes: - // Measured: `435` - // Estimated: `13302` - // Minimum execution time: 110_632_000 picoseconds. - Weight::from_parts(119_448_000, 13302) + // Measured: `847` + // Estimated: `6170` + // Minimum execution time: 96_002_000 picoseconds. + Weight::from_parts(98_848_000, 6170) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -80,10 +80,10 @@ impl farming::WeightInfo for WeightInfo { /// Proof: Farming RewardSchedules (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen) fn remove_reward_schedule () -> Weight { // Proof Size summary in bytes: - // Measured: `582` - // Estimated: `9763` - // Minimum execution time: 93_051_000 picoseconds. - Weight::from_parts(98_659_000, 9763) + // Measured: `945` + // Estimated: `6170` + // Minimum execution time: 76_924_000 picoseconds. + Weight::from_parts(78_778_000, 6170) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -102,17 +102,17 @@ impl farming::WeightInfo for WeightInfo { /// The range of component `c` is `[1, 4]`. fn deposit (c: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `683 + c * (70 ±0)` - // Estimated: `16211 + c * (5122 ±0)` - // Minimum execution time: 115_386_000 picoseconds. - Weight::from_parts(106_834_770, 16211) - // Standard Error: 328_359 - .saturating_add(Weight::from_parts(16_898_888, 0).saturating_mul(c.into())) + // Measured: `900 + c * (70 ±0)` + // Estimated: `3603 + c * (2577 ±0)` + // Minimum execution time: 92_525_000 picoseconds. + Weight::from_parts(83_566_332, 3603) + // Standard Error: 141_739 + .saturating_add(Weight::from_parts(12_357_123, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into()))) - .saturating_add(Weight::from_parts(0, 5122).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 2577).saturating_mul(c.into())) } /// Storage: FarmingRewards RewardCurrencies (r:1 w:0) /// Proof: FarmingRewards RewardCurrencies (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) @@ -129,17 +129,17 @@ impl farming::WeightInfo for WeightInfo { /// The range of component `c` is `[1, 4]`. fn withdraw (c: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `683 + c * (70 ±0)` - // Estimated: `16211 + c * (5122 ±0)` - // Minimum execution time: 105_950_000 picoseconds. - Weight::from_parts(94_600_423, 16211) - // Standard Error: 308_218 - .saturating_add(Weight::from_parts(18_457_333, 0).saturating_mul(c.into())) + // Measured: `900 + c * (70 ±0)` + // Estimated: `3603 + c * (2577 ±0)` + // Minimum execution time: 85_000_000 picoseconds. + Weight::from_parts(74_727_024, 3603) + // Standard Error: 76_360 + .saturating_add(Weight::from_parts(12_445_425, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into()))) - .saturating_add(Weight::from_parts(0, 5122).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 2577).saturating_mul(c.into())) } /// Storage: FarmingRewards Stake (r:1 w:0) /// Proof: FarmingRewards Stake (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen) @@ -155,10 +155,10 @@ impl farming::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn claim () -> Weight { // Proof Size summary in bytes: - // Measured: `956` - // Estimated: `23913` - // Minimum execution time: 153_216_000 picoseconds. - Weight::from_parts(177_650_000, 23913) + // Measured: `1318` + // Estimated: `6170` + // Minimum execution time: 126_974_000 picoseconds. + Weight::from_parts(128_337_000, 6170) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } diff --git a/parachain/runtime/interlay/src/weights/fee.rs b/parachain/runtime/interlay/src/weights/fee.rs index 61c21fbb75..2ecdd22440 100644 --- a/parachain/runtime/interlay/src/weights/fee.rs +++ b/parachain/runtime/interlay/src/weights/fee.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for fee //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -51,7 +51,7 @@ impl fee::WeightInfo for WeightInfo { /// Storage: VaultRewards TotalStake (r:1 w:0) /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultRewards RewardCurrencies (r:1 w:1) - /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) + /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(50), added: 2525, mode: MaxEncodedLen) /// Storage: VaultRewards RewardPerToken (r:2 w:2) /// Proof: VaultRewards RewardPerToken (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen) /// Storage: VaultRewards TotalRewards (r:2 w:2) @@ -86,10 +86,10 @@ impl fee::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn withdraw_rewards () -> Weight { // Proof Size summary in bytes: - // Measured: `2602` - // Estimated: `111780` - // Minimum execution time: 725_934_000 picoseconds. - Weight::from_parts(754_520_000, 111780) + // Measured: `2962` + // Estimated: `11350` + // Minimum execution time: 584_140_000 picoseconds. + Weight::from_parts(593_319_000, 11350) .saturating_add(T::DbWeight::get().reads(35_u64)) .saturating_add(T::DbWeight::get().writes(25_u64)) } @@ -99,8 +99,8 @@ impl fee::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_847_000 picoseconds. - Weight::from_parts(11_946_000, 0) + // Minimum execution time: 8_197_000 picoseconds. + Weight::from_parts(8_557_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Fee IssueGriefingCollateral (r:0 w:1) @@ -109,8 +109,8 @@ impl fee::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_919_000 picoseconds. - Weight::from_parts(12_024_000, 0) + // Minimum execution time: 8_416_000 picoseconds. + Weight::from_parts(8_627_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Fee RedeemFee (r:0 w:1) @@ -119,8 +119,8 @@ impl fee::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_758_000 picoseconds. - Weight::from_parts(11_619_000, 0) + // Minimum execution time: 8_397_000 picoseconds. + Weight::from_parts(8_597_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Fee PremiumRedeemFee (r:0 w:1) @@ -129,8 +129,8 @@ impl fee::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 11_103_000 picoseconds. - Weight::from_parts(11_590_000, 0) + // Minimum execution time: 8_166_000 picoseconds. + Weight::from_parts(8_507_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Fee PunishmentFee (r:0 w:1) @@ -139,8 +139,8 @@ impl fee::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_727_000 picoseconds. - Weight::from_parts(11_291_000, 0) + // Minimum execution time: 8_317_000 picoseconds. + Weight::from_parts(8_537_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Fee ReplaceGriefingCollateral (r:0 w:1) @@ -149,18 +149,21 @@ impl fee::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 11_007_000 picoseconds. - Weight::from_parts(11_284_000, 0) + // Minimum execution time: 8_227_000 picoseconds. + Weight::from_parts(8_527_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } + /// Storage: Nomination Vaults (r:1 w:0) + /// Proof: Nomination Vaults (max_values: None, max_size: Some(71), added: 2546, mode: MaxEncodedLen) /// Storage: Fee Commission (r:0 w:1) /// Proof: Fee Commission (max_values: None, max_size: Some(86), added: 2561, mode: MaxEncodedLen) fn set_commission () -> Weight { // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 13_816_000 picoseconds. - Weight::from_parts(14_511_000, 0) + // Measured: `167` + // Estimated: `3536` + // Minimum execution time: 18_618_000 picoseconds. + Weight::from_parts(18_778_000, 3536) + .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/frame_system.rs b/parachain/runtime/interlay/src/weights/frame_system.rs index 60100f3150..7d467eb326 100644 --- a/parachain/runtime/interlay/src/weights/frame_system.rs +++ b/parachain/runtime/interlay/src/weights/frame_system.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for frame_system //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -45,20 +45,20 @@ impl frame_system::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 6_319_000 picoseconds. - Weight::from_parts(6_568_000, 0) - // Standard Error: 1 - .saturating_add(Weight::from_parts(664, 0).saturating_mul(b.into())) + // Minimum execution time: 4_790_000 picoseconds. + Weight::from_parts(4_890_000, 0) + // Standard Error: 3 + .saturating_add(Weight::from_parts(373, 0).saturating_mul(b.into())) } /// The range of component `b` is `[0, 3932160]`. fn remark_with_event (b: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 19_331_000 picoseconds. - Weight::from_parts(19_762_000, 0) - // Standard Error: 4 - .saturating_add(Weight::from_parts(2_733, 0).saturating_mul(b.into())) + // Minimum execution time: 14_970_000 picoseconds. + Weight::from_parts(15_040_000, 0) + // Standard Error: 3 + .saturating_add(Weight::from_parts(1_626, 0).saturating_mul(b.into())) } /// Storage: System Digest (r:1 w:1) /// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured) @@ -68,8 +68,8 @@ impl frame_system::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `1485` - // Minimum execution time: 11_267_000 picoseconds. - Weight::from_parts(12_100_000, 1485) + // Minimum execution time: 8_798_000 picoseconds. + Weight::from_parts(8_948_000, 1485) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -80,10 +80,10 @@ impl frame_system::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 5_884_000 picoseconds. - Weight::from_parts(6_165_000, 0) - // Standard Error: 4_263 - .saturating_add(Weight::from_parts(1_634_009, 0).saturating_mul(i.into())) + // Minimum execution time: 4_579_000 picoseconds. + Weight::from_parts(4_600_000, 0) + // Standard Error: 10_040 + .saturating_add(Weight::from_parts(1_289_257, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) } /// Storage: Skipped Metadata (r:0 w:0) @@ -93,10 +93,10 @@ impl frame_system::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 6_302_000 picoseconds. - Weight::from_parts(6_515_000, 0) - // Standard Error: 2_428 - .saturating_add(Weight::from_parts(1_156_128, 0).saturating_mul(i.into())) + // Minimum execution time: 4_680_000 picoseconds. + Weight::from_parts(4_790_000, 0) + // Standard Error: 1_261 + .saturating_add(Weight::from_parts(863_163, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) } /// Storage: Skipped Metadata (r:0 w:0) @@ -104,14 +104,28 @@ impl frame_system::WeightInfo for WeightInfo { /// The range of component `p` is `[0, 1000]`. fn kill_prefix (p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `98 + p * (69 ±0)` - // Estimated: `94 + p * (70 ±0)` - // Minimum execution time: 11_057_000 picoseconds. - Weight::from_parts(11_323_000, 94) - // Standard Error: 6_736 - .saturating_add(Weight::from_parts(2_206_268, 0).saturating_mul(p.into())) + // Measured: `124 + p * (69 ±0)` + // Estimated: `111 + p * (70 ±0)` + // Minimum execution time: 8_637_000 picoseconds. + Weight::from_parts(8_697_000, 111) + // Standard Error: 14_450 + .saturating_add(Weight::from_parts(1_539_477, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into()))) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into()))) .saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into())) } + /// Storage: System Digest (r:1 w:1) + /// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: unknown `0x3a636f6465` (r:0 w:1) + /// Proof Skipped: unknown `0x3a636f6465` (r:0 w:1) + fn set_code() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `1485` + // Minimum execution time: 93_052_017_000 picoseconds. + Weight::from_parts(98_271_042_000, 0) + .saturating_add(Weight::from_parts(0, 1485)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(2)) + } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/issue.rs b/parachain/runtime/interlay/src/weights/issue.rs index 87c20c94e2..fa72cf8d1c 100644 --- a/parachain/runtime/interlay/src/weights/issue.rs +++ b/parachain/runtime/interlay/src/weights/issue.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for issue //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -48,8 +48,6 @@ impl issue::WeightInfo for WeightInfo { /// Proof: BTCRelay BestBlockHeight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) /// Storage: VaultRegistry Vaults (r:1 w:1) /// Proof: VaultRegistry Vaults (max_values: None, max_size: Some(260), added: 2735, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:2 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: Fee IssueGriefingCollateral (r:1 w:0) @@ -80,11 +78,11 @@ impl issue::WeightInfo for WeightInfo { /// Proof: Issue IssueRequests (max_values: None, max_size: Some(272), added: 2747, mode: MaxEncodedLen) fn request_issue () -> Weight { // Proof Size summary in bytes: - // Measured: `2448` - // Estimated: `43976` - // Minimum execution time: 793_321_000 picoseconds. - Weight::from_parts(830_560_000, 43976) - .saturating_add(T::DbWeight::get().reads(19_u64)) + // Measured: `2681` + // Estimated: `6028` + // Minimum execution time: 556_004_000 picoseconds. + Weight::from_parts(558_989_000, 6028) + .saturating_add(T::DbWeight::get().reads(18_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } /// Storage: Issue IssueRequests (r:1 w:1) @@ -117,16 +115,16 @@ impl issue::WeightInfo for WeightInfo { /// The range of component `b` is `[770, 2048]`. fn execute_issue_exact (h: u32, i: u32, _o: u32, b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `2196` - // Estimated: `32731` - // Minimum execution time: 253_839_000 picoseconds. - Weight::from_parts(238_170_932, 32731) - // Standard Error: 162_987 - .saturating_add(Weight::from_parts(6_743_495, 0).saturating_mul(h.into())) - // Standard Error: 146_867 - .saturating_add(Weight::from_parts(713_195, 0).saturating_mul(i.into())) - // Standard Error: 1_053 - .saturating_add(Weight::from_parts(4_907, 0).saturating_mul(b.into())) + // Measured: `2434` + // Estimated: `3737` + // Minimum execution time: 195_191_000 picoseconds. + Weight::from_parts(33_956_966, 3737) + // Standard Error: 810_295 + .saturating_add(Weight::from_parts(10_187_551, 0).saturating_mul(h.into())) + // Standard Error: 730_159 + .saturating_add(Weight::from_parts(7_188_076, 0).saturating_mul(i.into())) + // Standard Error: 5_239 + .saturating_add(Weight::from_parts(34_842, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -150,8 +148,6 @@ impl issue::WeightInfo for WeightInfo { /// Proof: VaultRegistry Vaults (max_values: None, max_size: Some(260), added: 2735, mode: MaxEncodedLen) /// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0) /// Proof: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: VaultStaking Nonce (r:1 w:0) @@ -170,19 +166,15 @@ impl issue::WeightInfo for WeightInfo { /// The range of component `i` is `[1, 10]`. /// The range of component `o` is `[1, 10]`. /// The range of component `b` is `[770, 2048]`. - fn execute_issue_overpayment (h: u32, i: u32, _o: u32, b: u32, ) -> Weight { + fn execute_issue_overpayment (h: u32, _i: u32, _o: u32, _b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `2981` - // Estimated: `49856` - // Minimum execution time: 394_807_000 picoseconds. - Weight::from_parts(386_179_800, 49856) - // Standard Error: 202_009 - .saturating_add(Weight::from_parts(7_026_149, 0).saturating_mul(h.into())) - // Standard Error: 182_030 - .saturating_add(Weight::from_parts(953_910, 0).saturating_mul(i.into())) - // Standard Error: 1_306 - .saturating_add(Weight::from_parts(6_647, 0).saturating_mul(b.into())) - .saturating_add(T::DbWeight::get().reads(18_u64)) + // Measured: `3248` + // Estimated: `3737` + // Minimum execution time: 313_197_000 picoseconds. + Weight::from_parts(676_783_389, 3737) + // Standard Error: 967_719 + .saturating_add(Weight::from_parts(1_294_288, 0).saturating_mul(h.into())) + .saturating_add(T::DbWeight::get().reads(17_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } /// Storage: Issue IssueRequests (r:1 w:1) @@ -215,16 +207,18 @@ impl issue::WeightInfo for WeightInfo { /// The range of component `i` is `[1, 10]`. /// The range of component `o` is `[1, 10]`. /// The range of component `b` is `[770, 2048]`. - fn execute_issue_underpayment (h: u32, _i: u32, _o: u32, b: u32, ) -> Weight { + fn execute_issue_underpayment (h: u32, _i: u32, o: u32, b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `2449` - // Estimated: `34232` - // Minimum execution time: 304_453_000 picoseconds. - Weight::from_parts(303_918_897, 34232) - // Standard Error: 203_963 - .saturating_add(Weight::from_parts(6_645_260, 0).saturating_mul(h.into())) - // Standard Error: 1_318 - .saturating_add(Weight::from_parts(11_871, 0).saturating_mul(b.into())) + // Measured: `2739` + // Estimated: `3737` + // Minimum execution time: 231_854_000 picoseconds. + Weight::from_parts(253_010_791, 3737) + // Standard Error: 189_488 + .saturating_add(Weight::from_parts(3_800_800, 0).saturating_mul(h.into())) + // Standard Error: 170_748 + .saturating_add(Weight::from_parts(167_716, 0).saturating_mul(o.into())) + // Standard Error: 1_225 + .saturating_add(Weight::from_parts(6_220, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -258,18 +252,18 @@ impl issue::WeightInfo for WeightInfo { /// The range of component `b` is `[770, 2048]`. fn execute_expired_issue_exact (h: u32, i: u32, o: u32, b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `3049 + h * (5 ±0)` - // Estimated: `32731` - // Minimum execution time: 313_054_000 picoseconds. - Weight::from_parts(295_805_854, 32731) - // Standard Error: 129_240 - .saturating_add(Weight::from_parts(2_881_946, 0).saturating_mul(h.into())) - // Standard Error: 116_458 - .saturating_add(Weight::from_parts(1_843_101, 0).saturating_mul(i.into())) - // Standard Error: 116_458 - .saturating_add(Weight::from_parts(387_074, 0).saturating_mul(o.into())) - // Standard Error: 835 - .saturating_add(Weight::from_parts(6_697, 0).saturating_mul(b.into())) + // Measured: `3363` + // Estimated: `3737` + // Minimum execution time: 201_924_000 picoseconds. + Weight::from_parts(139_929_561, 3737) + // Standard Error: 194_156 + .saturating_add(Weight::from_parts(3_652_125, 0).saturating_mul(h.into())) + // Standard Error: 174_955 + .saturating_add(Weight::from_parts(1_547_829, 0).saturating_mul(i.into())) + // Standard Error: 174_955 + .saturating_add(Weight::from_parts(1_815_584, 0).saturating_mul(o.into())) + // Standard Error: 1_255 + .saturating_add(Weight::from_parts(16_572, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -293,8 +287,6 @@ impl issue::WeightInfo for WeightInfo { /// Proof: VaultRegistry Vaults (max_values: None, max_size: Some(260), added: 2735, mode: MaxEncodedLen) /// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0) /// Proof: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: VaultStaking Nonce (r:1 w:0) @@ -315,19 +307,19 @@ impl issue::WeightInfo for WeightInfo { /// The range of component `b` is `[770, 2048]`. fn execute_expired_issue_overpayment (h: u32, i: u32, o: u32, b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `3880 + i * (9 ±0)` - // Estimated: `49856` - // Minimum execution time: 481_400_000 picoseconds. - Weight::from_parts(476_689_233, 49856) - // Standard Error: 146_120 - .saturating_add(Weight::from_parts(2_172_716, 0).saturating_mul(h.into())) - // Standard Error: 131_669 - .saturating_add(Weight::from_parts(1_635_167, 0).saturating_mul(i.into())) - // Standard Error: 131_669 - .saturating_add(Weight::from_parts(127_055, 0).saturating_mul(o.into())) - // Standard Error: 944 - .saturating_add(Weight::from_parts(8_816, 0).saturating_mul(b.into())) - .saturating_add(T::DbWeight::get().reads(18_u64)) + // Measured: `3947 + h * (1 ±0) + i * (1 ±0)` + // Estimated: `3737` + // Minimum execution time: 319_510_000 picoseconds. + Weight::from_parts(297_484_836, 3737) + // Standard Error: 93_915 + .saturating_add(Weight::from_parts(3_775_028, 0).saturating_mul(h.into())) + // Standard Error: 84_627 + .saturating_add(Weight::from_parts(1_330_041, 0).saturating_mul(i.into())) + // Standard Error: 84_627 + .saturating_add(Weight::from_parts(179_165, 0).saturating_mul(o.into())) + // Standard Error: 607 + .saturating_add(Weight::from_parts(2_628, 0).saturating_mul(b.into())) + .saturating_add(T::DbWeight::get().reads(17_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } /// Storage: Issue IssueRequests (r:1 w:1) @@ -360,20 +352,18 @@ impl issue::WeightInfo for WeightInfo { /// The range of component `i` is `[1, 10]`. /// The range of component `o` is `[1, 10]`. /// The range of component `b` is `[770, 2048]`. - fn execute_expired_issue_underpayment (h: u32, i: u32, o: u32, b: u32, ) -> Weight { + fn execute_expired_issue_underpayment (h: u32, i: u32, _o: u32, b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `3081 + h * (9 ±0) + i * (9 ±0)` - // Estimated: `34232` - // Minimum execution time: 368_871_000 picoseconds. - Weight::from_parts(356_306_647, 34232) - // Standard Error: 129_172 - .saturating_add(Weight::from_parts(3_241_308, 0).saturating_mul(h.into())) - // Standard Error: 116_397 - .saturating_add(Weight::from_parts(1_683_073, 0).saturating_mul(i.into())) - // Standard Error: 116_397 - .saturating_add(Weight::from_parts(494_875, 0).saturating_mul(o.into())) - // Standard Error: 835 - .saturating_add(Weight::from_parts(1_689, 0).saturating_mul(b.into())) + // Measured: `3653` + // Estimated: `3737` + // Minimum execution time: 241_423_000 picoseconds. + Weight::from_parts(228_353_888, 3737) + // Standard Error: 69_658 + .saturating_add(Weight::from_parts(3_202_457, 0).saturating_mul(h.into())) + // Standard Error: 62_769 + .saturating_add(Weight::from_parts(689_283, 0).saturating_mul(i.into())) + // Standard Error: 450 + .saturating_add(Weight::from_parts(3_239, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -389,10 +379,10 @@ impl issue::WeightInfo for WeightInfo { /// Proof: VaultRegistry Vaults (max_values: None, max_size: Some(260), added: 2735, mode: MaxEncodedLen) fn cancel_issue () -> Weight { // Proof Size summary in bytes: - // Measured: `1496` - // Estimated: `11929` - // Minimum execution time: 163_665_000 picoseconds. - Weight::from_parts(168_254_000, 11929) + // Measured: `1495` + // Estimated: `3737` + // Minimum execution time: 89_729_000 picoseconds. + Weight::from_parts(90_551_000, 3737) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -402,8 +392,8 @@ impl issue::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 22_381_000 picoseconds. - Weight::from_parts(23_208_000, 0) + // Minimum execution time: 17_425_000 picoseconds. + Weight::from_parts(17_906_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/loans.rs b/parachain/runtime/interlay/src/weights/loans.rs index c771e197ee..3ba00f5f52 100644 --- a/parachain/runtime/interlay/src/weights/loans.rs +++ b/parachain/runtime/interlay/src/weights/loans.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for loans //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -53,9 +53,9 @@ impl loans::WeightInfo for WeightInfo { fn add_market () -> Weight { // Proof Size summary in bytes: // Measured: `78` - // Estimated: `11264` - // Minimum execution time: 66_757_000 picoseconds. - Weight::from_parts(68_266_000, 11264) + // Estimated: `6260` + // Minimum execution time: 54_068_000 picoseconds. + Weight::from_parts(54_850_000, 6260) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -65,8 +65,8 @@ impl loans::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `343` // Estimated: `3625` - // Minimum execution time: 34_647_000 picoseconds. - Weight::from_parts(35_575_000, 3625) + // Minimum execution time: 26_934_000 picoseconds. + Weight::from_parts(27_294_000, 3625) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -76,8 +76,8 @@ impl loans::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `343` // Estimated: `3625` - // Minimum execution time: 36_279_000 picoseconds. - Weight::from_parts(37_274_000, 3625) + // Minimum execution time: 28_397_000 picoseconds. + Weight::from_parts(28_928_000, 3625) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -87,8 +87,8 @@ impl loans::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `343` // Estimated: `3625` - // Minimum execution time: 41_125_000 picoseconds. - Weight::from_parts(42_050_000, 3625) + // Minimum execution time: 32_044_000 picoseconds. + Weight::from_parts(32_375_000, 3625) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -99,9 +99,9 @@ impl loans::WeightInfo for WeightInfo { fn force_update_market () -> Weight { // Proof Size summary in bytes: // Measured: `354` - // Estimated: `7128` - // Minimum execution time: 49_595_000 picoseconds. - Weight::from_parts(50_686_000, 7128) + // Estimated: `3625` + // Minimum execution time: 39_699_000 picoseconds. + Weight::from_parts(40_140_000, 3625) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -111,10 +111,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn add_reward () -> Weight { // Proof Size summary in bytes: - // Measured: `490` - // Estimated: `9763` - // Minimum execution time: 96_884_000 picoseconds. - Weight::from_parts(100_894_000, 9763) + // Measured: `821` + // Estimated: `6170` + // Minimum execution time: 84_590_000 picoseconds. + Weight::from_parts(85_742_000, 6170) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -131,9 +131,9 @@ impl loans::WeightInfo for WeightInfo { fn update_market_reward_speed () -> Weight { // Proof Size summary in bytes: // Measured: `357` - // Estimated: `20300` - // Minimum execution time: 80_096_000 picoseconds. - Weight::from_parts(81_809_000, 20300) + // Estimated: `6260` + // Minimum execution time: 63_608_000 picoseconds. + Weight::from_parts(64_559_000, 6260) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -167,10 +167,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn claim_reward () -> Weight { // Proof Size summary in bytes: - // Measured: `1808` - // Estimated: `57382` - // Minimum execution time: 258_950_000 picoseconds. - Weight::from_parts(273_492_000, 57382) + // Measured: `2066` + // Estimated: `8760` + // Minimum execution time: 205_252_000 picoseconds. + Weight::from_parts(210_712_000, 8760) .saturating_add(T::DbWeight::get().reads(17_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -204,10 +204,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn claim_reward_for_market () -> Weight { // Proof Size summary in bytes: - // Measured: `1808` - // Estimated: `54747` - // Minimum execution time: 247_768_000 picoseconds. - Weight::from_parts(258_615_000, 54747) + // Measured: `2066` + // Estimated: `8760` + // Minimum execution time: 195_301_000 picoseconds. + Weight::from_parts(198_498_000, 8760) .saturating_add(T::DbWeight::get().reads(16_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -243,10 +243,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans AccountDeposits (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) fn mint () -> Weight { // Proof Size summary in bytes: - // Measured: `1188` - // Estimated: `56787` - // Minimum execution time: 347_068_000 picoseconds. - Weight::from_parts(381_814_000, 56787) + // Measured: `1481` + // Estimated: `8760` + // Minimum execution time: 281_373_000 picoseconds. + Weight::from_parts(283_498_000, 8760) .saturating_add(T::DbWeight::get().reads(18_u64)) .saturating_add(T::DbWeight::get().writes(9_u64)) } @@ -264,8 +264,6 @@ impl loans::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) /// Storage: Loans TotalReserves (r:1 w:0) /// Proof: Loans TotalReserves (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: Loans AccountDeposits (r:1 w:0) @@ -292,11 +290,11 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans BorrowIndex (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) fn borrow () -> Weight { // Proof Size summary in bytes: - // Measured: `1950` - // Estimated: `67773` - // Minimum execution time: 354_021_000 picoseconds. - Weight::from_parts(367_373_000, 67773) - .saturating_add(T::DbWeight::get().reads(22_u64)) + // Measured: `2171` + // Estimated: `6260` + // Minimum execution time: 276_714_000 picoseconds. + Weight::from_parts(278_708_000, 6260) + .saturating_add(T::DbWeight::get().reads(21_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } /// Storage: Loans Markets (r:2 w:0) @@ -333,10 +331,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans RewardAccrued (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) fn redeem () -> Weight { // Proof Size summary in bytes: - // Measured: `1723` - // Estimated: `58288` - // Minimum execution time: 420_726_000 picoseconds. - Weight::from_parts(434_795_000, 58288) + // Measured: `2016` + // Estimated: `8760` + // Minimum execution time: 343_288_000 picoseconds. + Weight::from_parts(346_344_000, 8760) .saturating_add(T::DbWeight::get().reads(19_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -374,10 +372,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans RewardAccrued (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) fn redeem_all () -> Weight { // Proof Size summary in bytes: - // Measured: `1723` - // Estimated: `58288` - // Minimum execution time: 431_168_000 picoseconds. - Weight::from_parts(466_340_000, 58288) + // Measured: `2016` + // Estimated: `8760` + // Minimum execution time: 344_951_000 picoseconds. + Weight::from_parts(348_397_000, 8760) .saturating_add(T::DbWeight::get().reads(19_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -405,10 +403,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans TotalBorrows (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) fn repay_borrow () -> Weight { // Proof Size summary in bytes: - // Measured: `1620` - // Estimated: `42116` - // Minimum execution time: 221_063_000 picoseconds. - Weight::from_parts(229_097_000, 42116) + // Measured: `1875` + // Estimated: `6260` + // Minimum execution time: 172_034_000 picoseconds. + Weight::from_parts(173_187_000, 6260) .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -436,10 +434,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans TotalBorrows (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) fn repay_borrow_all () -> Weight { // Proof Size summary in bytes: - // Measured: `1620` - // Estimated: `42116` - // Minimum execution time: 244_411_000 picoseconds. - Weight::from_parts(257_837_000, 42116) + // Measured: `1875` + // Estimated: `6260` + // Minimum execution time: 192_575_000 picoseconds. + Weight::from_parts(194_841_000, 6260) .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -453,10 +451,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans AccountDeposits (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) fn deposit_all_collateral () -> Weight { // Proof Size summary in bytes: - // Measured: `967` - // Estimated: `16899` - // Minimum execution time: 123_309_000 picoseconds. - Weight::from_parts(131_712_000, 16899) + // Measured: `1184` + // Estimated: `6260` + // Minimum execution time: 96_493_000 picoseconds. + Weight::from_parts(96_834_000, 6260) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -484,19 +482,17 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans MinExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) /// Storage: Loans MaxExchangeRate (r:1 w:0) /// Proof: Loans MaxExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: Loans AccountBorrows (r:1 w:0) /// Proof: Loans AccountBorrows (max_values: None, max_size: Some(107), added: 2582, mode: MaxEncodedLen) fn withdraw_all_collateral () -> Weight { // Proof Size summary in bytes: - // Measured: `1880` - // Estimated: `50160` - // Minimum execution time: 311_263_000 picoseconds. - Weight::from_parts(318_834_000, 50160) - .saturating_add(T::DbWeight::get().reads(17_u64)) + // Measured: `2101` + // Estimated: `6260` + // Minimum execution time: 238_287_000 picoseconds. + Weight::from_parts(239_900_000, 6260) + .saturating_add(T::DbWeight::get().reads(16_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } /// Storage: Timestamp Now (r:1 w:0) @@ -523,8 +519,6 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans MinExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) /// Storage: Loans MaxExchangeRate (r:1 w:0) /// Proof: Loans MaxExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:2 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: Loans AccountBorrows (r:3 w:1) @@ -547,11 +541,11 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans RewardSupplierIndex (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) fn liquidate_borrow () -> Weight { // Proof Size summary in bytes: - // Measured: `3353` - // Estimated: `129772` - // Minimum execution time: 1_267_658_000 picoseconds. - Weight::from_parts(1_330_004_000, 129772) - .saturating_add(T::DbWeight::get().reads(45_u64)) + // Measured: `3615` + // Estimated: `16530` + // Minimum execution time: 821_475_000 picoseconds. + Weight::from_parts(827_197_000, 16530) + .saturating_add(T::DbWeight::get().reads(44_u64)) .saturating_add(T::DbWeight::get().writes(21_u64)) } /// Storage: Loans Markets (r:2 w:0) @@ -588,10 +582,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans RewardAccrued (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) fn reduce_incentive_reserves () -> Weight { // Proof Size summary in bytes: - // Measured: `2653` - // Estimated: `63481` - // Minimum execution time: 582_859_000 picoseconds. - Weight::from_parts(615_249_000, 63481) + // Measured: `2949` + // Estimated: `11350` + // Minimum execution time: 439_370_000 picoseconds. + Weight::from_parts(443_348_000, 11350) .saturating_add(T::DbWeight::get().reads(21_u64)) .saturating_add(T::DbWeight::get().writes(10_u64)) } @@ -609,10 +603,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans TotalReserves (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) fn add_reserves () -> Weight { // Proof Size summary in bytes: - // Measured: `1012` - // Estimated: `24524` - // Minimum execution time: 161_331_000 picoseconds. - Weight::from_parts(167_585_000, 24524) + // Measured: `1305` + // Estimated: `6260` + // Minimum execution time: 123_618_000 picoseconds. + Weight::from_parts(124_138_000, 6260) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -630,10 +624,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn reduce_reserves () -> Weight { // Proof Size summary in bytes: - // Measured: `1243` - // Estimated: `24524` - // Minimum execution time: 140_149_000 picoseconds. - Weight::from_parts(153_718_000, 24524) + // Measured: `1536` + // Estimated: `6260` + // Minimum execution time: 107_896_000 picoseconds. + Weight::from_parts(109_179_000, 6260) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } diff --git a/parachain/runtime/interlay/src/weights/nomination.rs b/parachain/runtime/interlay/src/weights/nomination.rs index 3064a03294..243cd4d2d4 100644 --- a/parachain/runtime/interlay/src/weights/nomination.rs +++ b/parachain/runtime/interlay/src/weights/nomination.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for nomination //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -46,25 +46,20 @@ impl nomination::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_384_000 picoseconds. - Weight::from_parts(11_473_000, 0) + // Minimum execution time: 8_456_000 picoseconds. + Weight::from_parts(8_577_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Nomination NominationLimit (r:0 w:1) /// Proof: Nomination NominationLimit (max_values: None, max_size: Some(86), added: 2561, mode: MaxEncodedLen) fn set_nomination_limit () -> Weight { // Proof Size summary in bytes: - // Measured: `126` - // Estimated: `1486` - // Minimum execution time: 28_221_000 picoseconds. - Weight::from_parts(30_402_000, 1486) - .saturating_add(T::DbWeight::get().reads(1_u64)) + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 12_274_000 picoseconds. + Weight::from_parts(12_395_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Nomination NominationEnabled (r:1 w:0) /// Proof: Nomination NominationEnabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: VaultRegistry Vaults (r:1 w:0) @@ -73,15 +68,13 @@ impl nomination::WeightInfo for WeightInfo { /// Proof: Nomination Vaults (max_values: None, max_size: Some(71), added: 2546, mode: MaxEncodedLen) fn opt_in_to_nomination () -> Weight { // Proof Size summary in bytes: - // Measured: `767` - // Estimated: `10233` - // Minimum execution time: 74_126_000 picoseconds. - Weight::from_parts(81_868_000, 10233) - .saturating_add(T::DbWeight::get().reads(4_u64)) + // Measured: `642` + // Estimated: `3725` + // Minimum execution time: 43_357_000 picoseconds. + Weight::from_parts(44_048_000, 3725) + .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Nomination Vaults (r:1 w:1) /// Proof: Nomination Vaults (max_values: None, max_size: Some(71), added: 2546, mode: MaxEncodedLen) /// Storage: VaultStaking Nonce (r:1 w:1) @@ -154,15 +147,13 @@ impl nomination::WeightInfo for WeightInfo { /// Proof: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) fn opt_out_of_nomination () -> Weight { // Proof Size summary in bytes: - // Measured: `4277` - // Estimated: `166107` - // Minimum execution time: 898_769_000 picoseconds. - Weight::from_parts(950_797_000, 166107) - .saturating_add(T::DbWeight::get().reads(54_u64)) + // Measured: `4500` + // Estimated: `11486` + // Minimum execution time: 707_246_000 picoseconds. + Weight::from_parts(712_346_000, 11486) + .saturating_add(T::DbWeight::get().reads(53_u64)) .saturating_add(T::DbWeight::get().writes(26_u64)) } - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: VaultStaking Nonce (r:1 w:0) /// Proof: VaultStaking Nonce (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen) /// Storage: VaultStaking TotalCurrentStake (r:1 w:1) @@ -205,18 +196,24 @@ impl nomination::WeightInfo for WeightInfo { /// Proof: VaultCapacity RewardTally (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen) /// Storage: VaultCapacity TotalRewards (r:2 w:2) /// Proof: VaultCapacity TotalRewards (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) + /// Storage: VaultRewards TotalStake (r:1 w:1) + /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) + /// Storage: VaultRewards RewardCurrencies (r:1 w:1) + /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(50), added: 2525, mode: MaxEncodedLen) + /// Storage: VaultRewards RewardPerToken (r:2 w:2) + /// Proof: VaultRewards RewardPerToken (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen) + /// Storage: VaultRewards TotalRewards (r:2 w:2) + /// Proof: VaultRewards TotalRewards (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultRewards Stake (r:1 w:1) /// Proof: VaultRewards Stake (max_values: None, max_size: Some(97), added: 2572, mode: MaxEncodedLen) - /// Storage: VaultRewards RewardPerToken (r:2 w:0) - /// Proof: VaultRewards RewardPerToken (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen) /// Storage: VaultRewards RewardTally (r:2 w:2) /// Proof: VaultRewards RewardTally (max_values: None, max_size: Some(124), added: 2599, mode: MaxEncodedLen) - /// Storage: VaultRewards TotalRewards (r:2 w:2) - /// Proof: VaultRewards TotalRewards (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: Fee Commission (r:1 w:0) /// Proof: Fee Commission (max_values: None, max_size: Some(86), added: 2561, mode: MaxEncodedLen) /// Storage: VaultStaking RewardPerToken (r:2 w:2) /// Proof: VaultStaking RewardPerToken (max_values: None, max_size: Some(117), added: 2592, mode: MaxEncodedLen) + /// Storage: VaultStaking TotalRewards (r:2 w:2) + /// Proof: VaultStaking TotalRewards (max_values: None, max_size: Some(117), added: 2592, mode: MaxEncodedLen) /// Storage: VaultStaking TotalStake (r:1 w:1) /// Proof: VaultStaking TotalStake (max_values: None, max_size: Some(106), added: 2581, mode: MaxEncodedLen) /// Storage: VaultStaking RewardTally (r:2 w:2) @@ -225,10 +222,6 @@ impl nomination::WeightInfo for WeightInfo { /// Proof: VaultRegistry Vaults (max_values: None, max_size: Some(260), added: 2735, mode: MaxEncodedLen) /// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0) /// Proof: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) - /// Storage: VaultRewards TotalStake (r:1 w:1) - /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) - /// Storage: VaultRewards RewardCurrencies (r:1 w:0) - /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) /// Storage: Timestamp Now (r:1 w:0) /// Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) /// Storage: Loans LastAccruedInterestTime (r:1 w:1) @@ -248,22 +241,20 @@ impl nomination::WeightInfo for WeightInfo { /// Storage: VaultCapacity TotalStake (r:1 w:1) /// Proof: VaultCapacity TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: VaultCapacity RewardCurrencies (r:1 w:0) - /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(39), added: 2514, mode: MaxEncodedLen) /// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1) /// Proof: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) /// Storage: VaultRegistry SystemCollateralCeiling (r:1 w:0) /// Proof: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) fn deposit_collateral () -> Weight { // Proof Size summary in bytes: - // Measured: `5135` - // Estimated: `194221` - // Minimum execution time: 909_947_000 picoseconds. - Weight::from_parts(951_635_000, 194221) - .saturating_add(T::DbWeight::get().reads(62_u64)) - .saturating_add(T::DbWeight::get().writes(29_u64)) + // Measured: `5681` + // Estimated: `8760` + // Minimum execution time: 846_906_000 picoseconds. + Weight::from_parts(868_049_000, 8760) + .saturating_add(T::DbWeight::get().reads(63_u64)) + .saturating_add(T::DbWeight::get().writes(34_u64)) } - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: VaultStaking Nonce (r:1 w:0) /// Proof: VaultStaking Nonce (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen) /// Storage: VaultRegistry Vaults (r:1 w:0) @@ -302,8 +293,6 @@ impl nomination::WeightInfo for WeightInfo { /// Proof: Nomination NominationEnabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Nomination Vaults (r:1 w:0) /// Proof: Nomination Vaults (max_values: None, max_size: Some(71), added: 2546, mode: MaxEncodedLen) - /// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1) - /// Proof: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) /// Storage: VaultCapacity Stake (r:1 w:1) /// Proof: VaultCapacity Stake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultCapacity RewardPerToken (r:2 w:0) @@ -312,18 +301,24 @@ impl nomination::WeightInfo for WeightInfo { /// Proof: VaultCapacity RewardTally (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen) /// Storage: VaultCapacity TotalRewards (r:2 w:2) /// Proof: VaultCapacity TotalRewards (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) + /// Storage: VaultRewards TotalStake (r:1 w:1) + /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) + /// Storage: VaultRewards RewardCurrencies (r:1 w:1) + /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(50), added: 2525, mode: MaxEncodedLen) + /// Storage: VaultRewards RewardPerToken (r:2 w:2) + /// Proof: VaultRewards RewardPerToken (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen) + /// Storage: VaultRewards TotalRewards (r:2 w:2) + /// Proof: VaultRewards TotalRewards (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultRewards Stake (r:1 w:1) /// Proof: VaultRewards Stake (max_values: None, max_size: Some(97), added: 2572, mode: MaxEncodedLen) - /// Storage: VaultRewards RewardPerToken (r:2 w:0) - /// Proof: VaultRewards RewardPerToken (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen) /// Storage: VaultRewards RewardTally (r:2 w:2) /// Proof: VaultRewards RewardTally (max_values: None, max_size: Some(124), added: 2599, mode: MaxEncodedLen) - /// Storage: VaultRewards TotalRewards (r:2 w:2) - /// Proof: VaultRewards TotalRewards (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: Fee Commission (r:1 w:0) /// Proof: Fee Commission (max_values: None, max_size: Some(86), added: 2561, mode: MaxEncodedLen) /// Storage: VaultStaking RewardPerToken (r:2 w:2) /// Proof: VaultStaking RewardPerToken (max_values: None, max_size: Some(117), added: 2592, mode: MaxEncodedLen) + /// Storage: VaultStaking TotalRewards (r:2 w:2) + /// Proof: VaultStaking TotalRewards (max_values: None, max_size: Some(117), added: 2592, mode: MaxEncodedLen) /// Storage: VaultStaking Stake (r:1 w:1) /// Proof: VaultStaking Stake (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) /// Storage: VaultStaking SlashPerToken (r:1 w:0) @@ -334,14 +329,10 @@ impl nomination::WeightInfo for WeightInfo { /// Proof: VaultStaking TotalStake (max_values: None, max_size: Some(106), added: 2581, mode: MaxEncodedLen) /// Storage: VaultStaking RewardTally (r:2 w:2) /// Proof: VaultStaking RewardTally (max_values: None, max_size: Some(149), added: 2624, mode: MaxEncodedLen) - /// Storage: VaultRewards TotalStake (r:1 w:1) - /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) - /// Storage: VaultRewards RewardCurrencies (r:1 w:0) - /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) /// Storage: VaultCapacity TotalStake (r:1 w:1) /// Proof: VaultCapacity TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: VaultCapacity RewardCurrencies (r:1 w:0) - /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(39), added: 2514, mode: MaxEncodedLen) /// Storage: Loans RewardSupplyState (r:1 w:1) /// Proof: Loans RewardSupplyState (max_values: None, max_size: Some(47), added: 2522, mode: MaxEncodedLen) /// Storage: Loans RewardSupplySpeed (r:1 w:0) @@ -352,13 +343,15 @@ impl nomination::WeightInfo for WeightInfo { /// Proof: Loans RewardAccrued (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) /// Storage: Loans AccountDeposits (r:1 w:0) /// Proof: Loans AccountDeposits (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) + /// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1) + /// Proof: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) fn withdraw_collateral () -> Weight { // Proof Size summary in bytes: - // Measured: `5472` - // Estimated: `185433` - // Minimum execution time: 990_914_000 picoseconds. - Weight::from_parts(1_034_102_000, 185433) - .saturating_add(T::DbWeight::get().reads(59_u64)) - .saturating_add(T::DbWeight::get().writes(29_u64)) + // Measured: `6006` + // Estimated: `8760` + // Minimum execution time: 892_548_000 picoseconds. + Weight::from_parts(901_395_000, 8760) + .saturating_add(T::DbWeight::get().reads(60_u64)) + .saturating_add(T::DbWeight::get().writes(34_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/oracle.rs b/parachain/runtime/interlay/src/weights/oracle.rs index 8c0cdafa65..ad7c77eaaf 100644 --- a/parachain/runtime/interlay/src/weights/oracle.rs +++ b/parachain/runtime/interlay/src/weights/oracle.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for oracle //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -50,10 +50,10 @@ impl oracle::WeightInfo for WeightInfo { /// Proof: Oracle MaxDelay (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) /// Storage: VaultRewards TotalStake (r:999 w:0) /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:1) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) - /// Storage: Security Errors (r:1 w:1) - /// Proof: Security Errors (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: VaultCapacity Stake (r:999 w:0) + /// Proof: VaultCapacity Stake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) + /// Storage: Loans Markets (r:999 w:0) + /// Proof: Loans Markets (max_values: None, max_size: Some(160), added: 2635, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:0 w:999) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: Oracle ValidUntil (r:0 w:999) @@ -61,17 +61,16 @@ impl oracle::WeightInfo for WeightInfo { /// The range of component `u` is `[1, 1000]`. fn on_initialize (u: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `687 + u * (127 ±0)` - // Estimated: `11433 + u * (10172 ±0)` - // Minimum execution time: 124_620_000 picoseconds. - Weight::from_parts(126_432_000, 11433) - // Standard Error: 52_310 - .saturating_add(Weight::from_parts(50_637_249, 0).saturating_mul(u.into())) - .saturating_add(T::DbWeight::get().reads(5_u64)) - .saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(u.into()))) - .saturating_add(T::DbWeight::get().writes(2_u64)) + // Measured: `678 + u * (127 ±0)` + // Estimated: `3494 + u * (5150 ±0)` + // Minimum execution time: 82_555_000 picoseconds. + Weight::from_parts(82_936_000, 3494) + // Standard Error: 44_981 + .saturating_add(Weight::from_parts(45_674_981, 0).saturating_mul(u.into())) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().reads((6_u64).saturating_mul(u.into()))) .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(u.into()))) - .saturating_add(Weight::from_parts(0, 10172).saturating_mul(u.into())) + .saturating_add(Weight::from_parts(0, 5150).saturating_mul(u.into())) } /// Storage: Oracle AuthorizedOracles (r:1 w:0) /// Proof: Oracle AuthorizedOracles (max_values: None, max_size: Some(305), added: 2780, mode: MaxEncodedLen) @@ -85,11 +84,11 @@ impl oracle::WeightInfo for WeightInfo { fn feed_values (u: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `295` - // Estimated: `5263` - // Minimum execution time: 49_622_000 picoseconds. - Weight::from_parts(50_155_000, 5263) - // Standard Error: 18_635 - .saturating_add(Weight::from_parts(9_962_469, 0).saturating_mul(u.into())) + // Estimated: `3770` + // Minimum execution time: 37_184_000 picoseconds. + Weight::from_parts(37_425_000, 3770) + // Standard Error: 35_377 + .saturating_add(Weight::from_parts(8_220_553, 0).saturating_mul(u.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(u.into()))) } @@ -99,8 +98,8 @@ impl oracle::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 29_623_000 picoseconds. - Weight::from_parts(30_869_000, 0) + // Minimum execution time: 22_265_000 picoseconds. + Weight::from_parts(22_555_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Oracle AuthorizedOracles (r:0 w:1) @@ -109,8 +108,8 @@ impl oracle::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 26_992_000 picoseconds. - Weight::from_parts(28_076_000, 0) + // Minimum execution time: 20_180_000 picoseconds. + Weight::from_parts(20_461_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/orml_asset_registry.rs b/parachain/runtime/interlay/src/weights/orml_asset_registry.rs index 705e433064..a6e1b47a4a 100644 --- a/parachain/runtime/interlay/src/weights/orml_asset_registry.rs +++ b/parachain/runtime/interlay/src/weights/orml_asset_registry.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for orml_asset_registry //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -49,9 +49,9 @@ impl orml_asset_registry::WeightInfo for WeightInfo fn register_asset () -> Weight { // Proof Size summary in bytes: // Measured: `107` - // Estimated: `8736` - // Minimum execution time: 55_685_000 picoseconds. - Weight::from_parts(63_994_000, 8736) + // Estimated: `3572` + // Minimum execution time: 41_974_000 picoseconds. + Weight::from_parts(43_196_000, 3572) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -62,9 +62,9 @@ impl orml_asset_registry::WeightInfo for WeightInfo fn update_asset () -> Weight { // Proof Size summary in bytes: // Measured: `774` - // Estimated: `8478` - // Minimum execution time: 67_201_000 picoseconds. - Weight::from_parts(75_234_000, 8478) + // Estimated: `4239` + // Minimum execution time: 51_463_000 picoseconds. + Weight::from_parts(52_084_000, 4239) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -72,7 +72,7 @@ impl orml_asset_registry::WeightInfo for WeightInfo // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 524_000 picoseconds. - Weight::from_parts(579_000, 0) + // Minimum execution time: 421_000 picoseconds. + Weight::from_parts(471_000, 0) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/orml_tokens.rs b/parachain/runtime/interlay/src/weights/orml_tokens.rs index 3149b215ad..ec757ac9ac 100644 --- a/parachain/runtime/interlay/src/weights/orml_tokens.rs +++ b/parachain/runtime/interlay/src/weights/orml_tokens.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for orml_tokens //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -60,10 +60,10 @@ impl orml_tokens::WeightInfo for WeightInfo { /// Proof: Loans AccountDeposits (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) fn transfer () -> Weight { // Proof Size summary in bytes: - // Measured: `1517` - // Estimated: `42199` - // Minimum execution time: 260_329_000 picoseconds. - Weight::from_parts(271_947_000, 42199) + // Measured: `1743` + // Estimated: `6260` + // Minimum execution time: 209_179_000 picoseconds. + Weight::from_parts(211_704_000, 6260) .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -87,10 +87,10 @@ impl orml_tokens::WeightInfo for WeightInfo { /// Proof: Loans AccountDeposits (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) fn transfer_all () -> Weight { // Proof Size summary in bytes: - // Measured: `1517` - // Estimated: `42199` - // Minimum execution time: 269_158_000 picoseconds. - Weight::from_parts(281_645_000, 42199) + // Measured: `1743` + // Estimated: `6260` + // Minimum execution time: 215_902_000 picoseconds. + Weight::from_parts(219_470_000, 6260) .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -114,10 +114,10 @@ impl orml_tokens::WeightInfo for WeightInfo { /// Proof: Loans AccountDeposits (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) fn transfer_keep_alive () -> Weight { // Proof Size summary in bytes: - // Measured: `1517` - // Estimated: `42199` - // Minimum execution time: 260_565_000 picoseconds. - Weight::from_parts(266_397_000, 42199) + // Measured: `1743` + // Estimated: `6260` + // Minimum execution time: 205_602_000 picoseconds. + Weight::from_parts(207_255_000, 6260) .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -141,10 +141,10 @@ impl orml_tokens::WeightInfo for WeightInfo { /// Proof: Loans AccountDeposits (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) fn force_transfer () -> Weight { // Proof Size summary in bytes: - // Measured: `1517` - // Estimated: `42199` - // Minimum execution time: 259_001_000 picoseconds. - Weight::from_parts(271_563_000, 42199) + // Measured: `1743` + // Estimated: `6260` + // Minimum execution time: 209_379_000 picoseconds. + Weight::from_parts(211_293_000, 6260) .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -154,10 +154,10 @@ impl orml_tokens::WeightInfo for WeightInfo { /// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(35), added: 2510, mode: MaxEncodedLen) fn set_balance () -> Weight { // Proof Size summary in bytes: - // Measured: `218` - // Estimated: `7080` - // Minimum execution time: 64_408_000 picoseconds. - Weight::from_parts(66_426_000, 7080) + // Measured: `435` + // Estimated: `3580` + // Minimum execution time: 52_415_000 picoseconds. + Weight::from_parts(53_918_000, 3580) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } diff --git a/parachain/runtime/interlay/src/weights/orml_vesting.rs b/parachain/runtime/interlay/src/weights/orml_vesting.rs index dfcac10454..1b87121998 100644 --- a/parachain/runtime/interlay/src/weights/orml_vesting.rs +++ b/parachain/runtime/interlay/src/weights/orml_vesting.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for orml_vesting //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -51,10 +51,10 @@ impl orml_vesting::WeightInfo for WeightInfo { /// The range of component `n` is `[0, 1]`. fn claim (_n: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `315 + n * (306 ±0)` - // Estimated: `15448` - // Minimum execution time: 84_833_000 picoseconds. - Weight::from_parts(97_565_028, 15448) + // Measured: `771 + n * (109 ±0)` + // Estimated: `4733` + // Minimum execution time: 68_828_000 picoseconds. + Weight::from_parts(86_162_085, 4733) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -68,10 +68,10 @@ impl orml_vesting::WeightInfo for WeightInfo { /// Proof: Tokens Locks (max_values: None, max_size: Some(1268), added: 3743, mode: MaxEncodedLen) fn vested_transfer () -> Weight { // Proof Size summary in bytes: - // Measured: `395` - // Estimated: `18038` - // Minimum execution time: 153_089_000 picoseconds. - Weight::from_parts(156_347_000, 18038) + // Measured: `851` + // Estimated: `6170` + // Minimum execution time: 132_135_000 picoseconds. + Weight::from_parts(134_780_000, 6170) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -86,10 +86,10 @@ impl orml_vesting::WeightInfo for WeightInfo { /// The range of component `n` is `[0, 1]`. fn update_vesting_schedules (_n: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `560` - // Estimated: `11906` - // Minimum execution time: 85_329_000 picoseconds. - Weight::from_parts(91_242_552, 11906) + // Measured: `894` + // Estimated: `4733` + // Minimum execution time: 71_683_000 picoseconds. + Weight::from_parts(76_991_012, 4733) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } diff --git a/parachain/runtime/interlay/src/weights/pallet_collective.rs b/parachain/runtime/interlay/src/weights/pallet_collective.rs index 84624bfe20..160694ec8b 100644 --- a/parachain/runtime/interlay/src/weights/pallet_collective.rs +++ b/parachain/runtime/interlay/src/weights/pallet_collective.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_collective //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -54,34 +54,32 @@ impl pallet_collective::WeightInfo for WeightInfo { fn set_members (m: u32, _n: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0 + m * (3232 ±0) + p * (3190 ±0)` - // Estimated: `19032 + m * (7796 ±30) + p * (10110 ±30)` - // Minimum execution time: 36_859_000 picoseconds. - Weight::from_parts(36_989_000, 19032) - // Standard Error: 168_481 - .saturating_add(Weight::from_parts(9_907_408, 0).saturating_mul(m.into())) - // Standard Error: 168_481 - .saturating_add(Weight::from_parts(17_366_102, 0).saturating_mul(p.into())) + // Estimated: `15762 + m * (1966 ±32) + p * (4332 ±32)` + // Minimum execution time: 27_395_000 picoseconds. + Weight::from_parts(27_776_000, 15762) + // Standard Error: 105_500 + .saturating_add(Weight::from_parts(6_123_319, 0).saturating_mul(m.into())) + // Standard Error: 105_500 + .saturating_add(Weight::from_parts(11_424_791, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into()))) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into()))) - .saturating_add(Weight::from_parts(0, 7796).saturating_mul(m.into())) - .saturating_add(Weight::from_parts(0, 10110).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 1966).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 4332).saturating_mul(p.into())) } /// Storage: TechnicalCommittee Members (r:1 w:0) /// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured) /// The range of component `b` is `[2, 1024]`. /// The range of component `m` is `[1, 100]`. - fn execute (b: u32, m: u32, ) -> Weight { + fn execute (_b: u32, m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `103 + m * (32 ±0)` // Estimated: `1589 + m * (32 ±0)` - // Minimum execution time: 38_525_000 picoseconds. - Weight::from_parts(41_645_958, 1589) - // Standard Error: 537 - .saturating_add(Weight::from_parts(438, 0).saturating_mul(b.into())) - // Standard Error: 5_540 - .saturating_add(Weight::from_parts(22_385, 0).saturating_mul(m.into())) + // Minimum execution time: 29_499_000 picoseconds. + Weight::from_parts(31_124_039, 1589) + // Standard Error: 7_234 + .saturating_add(Weight::from_parts(32_755, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into())) } @@ -94,15 +92,15 @@ impl pallet_collective::WeightInfo for WeightInfo { fn propose_execute (b: u32, m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `103 + m * (32 ±0)` - // Estimated: `5158 + m * (64 ±0)` - // Minimum execution time: 44_202_000 picoseconds. - Weight::from_parts(47_233_769, 5158) - // Standard Error: 620 - .saturating_add(Weight::from_parts(1_996, 0).saturating_mul(b.into())) - // Standard Error: 6_397 - .saturating_add(Weight::from_parts(30_056, 0).saturating_mul(m.into())) + // Estimated: `3569 + m * (32 ±0)` + // Minimum execution time: 34_780_000 picoseconds. + Weight::from_parts(35_374_452, 3569) + // Standard Error: 371 + .saturating_add(Weight::from_parts(1_346, 0).saturating_mul(b.into())) + // Standard Error: 3_829 + .saturating_add(Weight::from_parts(16_196, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into())) } /// Storage: TechnicalCommittee Members (r:1 w:0) /// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured) @@ -120,19 +118,19 @@ impl pallet_collective::WeightInfo for WeightInfo { fn propose_proposed (b: u32, m: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `393 + m * (32 ±0) + p * (36 ±0)` - // Estimated: `9510 + m * (165 ±0) + p * (180 ±0)` - // Minimum execution time: 59_352_000 picoseconds. - Weight::from_parts(49_658_095, 9510) - // Standard Error: 1_215 - .saturating_add(Weight::from_parts(15_112, 0).saturating_mul(b.into())) - // Standard Error: 12_680 - .saturating_add(Weight::from_parts(74_712, 0).saturating_mul(m.into())) - // Standard Error: 12_520 - .saturating_add(Weight::from_parts(670_544, 0).saturating_mul(p.into())) + // Estimated: `3783 + m * (33 ±0) + p * (36 ±0)` + // Minimum execution time: 46_323_000 picoseconds. + Weight::from_parts(46_756_551, 3783) + // Standard Error: 751 + .saturating_add(Weight::from_parts(4_944, 0).saturating_mul(b.into())) + // Standard Error: 7_841 + .saturating_add(Weight::from_parts(33_290, 0).saturating_mul(m.into())) + // Standard Error: 7_741 + .saturating_add(Weight::from_parts(272_416, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) - .saturating_add(Weight::from_parts(0, 165).saturating_mul(m.into())) - .saturating_add(Weight::from_parts(0, 180).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 33).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into())) } /// Storage: TechnicalCommittee Members (r:1 w:0) /// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured) @@ -142,14 +140,14 @@ impl pallet_collective::WeightInfo for WeightInfo { fn vote (m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `842 + m * (64 ±0)` - // Estimated: `6632 + m * (128 ±0)` - // Minimum execution time: 68_104_000 picoseconds. - Weight::from_parts(79_068_930, 6632) - // Standard Error: 13_671 - .saturating_add(Weight::from_parts(130_890, 0).saturating_mul(m.into())) + // Estimated: `4306 + m * (64 ±0)` + // Minimum execution time: 38_868_000 picoseconds. + Weight::from_parts(40_129_312, 4306) + // Standard Error: 6_629 + .saturating_add(Weight::from_parts(57_672, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_parts(0, 128).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } /// Storage: TechnicalCommittee Voting (r:1 w:1) /// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured) @@ -164,17 +162,17 @@ impl pallet_collective::WeightInfo for WeightInfo { fn close_early_disapproved (m: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `431 + m * (64 ±0) + p * (36 ±0)` - // Estimated: `8075 + m * (260 ±0) + p * (144 ±0)` - // Minimum execution time: 67_651_000 picoseconds. - Weight::from_parts(71_894_266, 8075) - // Standard Error: 13_167 - .saturating_add(Weight::from_parts(114_193, 0).saturating_mul(m.into())) - // Standard Error: 12_840 - .saturating_add(Weight::from_parts(535_191, 0).saturating_mul(p.into())) + // Estimated: `3875 + m * (65 ±0) + p * (36 ±0)` + // Minimum execution time: 48_788_000 picoseconds. + Weight::from_parts(54_221_664, 3875) + // Standard Error: 10_679 + .saturating_add(Weight::from_parts(1_275, 0).saturating_mul(m.into())) + // Standard Error: 10_413 + .saturating_add(Weight::from_parts(293_929, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 260).saturating_mul(m.into())) - .saturating_add(Weight::from_parts(0, 144).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 65).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into())) } /// Storage: TechnicalCommittee Voting (r:1 w:1) /// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured) @@ -190,20 +188,20 @@ impl pallet_collective::WeightInfo for WeightInfo { fn close_early_approved (b: u32, m: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `733 + b * (1 ±0) + m * (64 ±0) + p * (40 ±0)` - // Estimated: `12228 + b * (4 ±0) + m * (264 ±0) + p * (160 ±0)` - // Minimum execution time: 96_526_000 picoseconds. - Weight::from_parts(113_889_832, 12228) - // Standard Error: 1_535 - .saturating_add(Weight::from_parts(2_870, 0).saturating_mul(b.into())) - // Standard Error: 16_227 - .saturating_add(Weight::from_parts(67_319, 0).saturating_mul(m.into())) - // Standard Error: 15_817 - .saturating_add(Weight::from_parts(702_142, 0).saturating_mul(p.into())) + // Estimated: `4047 + b * (1 ±0) + m * (66 ±0) + p * (40 ±0)` + // Minimum execution time: 75_401_000 picoseconds. + Weight::from_parts(81_011_199, 4047) + // Standard Error: 923 + .saturating_add(Weight::from_parts(1_644, 0).saturating_mul(b.into())) + // Standard Error: 9_759 + .saturating_add(Weight::from_parts(14_124, 0).saturating_mul(m.into())) + // Standard Error: 9_513 + .saturating_add(Weight::from_parts(254_678, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 4).saturating_mul(b.into())) - .saturating_add(Weight::from_parts(0, 264).saturating_mul(m.into())) - .saturating_add(Weight::from_parts(0, 160).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(0, 66).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 40).saturating_mul(p.into())) } /// Storage: TechnicalCommittee Voting (r:1 w:1) /// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured) @@ -220,17 +218,17 @@ impl pallet_collective::WeightInfo for WeightInfo { fn close_disapproved (m: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `451 + m * (64 ±0) + p * (36 ±0)` - // Estimated: `10070 + m * (325 ±0) + p * (180 ±0)` - // Minimum execution time: 72_430_000 picoseconds. - Weight::from_parts(79_406_354, 10070) - // Standard Error: 14_749 - .saturating_add(Weight::from_parts(91_178, 0).saturating_mul(m.into())) - // Standard Error: 14_381 - .saturating_add(Weight::from_parts(616_228, 0).saturating_mul(p.into())) + // Estimated: `3895 + m * (65 ±0) + p * (36 ±0)` + // Minimum execution time: 53_828_000 picoseconds. + Weight::from_parts(56_074_022, 3895) + // Standard Error: 9_851 + .saturating_add(Weight::from_parts(55_652, 0).saturating_mul(m.into())) + // Standard Error: 9_606 + .saturating_add(Weight::from_parts(276_244, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 325).saturating_mul(m.into())) - .saturating_add(Weight::from_parts(0, 180).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 65).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into())) } /// Storage: TechnicalCommittee Voting (r:1 w:1) /// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured) @@ -248,20 +246,18 @@ impl pallet_collective::WeightInfo for WeightInfo { fn close_approved (b: u32, m: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `753 + b * (1 ±0) + m * (64 ±0) + p * (40 ±0)` - // Estimated: `14395 + b * (5 ±0) + m * (330 ±0) + p * (200 ±0)` - // Minimum execution time: 107_317_000 picoseconds. - Weight::from_parts(136_262_210, 14395) - // Standard Error: 1_997 - .saturating_add(Weight::from_parts(6_154, 0).saturating_mul(b.into())) - // Standard Error: 21_113 - .saturating_add(Weight::from_parts(36_533, 0).saturating_mul(m.into())) - // Standard Error: 20_580 - .saturating_add(Weight::from_parts(533_990, 0).saturating_mul(p.into())) + // Estimated: `4067 + b * (1 ±0) + m * (66 ±0) + p * (40 ±0)` + // Minimum execution time: 78_407_000 picoseconds. + Weight::from_parts(83_047_577, 4067) + // Standard Error: 976 + .saturating_add(Weight::from_parts(3_047, 0).saturating_mul(b.into())) + // Standard Error: 10_058 + .saturating_add(Weight::from_parts(299_268, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 5).saturating_mul(b.into())) - .saturating_add(Weight::from_parts(0, 330).saturating_mul(m.into())) - .saturating_add(Weight::from_parts(0, 200).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(0, 66).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 40).saturating_mul(p.into())) } /// Storage: TechnicalCommittee Proposals (r:1 w:1) /// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured) @@ -273,13 +269,13 @@ impl pallet_collective::WeightInfo for WeightInfo { fn disapprove_proposal (p: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `260 + p * (32 ±0)` - // Estimated: `2265 + p * (96 ±0)` - // Minimum execution time: 37_249_000 picoseconds. - Weight::from_parts(45_749_178, 2265) - // Standard Error: 11_887 - .saturating_add(Weight::from_parts(562_550, 0).saturating_mul(p.into())) + // Estimated: `1745 + p * (32 ±0)` + // Minimum execution time: 28_797_000 picoseconds. + Weight::from_parts(34_789_821, 1745) + // Standard Error: 8_315 + .saturating_add(Weight::from_parts(211_487, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 96).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 32).saturating_mul(p.into())) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/pallet_identity.rs b/parachain/runtime/interlay/src/weights/pallet_identity.rs index f179921e03..c7c5c51713 100644 --- a/parachain/runtime/interlay/src/weights/pallet_identity.rs +++ b/parachain/runtime/interlay/src/weights/pallet_identity.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_identity //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -45,12 +45,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `r` is `[1, 19]`. fn add_registrar (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `31 + r * (57 ±0)` + // Measured: `32 + r * (57 ±0)` // Estimated: `2626` - // Minimum execution time: 28_285_000 picoseconds. - Weight::from_parts(31_134_871, 2626) - // Standard Error: 41_361 - .saturating_add(Weight::from_parts(640_975, 0).saturating_mul(r.into())) + // Minimum execution time: 22_445_000 picoseconds. + Weight::from_parts(23_756_709, 2626) + // Standard Error: 5_721 + .saturating_add(Weight::from_parts(167_489, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -62,14 +62,14 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `x` is `[0, 100]`. fn set_identity (r: u32, x: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `797 + r * (17 ±0)` - // Estimated: `14583` - // Minimum execution time: 92_086_000 picoseconds. - Weight::from_parts(91_339_533, 14583) - // Standard Error: 68_507 - .saturating_add(Weight::from_parts(1_011_797, 0).saturating_mul(r.into())) - // Standard Error: 13_030 - .saturating_add(Weight::from_parts(1_255_225, 0).saturating_mul(x.into())) + // Measured: `1017 + r * (12 ±0)` + // Estimated: `11003` + // Minimum execution time: 63_999_000 picoseconds. + Weight::from_parts(65_678_164, 11003) + // Standard Error: 61_681 + .saturating_add(Weight::from_parts(349_590, 0).saturating_mul(r.into())) + // Standard Error: 11_731 + .saturating_add(Weight::from_parts(1_083_072, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -84,12 +84,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `s` is `[0, 100]`. fn set_subs_new (s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `419` - // Estimated: `22296 + s * (2589 ±0)` - // Minimum execution time: 22_836_000 picoseconds. - Weight::from_parts(64_900_054, 22296) - // Standard Error: 38_498 - .saturating_add(Weight::from_parts(7_425_143, 0).saturating_mul(s.into())) + // Measured: `637` + // Estimated: `11003 + s * (2589 ±0)` + // Minimum execution time: 17_796_000 picoseconds. + Weight::from_parts(47_903_223, 11003) + // Standard Error: 120_498 + .saturating_add(Weight::from_parts(6_559_882, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into()))) .saturating_add(T::DbWeight::get().writes(2_u64)) @@ -107,12 +107,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `p` is `[0, 100]`. fn set_subs_old (p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `512 + p * (32 ±0)` - // Estimated: `21306` - // Minimum execution time: 23_183_000 picoseconds. - Weight::from_parts(62_590_870, 21306) - // Standard Error: 21_122 - .saturating_add(Weight::from_parts(2_998_615, 0).saturating_mul(p.into())) + // Measured: `730 + p * (32 ±0)` + // Estimated: `11003` + // Minimum execution time: 17_565_000 picoseconds. + Weight::from_parts(50_889_102, 11003) + // Standard Error: 41_676 + .saturating_add(Weight::from_parts(2_418_743, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into()))) @@ -130,16 +130,16 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `x` is `[0, 100]`. fn clear_identity (r: u32, s: u32, x: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `825 + r * (17 ±0) + s * (32 ±0) + x * (66 ±0)` - // Estimated: `21306` - // Minimum execution time: 156_806_000 picoseconds. - Weight::from_parts(59_701_362, 21306) - // Standard Error: 107_650 - .saturating_add(Weight::from_parts(1_832_632, 0).saturating_mul(r.into())) - // Standard Error: 20_341 - .saturating_add(Weight::from_parts(2_968_437, 0).saturating_mul(s.into())) - // Standard Error: 20_341 - .saturating_add(Weight::from_parts(800_329, 0).saturating_mul(x.into())) + // Measured: `1049 + r * (12 ±0) + s * (32 ±0) + x * (66 ±0)` + // Estimated: `11003` + // Minimum execution time: 109_400_000 picoseconds. + Weight::from_parts(86_902_105, 11003) + // Standard Error: 176_683 + .saturating_add(Weight::from_parts(42_180, 0).saturating_mul(r.into())) + // Standard Error: 33_386 + .saturating_add(Weight::from_parts(2_389_801, 0).saturating_mul(s.into())) + // Standard Error: 33_386 + .saturating_add(Weight::from_parts(281_531, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) @@ -154,14 +154,14 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `x` is `[0, 100]`. fn request_judgement (r: u32, x: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `721 + r * (69 ±0) + x * (66 ±0)` - // Estimated: `17209` - // Minimum execution time: 97_943_000 picoseconds. - Weight::from_parts(97_563_444, 17209) - // Standard Error: 68_848 - .saturating_add(Weight::from_parts(692_460, 0).saturating_mul(r.into())) - // Standard Error: 13_095 - .saturating_add(Weight::from_parts(1_241_864, 0).saturating_mul(x.into())) + // Measured: `942 + r * (64 ±0) + x * (66 ±0)` + // Estimated: `11003` + // Minimum execution time: 72_045_000 picoseconds. + Weight::from_parts(61_074_609, 11003) + // Standard Error: 116_663 + .saturating_add(Weight::from_parts(571_285, 0).saturating_mul(r.into())) + // Standard Error: 22_189 + .saturating_add(Weight::from_parts(1_140_967, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -173,14 +173,14 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `x` is `[0, 100]`. fn cancel_request (r: u32, x: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `753 + r * (12 ±0) + x * (66 ±0)` - // Estimated: `14583` - // Minimum execution time: 83_591_000 picoseconds. - Weight::from_parts(75_600_315, 14583) - // Standard Error: 61_196 - .saturating_add(Weight::from_parts(762_700, 0).saturating_mul(r.into())) - // Standard Error: 11_639 - .saturating_add(Weight::from_parts(1_301_192, 0).saturating_mul(x.into())) + // Measured: `973 + r * (7 ±0) + x * (66 ±0)` + // Estimated: `11003` + // Minimum execution time: 62_395_000 picoseconds. + Weight::from_parts(61_639_151, 11003) + // Standard Error: 88_015 + .saturating_add(Weight::from_parts(245_592, 0).saturating_mul(r.into())) + // Standard Error: 16_740 + .saturating_add(Weight::from_parts(1_037_672, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -189,12 +189,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `r` is `[1, 19]`. fn set_fee (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `88 + r * (57 ±0)` + // Measured: `89 + r * (57 ±0)` // Estimated: `2626` - // Minimum execution time: 18_308_000 picoseconds. - Weight::from_parts(20_184_358, 2626) - // Standard Error: 23_250 - .saturating_add(Weight::from_parts(431_841, 0).saturating_mul(r.into())) + // Minimum execution time: 14_269_000 picoseconds. + Weight::from_parts(14_871_637, 2626) + // Standard Error: 2_602 + .saturating_add(Weight::from_parts(150_392, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -203,12 +203,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `r` is `[1, 19]`. fn set_account_id (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `88 + r * (57 ±0)` + // Measured: `89 + r * (57 ±0)` // Estimated: `2626` - // Minimum execution time: 19_040_000 picoseconds. - Weight::from_parts(20_345_843, 2626) - // Standard Error: 17_467 - .saturating_add(Weight::from_parts(415_678, 0).saturating_mul(r.into())) + // Minimum execution time: 14_018_000 picoseconds. + Weight::from_parts(14_900_258, 2626) + // Standard Error: 4_272 + .saturating_add(Weight::from_parts(148_637, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -217,12 +217,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `r` is `[1, 19]`. fn set_fields (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `88 + r * (57 ±0)` + // Measured: `89 + r * (57 ±0)` // Estimated: `2626` - // Minimum execution time: 18_404_000 picoseconds. - Weight::from_parts(19_550_443, 2626) - // Standard Error: 18_770 - .saturating_add(Weight::from_parts(400_503, 0).saturating_mul(r.into())) + // Minimum execution time: 14_008_000 picoseconds. + Weight::from_parts(15_066_270, 2626) + // Standard Error: 5_721 + .saturating_add(Weight::from_parts(137_567, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -234,14 +234,14 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `x` is `[0, 100]`. fn provide_judgement (r: u32, x: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `444 + r * (57 ±0) + x * (66 ±0)` - // Estimated: `13629` - // Minimum execution time: 62_083_000 picoseconds. - Weight::from_parts(55_493_478, 13629) - // Standard Error: 67_748 - .saturating_add(Weight::from_parts(785_801, 0).saturating_mul(r.into())) - // Standard Error: 12_235 - .saturating_add(Weight::from_parts(1_957_097, 0).saturating_mul(x.into())) + // Measured: `445 + r * (57 ±0) + x * (66 ±0)` + // Estimated: `11003` + // Minimum execution time: 42_455_000 picoseconds. + Weight::from_parts(43_058_178, 11003) + // Standard Error: 17_677 + .saturating_add(Weight::from_parts(86_899, 0).saturating_mul(r.into())) + // Standard Error: 3_192 + .saturating_add(Weight::from_parts(1_696_419, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -260,16 +260,16 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `x` is `[0, 100]`. fn kill_identity (r: u32, s: u32, x: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `879 + r * (13 ±0) + s * (32 ±0) + x * (66 ±0)` - // Estimated: `24806` - // Minimum execution time: 274_589_000 picoseconds. - Weight::from_parts(311_292_941, 24806) - // Standard Error: 408_105 - .saturating_add(Weight::from_parts(171_681, 0).saturating_mul(r.into())) - // Standard Error: 77_115 - .saturating_add(Weight::from_parts(2_838_867, 0).saturating_mul(s.into())) - // Standard Error: 77_115 - .saturating_add(Weight::from_parts(644_382, 0).saturating_mul(x.into())) + // Measured: `1133 + r * (8 ±0) + s * (32 ±0) + x * (66 ±0)` + // Estimated: `11003` + // Minimum execution time: 137_084_000 picoseconds. + Weight::from_parts(81_494_923, 11003) + // Standard Error: 130_256 + .saturating_add(Weight::from_parts(202_721, 0).saturating_mul(r.into())) + // Standard Error: 24_613 + .saturating_add(Weight::from_parts(2_433_856, 0).saturating_mul(s.into())) + // Standard Error: 24_613 + .saturating_add(Weight::from_parts(573_483, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) @@ -285,12 +285,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `s` is `[0, 99]`. fn add_sub (s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `793 + s * (36 ±0)` - // Estimated: `24885` - // Minimum execution time: 77_951_000 picoseconds. - Weight::from_parts(93_359_690, 24885) - // Standard Error: 12_406 - .saturating_add(Weight::from_parts(308_142, 0).saturating_mul(s.into())) + // Measured: `1011 + s * (36 ±0)` + // Estimated: `11003` + // Minimum execution time: 65_772_000 picoseconds. + Weight::from_parts(73_485_025, 11003) + // Standard Error: 3_768 + .saturating_add(Weight::from_parts(84_025, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -301,12 +301,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `s` is `[1, 100]`. fn rename_sub (s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `590 + s * (3 ±0)` - // Estimated: `14582` - // Minimum execution time: 30_781_000 picoseconds. - Weight::from_parts(36_339_461, 14582) - // Standard Error: 5_712 - .saturating_add(Weight::from_parts(106_410, 0).saturating_mul(s.into())) + // Measured: `591 + s * (3 ±0)` + // Estimated: `11003` + // Minimum execution time: 23_597_000 picoseconds. + Weight::from_parts(26_704_574, 11003) + // Standard Error: 1_776 + .saturating_add(Weight::from_parts(19_797, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -321,12 +321,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `s` is `[1, 100]`. fn remove_sub (s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `956 + s * (35 ±0)` - // Estimated: `24885` - // Minimum execution time: 79_122_000 picoseconds. - Weight::from_parts(86_539_531, 24885) - // Standard Error: 12_333 - .saturating_add(Weight::from_parts(330_446, 0).saturating_mul(s.into())) + // Measured: `1174 + s * (35 ±0)` + // Estimated: `11003` + // Minimum execution time: 63_447_000 picoseconds. + Weight::from_parts(69_904_554, 11003) + // Standard Error: 4_285 + .saturating_add(Weight::from_parts(54_384, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -339,12 +339,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `s` is `[0, 99]`. fn quit_sub (s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `882 + s * (37 ±0)` - // Estimated: `16472` - // Minimum execution time: 128_616_000 picoseconds. - Weight::from_parts(143_077_089, 16472) - // Standard Error: 21_048 - .saturating_add(Weight::from_parts(217_420, 0).saturating_mul(s.into())) + // Measured: `1100 + s * (37 ±0)` + // Estimated: `6723` + // Minimum execution time: 103_998_000 picoseconds. + Weight::from_parts(108_496_768, 6723) + // Standard Error: 4_429 + .saturating_add(Weight::from_parts(86_220, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } diff --git a/parachain/runtime/interlay/src/weights/pallet_membership.rs b/parachain/runtime/interlay/src/weights/pallet_membership.rs index 8852e70d89..fcdb95b9d9 100644 --- a/parachain/runtime/interlay/src/weights/pallet_membership.rs +++ b/parachain/runtime/interlay/src/weights/pallet_membership.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_membership //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -52,14 +52,14 @@ impl pallet_membership::WeightInfo for WeightInfo { fn add_member (m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `135 + m * (64 ±0)` - // Estimated: `6574 + m * (192 ±0)` - // Minimum execution time: 36_135_000 picoseconds. - Weight::from_parts(40_099_506, 6574) - // Standard Error: 5_392 - .saturating_add(Weight::from_parts(69_878, 0).saturating_mul(m.into())) + // Estimated: `4687 + m * (64 ±0)` + // Minimum execution time: 29_359_000 picoseconds. + Weight::from_parts(30_811_808, 4687) + // Standard Error: 1_728 + .saturating_add(Weight::from_parts(49_864, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:1) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -75,14 +75,14 @@ impl pallet_membership::WeightInfo for WeightInfo { fn remove_member (m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `239 + m * (64 ±0)` - // Estimated: `8403 + m * (192 ±0)` - // Minimum execution time: 42_745_000 picoseconds. - Weight::from_parts(46_076_131, 8403) - // Standard Error: 7_343 - .saturating_add(Weight::from_parts(65_455, 0).saturating_mul(m.into())) + // Estimated: `4687 + m * (64 ±0)` + // Minimum execution time: 33_688_000 picoseconds. + Weight::from_parts(35_819_967, 4687) + // Standard Error: 1_925 + .saturating_add(Weight::from_parts(40_006, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:1) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -98,14 +98,14 @@ impl pallet_membership::WeightInfo for WeightInfo { fn swap_member (m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `239 + m * (64 ±0)` - // Estimated: `8403 + m * (192 ±0)` - // Minimum execution time: 42_750_000 picoseconds. - Weight::from_parts(46_324_805, 8403) - // Standard Error: 4_636 - .saturating_add(Weight::from_parts(81_716, 0).saturating_mul(m.into())) + // Estimated: `4687 + m * (64 ±0)` + // Minimum execution time: 33_707_000 picoseconds. + Weight::from_parts(35_899_102, 4687) + // Standard Error: 2_114 + .saturating_add(Weight::from_parts(58_918, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:1) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -121,14 +121,14 @@ impl pallet_membership::WeightInfo for WeightInfo { fn reset_member (m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `239 + m * (64 ±0)` - // Estimated: `8403 + m * (192 ±0)` - // Minimum execution time: 40_881_000 picoseconds. - Weight::from_parts(46_277_495, 8403) - // Standard Error: 7_454 - .saturating_add(Weight::from_parts(306_640, 0).saturating_mul(m.into())) + // Estimated: `4687 + m * (64 ±0)` + // Minimum execution time: 33_427_000 picoseconds. + Weight::from_parts(36_483_001, 4687) + // Standard Error: 3_091 + .saturating_add(Weight::from_parts(209_236, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:1) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -144,14 +144,14 @@ impl pallet_membership::WeightInfo for WeightInfo { fn change_key (m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `239 + m * (64 ±0)` - // Estimated: `8403 + m * (192 ±0)` - // Minimum execution time: 43_327_000 picoseconds. - Weight::from_parts(48_319_947, 8403) - // Standard Error: 7_030 - .saturating_add(Weight::from_parts(81_382, 0).saturating_mul(m.into())) + // Estimated: `4687 + m * (64 ±0)` + // Minimum execution time: 34_429_000 picoseconds. + Weight::from_parts(36_744_041, 4687) + // Standard Error: 2_154 + .saturating_add(Weight::from_parts(60_320, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) - .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:0) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -163,11 +163,11 @@ impl pallet_membership::WeightInfo for WeightInfo { fn set_prime (m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `31 + m * (32 ±0)` - // Estimated: `4718 + m * (32 ±0)` - // Minimum execution time: 16_867_000 picoseconds. - Weight::from_parts(17_803_828, 4718) - // Standard Error: 2_856 - .saturating_add(Weight::from_parts(25_226, 0).saturating_mul(m.into())) + // Estimated: `4687 + m * (32 ±0)` + // Minimum execution time: 13_366_000 picoseconds. + Weight::from_parts(14_277_554, 4687) + // Standard Error: 635 + .saturating_add(Weight::from_parts(9_514, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into())) @@ -177,14 +177,12 @@ impl pallet_membership::WeightInfo for WeightInfo { /// Storage: TechnicalCommittee Prime (r:0 w:1) /// Proof Skipped: TechnicalCommittee Prime (max_values: Some(1), max_size: None, mode: Measured) /// The range of component `m` is `[1, 100]`. - fn clear_prime (m: u32, ) -> Weight { + fn clear_prime (_m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 7_977_000 picoseconds. - Weight::from_parts(8_590_771, 0) - // Standard Error: 2_369 - .saturating_add(Weight::from_parts(6_119, 0).saturating_mul(m.into())) + // Minimum execution time: 6_574_000 picoseconds. + Weight::from_parts(7_091_990, 0) .saturating_add(T::DbWeight::get().writes(2_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/pallet_multisig.rs b/parachain/runtime/interlay/src/weights/pallet_multisig.rs index 7e5fc6c256..7fa7ac2cb6 100644 --- a/parachain/runtime/interlay/src/weights/pallet_multisig.rs +++ b/parachain/runtime/interlay/src/weights/pallet_multisig.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_multisig //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -45,10 +45,10 @@ impl pallet_multisig::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 40_254_000 picoseconds. - Weight::from_parts(45_954_521, 0) - // Standard Error: 78 - .saturating_add(Weight::from_parts(1_088, 0).saturating_mul(z.into())) + // Minimum execution time: 20_220_000 picoseconds. + Weight::from_parts(21_500_794, 0) + // Standard Error: 51 + .saturating_add(Weight::from_parts(527, 0).saturating_mul(z.into())) } /// Storage: Multisig Multisigs (r:1 w:1) /// Proof: Multisig Multisigs (max_values: None, max_size: Some(3346), added: 5821, mode: MaxEncodedLen) @@ -58,14 +58,14 @@ impl pallet_multisig::WeightInfo for WeightInfo { /// The range of component `z` is `[0, 10000]`. fn as_multi_create (s: u32, z: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `679 + s * (3 ±0)` - // Estimated: `10391` - // Minimum execution time: 100_166_000 picoseconds. - Weight::from_parts(78_077_241, 10391) - // Standard Error: 12_891 - .saturating_add(Weight::from_parts(500_683, 0).saturating_mul(s.into())) - // Standard Error: 126 - .saturating_add(Weight::from_parts(2_720, 0).saturating_mul(z.into())) + // Measured: `785 + s * (2 ±0)` + // Estimated: `6811` + // Minimum execution time: 76_122_000 picoseconds. + Weight::from_parts(68_806_273, 6811) + // Standard Error: 4_377 + .saturating_add(Weight::from_parts(109_000, 0).saturating_mul(s.into())) + // Standard Error: 42 + .saturating_add(Weight::from_parts(1_352, 0).saturating_mul(z.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -77,12 +77,12 @@ impl pallet_multisig::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `210` // Estimated: `6811` - // Minimum execution time: 67_053_000 picoseconds. - Weight::from_parts(49_470_953, 6811) - // Standard Error: 10_765 - .saturating_add(Weight::from_parts(372_231, 0).saturating_mul(s.into())) - // Standard Error: 105 - .saturating_add(Weight::from_parts(2_250, 0).saturating_mul(z.into())) + // Minimum execution time: 43_367_000 picoseconds. + Weight::from_parts(38_850_566, 6811) + // Standard Error: 5_924 + .saturating_add(Weight::from_parts(84_915, 0).saturating_mul(s.into())) + // Standard Error: 58 + .saturating_add(Weight::from_parts(1_226, 0).saturating_mul(z.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -94,14 +94,14 @@ impl pallet_multisig::WeightInfo for WeightInfo { /// The range of component `z` is `[0, 10000]`. fn as_multi_complete (s: u32, z: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `820 + s * (35 ±0)` - // Estimated: `10391` - // Minimum execution time: 98_109_000 picoseconds. - Weight::from_parts(88_799_005, 10391) - // Standard Error: 15_677 - .saturating_add(Weight::from_parts(531_558, 0).saturating_mul(s.into())) - // Standard Error: 153 - .saturating_add(Weight::from_parts(2_801, 0).saturating_mul(z.into())) + // Measured: `927 + s * (34 ±0)` + // Estimated: `6811` + // Minimum execution time: 74_970_000 picoseconds. + Weight::from_parts(64_293_492, 6811) + // Standard Error: 8_085 + .saturating_add(Weight::from_parts(138_889, 0).saturating_mul(s.into())) + // Standard Error: 79 + .saturating_add(Weight::from_parts(1_554, 0).saturating_mul(z.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -112,12 +112,12 @@ impl pallet_multisig::WeightInfo for WeightInfo { /// The range of component `s` is `[2, 100]`. fn approve_as_multi_create (s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `681 + s * (3 ±0)` - // Estimated: `10391` - // Minimum execution time: 74_815_000 picoseconds. - Weight::from_parts(82_028_501, 10391) - // Standard Error: 14_163 - .saturating_add(Weight::from_parts(476_567, 0).saturating_mul(s.into())) + // Measured: `785 + s * (2 ±0)` + // Estimated: `6811` + // Minimum execution time: 61_033_000 picoseconds. + Weight::from_parts(63_605_389, 6811) + // Standard Error: 3_464 + .saturating_add(Weight::from_parts(117_310, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -128,10 +128,10 @@ impl pallet_multisig::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `210` // Estimated: `6811` - // Minimum execution time: 44_360_000 picoseconds. - Weight::from_parts(48_304_264, 6811) - // Standard Error: 11_358 - .saturating_add(Weight::from_parts(370_201, 0).saturating_mul(s.into())) + // Minimum execution time: 32_866_000 picoseconds. + Weight::from_parts(34_746_154, 6811) + // Standard Error: 2_804 + .saturating_add(Weight::from_parts(78_497, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -142,12 +142,12 @@ impl pallet_multisig::WeightInfo for WeightInfo { /// The range of component `s` is `[2, 100]`. fn cancel_as_multi (s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `887 + s * (3 ±0)` - // Estimated: `10391` - // Minimum execution time: 70_033_000 picoseconds. - Weight::from_parts(78_599_449, 10391) - // Standard Error: 16_395 - .saturating_add(Weight::from_parts(444_403, 0).saturating_mul(s.into())) + // Measured: `991 + s * (2 ±0)` + // Estimated: `6811` + // Minimum execution time: 56_042_000 picoseconds. + Weight::from_parts(57_944_956, 6811) + // Standard Error: 3_359 + .saturating_add(Weight::from_parts(93_599, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } diff --git a/parachain/runtime/interlay/src/weights/pallet_preimage.rs b/parachain/runtime/interlay/src/weights/pallet_preimage.rs index aca53cfd92..21a67dbd0b 100644 --- a/parachain/runtime/interlay/src/weights/pallet_preimage.rs +++ b/parachain/runtime/interlay/src/weights/pallet_preimage.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_preimage //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -49,12 +49,12 @@ impl pallet_preimage::WeightInfo for WeightInfo { /// The range of component `s` is `[0, 4194304]`. fn note_preimage (s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `361` - // Estimated: `7136` - // Minimum execution time: 70_471_000 picoseconds. - Weight::from_parts(70_690_000, 7136) - // Standard Error: 18 - .saturating_add(Weight::from_parts(4_530, 0).saturating_mul(s.into())) + // Measured: `578` + // Estimated: `3580` + // Minimum execution time: 56_674_000 picoseconds. + Weight::from_parts(56_744_000, 3580) + // Standard Error: 9 + .saturating_add(Weight::from_parts(2_253, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -67,10 +67,10 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `106` // Estimated: `3556` - // Minimum execution time: 38_328_000 picoseconds. - Weight::from_parts(38_931_000, 3556) - // Standard Error: 19 - .saturating_add(Weight::from_parts(4_408, 0).saturating_mul(s.into())) + // Minimum execution time: 30_431_000 picoseconds. + Weight::from_parts(30_621_000, 3556) + // Standard Error: 7 + .saturating_add(Weight::from_parts(2_235, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -83,10 +83,10 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `106` // Estimated: `3556` - // Minimum execution time: 36_339_000 picoseconds. - Weight::from_parts(36_680_000, 3556) - // Standard Error: 18 - .saturating_add(Weight::from_parts(4_436, 0).saturating_mul(s.into())) + // Minimum execution time: 28_828_000 picoseconds. + Weight::from_parts(28_978_000, 3556) + // Standard Error: 6 + .saturating_add(Weight::from_parts(2_180, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -98,10 +98,10 @@ impl pallet_preimage::WeightInfo for WeightInfo { /// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen) fn unnote_preimage () -> Weight { // Proof Size summary in bytes: - // Measured: `507` - // Estimated: `7136` - // Minimum execution time: 113_035_000 picoseconds. - Weight::from_parts(119_506_000, 7136) + // Measured: `724` + // Estimated: `3580` + // Minimum execution time: 77_946_000 picoseconds. + Weight::from_parts(82_034_000, 3580) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -113,8 +113,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `144` // Estimated: `3556` - // Minimum execution time: 80_343_000 picoseconds. - Weight::from_parts(84_433_000, 3556) + // Minimum execution time: 48_898_000 picoseconds. + Weight::from_parts(51_533_000, 3556) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -124,8 +124,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `188` // Estimated: `3556` - // Minimum execution time: 73_268_000 picoseconds. - Weight::from_parts(75_724_000, 3556) + // Minimum execution time: 44_018_000 picoseconds. + Weight::from_parts(46_012_000, 3556) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -135,8 +135,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `144` // Estimated: `3556` - // Minimum execution time: 48_665_000 picoseconds. - Weight::from_parts(50_252_000, 3556) + // Minimum execution time: 27_455_000 picoseconds. + Weight::from_parts(28_757_000, 3556) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -146,8 +146,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `42` // Estimated: `3556` - // Minimum execution time: 55_790_000 picoseconds. - Weight::from_parts(59_109_000, 3556) + // Minimum execution time: 24_489_000 picoseconds. + Weight::from_parts(25_091_000, 3556) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -157,8 +157,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `106` // Estimated: `3556` - // Minimum execution time: 25_495_000 picoseconds. - Weight::from_parts(25_914_000, 3556) + // Minimum execution time: 15_050_000 picoseconds. + Weight::from_parts(15_451_000, 3556) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -170,8 +170,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `144` // Estimated: `3556` - // Minimum execution time: 75_413_000 picoseconds. - Weight::from_parts(82_295_000, 3556) + // Minimum execution time: 46_563_000 picoseconds. + Weight::from_parts(48_607_000, 3556) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -181,8 +181,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `106` // Estimated: `3556` - // Minimum execution time: 25_370_000 picoseconds. - Weight::from_parts(27_662_000, 3556) + // Minimum execution time: 14_940_000 picoseconds. + Weight::from_parts(15_401_000, 3556) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -192,8 +192,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `106` // Estimated: `3556` - // Minimum execution time: 24_775_000 picoseconds. - Weight::from_parts(26_112_000, 3556) + // Minimum execution time: 14_850_000 picoseconds. + Weight::from_parts(15_461_000, 3556) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/parachain/runtime/interlay/src/weights/pallet_proxy.rs b/parachain/runtime/interlay/src/weights/pallet_proxy.rs index 7807d81405..3750697150 100644 --- a/parachain/runtime/interlay/src/weights/pallet_proxy.rs +++ b/parachain/runtime/interlay/src/weights/pallet_proxy.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_proxy //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -45,12 +45,12 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// The range of component `p` is `[1, 31]`. fn proxy (p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `199 + p * (37 ±0)` + // Measured: `251 + p * (37 ±0)` // Estimated: `4706` - // Minimum execution time: 39_254_000 picoseconds. - Weight::from_parts(41_395_129, 4706) - // Standard Error: 16_886 - .saturating_add(Weight::from_parts(174_688, 0).saturating_mul(p.into())) + // Minimum execution time: 30_912_000 picoseconds. + Weight::from_parts(30_623_419, 4706) + // Standard Error: 28_458 + .saturating_add(Weight::from_parts(166_114, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: Proxy Proxies (r:1 w:0) @@ -63,14 +63,14 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// The range of component `p` is `[1, 31]`. fn proxy_announced (a: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `771 + a * (68 ±0) + p * (37 ±0)` - // Estimated: `13984` - // Minimum execution time: 86_714_000 picoseconds. - Weight::from_parts(86_967_835, 13984) - // Standard Error: 35_642 - .saturating_add(Weight::from_parts(634_473, 0).saturating_mul(a.into())) - // Standard Error: 36_875 - .saturating_add(Weight::from_parts(287_102, 0).saturating_mul(p.into())) + // Measured: `1011 + a * (68 ±0) + p * (37 ±0)` + // Estimated: `5698` + // Minimum execution time: 67_565_000 picoseconds. + Weight::from_parts(69_851_107, 5698) + // Standard Error: 9_707 + .saturating_add(Weight::from_parts(307_439, 0).saturating_mul(a.into())) + // Standard Error: 10_043 + .saturating_add(Weight::from_parts(66_763, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -80,14 +80,16 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 31]`. - fn remove_announcement (a: u32, _p: u32, ) -> Weight { + fn remove_announcement (a: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `686 + a * (68 ±0)` - // Estimated: `9278` - // Minimum execution time: 57_027_000 picoseconds. - Weight::from_parts(63_497_142, 9278) - // Standard Error: 21_946 - .saturating_add(Weight::from_parts(472_425, 0).saturating_mul(a.into())) + // Measured: `926 + a * (68 ±0)` + // Estimated: `5698` + // Minimum execution time: 44_419_000 picoseconds. + Weight::from_parts(46_056_280, 5698) + // Standard Error: 7_299 + .saturating_add(Weight::from_parts(336_362, 0).saturating_mul(a.into())) + // Standard Error: 7_552 + .saturating_add(Weight::from_parts(36_898, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -97,16 +99,14 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) /// The range of component `a` is `[0, 31]`. /// The range of component `p` is `[1, 31]`. - fn reject_announcement (a: u32, p: u32, ) -> Weight { + fn reject_announcement (a: u32, _p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `686 + a * (68 ±0)` - // Estimated: `9278` - // Minimum execution time: 57_322_000 picoseconds. - Weight::from_parts(62_529_167, 9278) - // Standard Error: 22_606 - .saturating_add(Weight::from_parts(487_003, 0).saturating_mul(a.into())) - // Standard Error: 23_389 - .saturating_add(Weight::from_parts(34_848, 0).saturating_mul(p.into())) + // Measured: `926 + a * (68 ±0)` + // Estimated: `5698` + // Minimum execution time: 44_600_000 picoseconds. + Weight::from_parts(49_852_297, 5698) + // Standard Error: 29_970 + .saturating_add(Weight::from_parts(329_933, 0).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -120,14 +120,14 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// The range of component `p` is `[1, 31]`. fn announce (a: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `703 + a * (68 ±0) + p * (37 ±0)` - // Estimated: `13984` - // Minimum execution time: 82_431_000 picoseconds. - Weight::from_parts(91_399_563, 13984) - // Standard Error: 26_814 - .saturating_add(Weight::from_parts(465_023, 0).saturating_mul(a.into())) - // Standard Error: 27_742 - .saturating_add(Weight::from_parts(58_518, 0).saturating_mul(p.into())) + // Measured: `943 + a * (68 ±0) + p * (37 ±0)` + // Estimated: `5698` + // Minimum execution time: 67_575_000 picoseconds. + Weight::from_parts(75_659_905, 5698) + // Standard Error: 26_467 + .saturating_add(Weight::from_parts(129_800, 0).saturating_mul(a.into())) + // Standard Error: 27_383 + .saturating_add(Weight::from_parts(1_946, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -138,12 +138,12 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// The range of component `p` is `[1, 31]`. fn add_proxy (p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `518 + p * (37 ±0)` - // Estimated: `8286` - // Minimum execution time: 72_509_000 picoseconds. - Weight::from_parts(76_255_771, 8286) - // Standard Error: 24_340 - .saturating_add(Weight::from_parts(200_189, 0).saturating_mul(p.into())) + // Measured: `787 + p * (37 ±0)` + // Estimated: `4706` + // Minimum execution time: 59_289_000 picoseconds. + Weight::from_parts(62_123_571, 4706) + // Standard Error: 9_974 + .saturating_add(Weight::from_parts(99_746, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -154,12 +154,12 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// The range of component `p` is `[1, 31]`. fn remove_proxy (p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `518 + p * (37 ±0)` - // Estimated: `8286` - // Minimum execution time: 63_212_000 picoseconds. - Weight::from_parts(68_993_645, 8286) - // Standard Error: 23_840 - .saturating_add(Weight::from_parts(154_987, 0).saturating_mul(p.into())) + // Measured: `787 + p * (37 ±0)` + // Estimated: `4706` + // Minimum execution time: 51_914_000 picoseconds. + Weight::from_parts(54_858_482, 4706) + // Standard Error: 9_144 + .saturating_add(Weight::from_parts(71_177, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -170,12 +170,12 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// The range of component `p` is `[1, 31]`. fn remove_proxies (p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `518 + p * (37 ±0)` - // Estimated: `8286` - // Minimum execution time: 51_896_000 picoseconds. - Weight::from_parts(56_498_469, 8286) - // Standard Error: 23_386 - .saturating_add(Weight::from_parts(71_334, 0).saturating_mul(p.into())) + // Measured: `787 + p * (37 ±0)` + // Estimated: `4706` + // Minimum execution time: 42_415_000 picoseconds. + Weight::from_parts(44_192_608, 4706) + // Standard Error: 9_610 + .saturating_add(Weight::from_parts(20_010, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -184,14 +184,12 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// Storage: Tokens Accounts (r:1 w:1) /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) /// The range of component `p` is `[1, 31]`. - fn create_pure (p: u32, ) -> Weight { + fn create_pure (_p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `530` - // Estimated: `8286` - // Minimum execution time: 77_205_000 picoseconds. - Weight::from_parts(83_179_242, 8286) - // Standard Error: 24_024 - .saturating_add(Weight::from_parts(52_026, 0).saturating_mul(p.into())) + // Measured: `799` + // Estimated: `4706` + // Minimum execution time: 63_518_000 picoseconds. + Weight::from_parts(66_660_686, 4706) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -202,12 +200,12 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// The range of component `p` is `[0, 30]`. fn kill_pure (p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `588 + p * (37 ±0)` - // Estimated: `8286` - // Minimum execution time: 55_068_000 picoseconds. - Weight::from_parts(58_455_185, 8286) - // Standard Error: 21_996 - .saturating_add(Weight::from_parts(163_126, 0).saturating_mul(p.into())) + // Measured: `857 + p * (37 ±0)` + // Estimated: `4706` + // Minimum execution time: 44_059_000 picoseconds. + Weight::from_parts(45_682_855, 4706) + // Standard Error: 5_345 + .saturating_add(Weight::from_parts(2_697, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } diff --git a/parachain/runtime/interlay/src/weights/pallet_scheduler.rs b/parachain/runtime/interlay/src/weights/pallet_scheduler.rs index a1881f4ac1..71344e6c22 100644 --- a/parachain/runtime/interlay/src/weights/pallet_scheduler.rs +++ b/parachain/runtime/interlay/src/weights/pallet_scheduler.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_scheduler //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -46,8 +46,8 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `31` // Estimated: `1489` - // Minimum execution time: 8_044_000 picoseconds. - Weight::from_parts(8_634_000, 1489) + // Minimum execution time: 6_743_000 picoseconds. + Weight::from_parts(6_873_000, 1489) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -58,10 +58,10 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `78 + s * (177 ±0)` // Estimated: `26848` - // Minimum execution time: 8_111_000 picoseconds. - Weight::from_parts(13_422_815, 26848) - // Standard Error: 16_202 - .saturating_add(Weight::from_parts(1_883_059, 0).saturating_mul(s.into())) + // Minimum execution time: 6_623_000 picoseconds. + Weight::from_parts(11_341_429, 26848) + // Standard Error: 7_932 + .saturating_add(Weight::from_parts(1_230_127, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -69,8 +69,8 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 14_012_000 picoseconds. - Weight::from_parts(14_888_000, 0) + // Minimum execution time: 10_902_000 picoseconds. + Weight::from_parts(11_182_000, 0) } /// Storage: Preimage PreimageFor (r:1 w:1) /// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: Measured) @@ -80,11 +80,11 @@ impl pallet_scheduler::WeightInfo for WeightInfo { fn service_task_fetched (s: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `179 + s * (1 ±0)` - // Estimated: `7200 + s * (1 ±0)` - // Minimum execution time: 45_981_000 picoseconds. - Weight::from_parts(46_173_000, 7200) - // Standard Error: 45 - .saturating_add(Weight::from_parts(2_876, 0).saturating_mul(s.into())) + // Estimated: `3644 + s * (1 ±0)` + // Minimum execution time: 36_583_000 picoseconds. + Weight::from_parts(36_934_000, 3644) + // Standard Error: 22 + .saturating_add(Weight::from_parts(1_791, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(Weight::from_parts(0, 1).saturating_mul(s.into())) @@ -95,30 +95,30 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 18_120_000 picoseconds. - Weight::from_parts(18_965_000, 0) + // Minimum execution time: 14_349_000 picoseconds. + Weight::from_parts(14_479_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } fn service_task_periodic () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 14_192_000 picoseconds. - Weight::from_parts(15_645_000, 0) + // Minimum execution time: 10_942_000 picoseconds. + Weight::from_parts(11_083_000, 0) } fn execute_dispatch_signed () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 8_022_000 picoseconds. - Weight::from_parts(8_360_000, 0) + // Minimum execution time: 5_872_000 picoseconds. + Weight::from_parts(5_992_000, 0) } fn execute_dispatch_unsigned () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 7_773_000 picoseconds. - Weight::from_parts(9_017_000, 0) + // Minimum execution time: 5_761_000 picoseconds. + Weight::from_parts(5_992_000, 0) } /// Storage: Scheduler Agenda (r:1 w:1) /// Proof: Scheduler Agenda (max_values: None, max_size: Some(23383), added: 25858, mode: MaxEncodedLen) @@ -127,10 +127,10 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `78 + s * (177 ±0)` // Estimated: `26848` - // Minimum execution time: 32_145_000 picoseconds. - Weight::from_parts(38_211_053, 26848) - // Standard Error: 28_580 - .saturating_add(Weight::from_parts(2_069_526, 0).saturating_mul(s.into())) + // Minimum execution time: 25_642_000 picoseconds. + Weight::from_parts(29_967_259, 26848) + // Standard Error: 7_822 + .saturating_add(Weight::from_parts(1_177_376, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -143,10 +143,10 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `78 + s * (177 ±0)` // Estimated: `26848` - // Minimum execution time: 40_871_000 picoseconds. - Weight::from_parts(40_267_666, 26848) - // Standard Error: 24_016 - .saturating_add(Weight::from_parts(3_346_053, 0).saturating_mul(s.into())) + // Minimum execution time: 31_663_000 picoseconds. + Weight::from_parts(31_062_029, 26848) + // Standard Error: 12_580 + .saturating_add(Weight::from_parts(2_090_123, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -158,11 +158,11 @@ impl pallet_scheduler::WeightInfo for WeightInfo { fn schedule_named (s: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `186 + s * (189 ±0)` - // Estimated: `30361` - // Minimum execution time: 40_580_000 picoseconds. - Weight::from_parts(47_509_309, 30361) - // Standard Error: 20_892 - .saturating_add(Weight::from_parts(2_120_518, 0).saturating_mul(s.into())) + // Estimated: `26848` + // Minimum execution time: 31_794_000 picoseconds. + Weight::from_parts(37_514_363, 26848) + // Standard Error: 10_143 + .saturating_add(Weight::from_parts(1_211_221, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -174,11 +174,11 @@ impl pallet_scheduler::WeightInfo for WeightInfo { fn cancel_named (s: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `217 + s * (188 ±0)` - // Estimated: `30361` - // Minimum execution time: 43_914_000 picoseconds. - Weight::from_parts(43_551_431, 30361) - // Standard Error: 24_498 - .saturating_add(Weight::from_parts(3_425_193, 0).saturating_mul(s.into())) + // Estimated: `26848` + // Minimum execution time: 33_988_000 picoseconds. + Weight::from_parts(34_054_260, 26848) + // Standard Error: 10_277 + .saturating_add(Weight::from_parts(2_146_097, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } diff --git a/parachain/runtime/interlay/src/weights/pallet_timestamp.rs b/parachain/runtime/interlay/src/weights/pallet_timestamp.rs index 84aa72ba11..fd784224a3 100644 --- a/parachain/runtime/interlay/src/weights/pallet_timestamp.rs +++ b/parachain/runtime/interlay/src/weights/pallet_timestamp.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_timestamp //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -42,14 +42,14 @@ impl pallet_timestamp::WeightInfo for WeightInfo { /// Storage: Timestamp Now (r:1 w:1) /// Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) - /// Storage: Aura CurrentSlot (r:1 w:0) - /// Proof: Aura CurrentSlot (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) + /// Storage: unknown `0x13fe8e6572d0617ab8b9721f4e28cb46` (r:1 w:0) + /// Proof Skipped: unknown `0x13fe8e6572d0617ab8b9721f4e28cb46` (r:1 w:0) fn set () -> Weight { // Proof Size summary in bytes: - // Measured: `194` - // Estimated: `2986` - // Minimum execution time: 23_450_000 picoseconds. - Weight::from_parts(26_310_000, 2986) + // Measured: `166` + // Estimated: `3631` + // Minimum execution time: 15_692_000 picoseconds. + Weight::from_parts(16_192_000, 3631) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -57,7 +57,7 @@ impl pallet_timestamp::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `94` // Estimated: `0` - // Minimum execution time: 8_913_000 picoseconds. - Weight::from_parts(9_230_000, 0) + // Minimum execution time: 7_054_000 picoseconds. + Weight::from_parts(7_305_000, 0) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/pallet_utility.rs b/parachain/runtime/interlay/src/weights/pallet_utility.rs index bd5f59636b..0b65fb1f06 100644 --- a/parachain/runtime/interlay/src/weights/pallet_utility.rs +++ b/parachain/runtime/interlay/src/weights/pallet_utility.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_utility //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -45,43 +45,43 @@ impl pallet_utility::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 17_738_000 picoseconds. - Weight::from_parts(18_819_000, 0) - // Standard Error: 16_599 - .saturating_add(Weight::from_parts(13_437_537, 0).saturating_mul(c.into())) + // Minimum execution time: 13_637_000 picoseconds. + Weight::from_parts(14_143_347, 0) + // Standard Error: 7_460 + .saturating_add(Weight::from_parts(10_531_820, 0).saturating_mul(c.into())) } fn as_derivative () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 13_894_000 picoseconds. - Weight::from_parts(14_416_000, 0) + // Minimum execution time: 10_812_000 picoseconds. + Weight::from_parts(11_162_000, 0) } /// The range of component `c` is `[0, 1000]`. fn batch_all (c: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 17_668_000 picoseconds. - Weight::from_parts(17_755_000, 0) - // Standard Error: 18_220 - .saturating_add(Weight::from_parts(14_313_855, 0).saturating_mul(c.into())) + // Minimum execution time: 13_567_000 picoseconds. + Weight::from_parts(92_452_234, 0) + // Standard Error: 81_966 + .saturating_add(Weight::from_parts(11_112_221, 0).saturating_mul(c.into())) } fn dispatch_as () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 23_694_000 picoseconds. - Weight::from_parts(25_584_000, 0) + // Minimum execution time: 18_156_000 picoseconds. + Weight::from_parts(18_417_000, 0) } /// The range of component `c` is `[0, 1000]`. fn force_batch (c: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 17_832_000 picoseconds. - Weight::from_parts(5_470_709, 0) - // Standard Error: 28_314 - .saturating_add(Weight::from_parts(13_509_828, 0).saturating_mul(c.into())) + // Minimum execution time: 13_497_000 picoseconds. + Weight::from_parts(13_667_000, 0) + // Standard Error: 70_076 + .saturating_add(Weight::from_parts(10_839_741, 0).saturating_mul(c.into())) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/pallet_xcm.rs b/parachain/runtime/interlay/src/weights/pallet_xcm.rs index 5ba539ee4f..8a22d00eb7 100644 --- a/parachain/runtime/interlay/src/weights/pallet_xcm.rs +++ b/parachain/runtime/interlay/src/weights/pallet_xcm.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_xcm //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -53,9 +53,9 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn send () -> Weight { // Proof Size summary in bytes: // Measured: `107` - // Estimated: `9940` - // Minimum execution time: 65_179_000 picoseconds. - Weight::from_parts(71_351_000, 9940) + // Estimated: `3572` + // Minimum execution time: 48_888_000 picoseconds. + Weight::from_parts(49_649_000, 3572) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -65,20 +65,20 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: UnknownTokens ConcreteFungibleBalances (max_values: None, max_size: None, mode: Measured) fn teleport_assets () -> Weight { // Proof Size summary in bytes: - // Measured: `245` - // Estimated: `5199` - // Minimum execution time: 70_619_000 picoseconds. - Weight::from_parts(77_725_000, 5199) + // Measured: `282` + // Estimated: `3747` + // Minimum execution time: 53_066_000 picoseconds. + Weight::from_parts(54_038_000, 3747) .saturating_add(T::DbWeight::get().reads(2_u64)) } /// Storage: ParachainInfo ParachainId (r:1 w:0) /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) fn reserve_transfer_assets () -> Weight { // Proof Size summary in bytes: - // Measured: `32` + // Measured: `69` // Estimated: `1489` - // Minimum execution time: 50_092_000 picoseconds. - Weight::from_parts(53_236_000, 1489) + // Minimum execution time: 39_580_000 picoseconds. + Weight::from_parts(40_240_000, 1489) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: Benchmark Override (r:0 w:0) @@ -96,8 +96,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 24_237_000 picoseconds. - Weight::from_parts(25_925_000, 0) + // Minimum execution time: 18_748_000 picoseconds. + Weight::from_parts(18_968_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: PolkadotXcm SafeXcmVersion (r:0 w:1) @@ -106,8 +106,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 7_916_000 picoseconds. - Weight::from_parts(8_452_000, 0) + // Minimum execution time: 6_363_000 picoseconds. + Weight::from_parts(6_453_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: PolkadotXcm VersionNotifiers (r:1 w:1) @@ -129,9 +129,9 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn force_subscribe_version_notify () -> Weight { // Proof Size summary in bytes: // Measured: `107` - // Estimated: `15211` - // Minimum execution time: 74_887_000 picoseconds. - Weight::from_parts(82_833_000, 15211) + // Estimated: `3572` + // Minimum execution time: 58_518_000 picoseconds. + Weight::from_parts(59_028_000, 3572) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -152,20 +152,30 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn force_unsubscribe_version_notify () -> Weight { // Proof Size summary in bytes: // Measured: `290` - // Estimated: `14900` - // Minimum execution time: 75_636_000 picoseconds. - Weight::from_parts(79_084_000, 14900) + // Estimated: `3755` + // Minimum execution time: 58_778_000 picoseconds. + Weight::from_parts(59_099_000, 3755) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } + /// Storage: PolkadotXcm XcmExecutionSuspended (r:0 w:1) + /// Proof Skipped: PolkadotXcm XcmExecutionSuspended (max_values: Some(1), max_size: None, mode: Measured) + fn force_suspension () -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 6_182_000 picoseconds. + Weight::from_parts(6_603_000, 0) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } /// Storage: PolkadotXcm SupportedVersion (r:4 w:2) /// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured) fn migrate_supported_version () -> Weight { // Proof Size summary in bytes: // Measured: `162` // Estimated: `11052` - // Minimum execution time: 37_859_000 picoseconds. - Weight::from_parts(39_910_000, 11052) + // Minimum execution time: 31_032_000 picoseconds. + Weight::from_parts(31_633_000, 11052) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -175,8 +185,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `166` // Estimated: `11056` - // Minimum execution time: 37_743_000 picoseconds. - Weight::from_parts(38_610_000, 11056) + // Minimum execution time: 31_082_000 picoseconds. + Weight::from_parts(31_813_000, 11056) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -186,8 +196,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `173` // Estimated: `13538` - // Minimum execution time: 39_717_000 picoseconds. - Weight::from_parts(41_478_000, 13538) + // Minimum execution time: 32_806_000 picoseconds. + Weight::from_parts(33_317_000, 13538) .saturating_add(T::DbWeight::get().reads(5_u64)) } /// Storage: PolkadotXcm VersionNotifyTargets (r:2 w:1) @@ -205,9 +215,9 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn notify_current_targets () -> Weight { // Proof Size summary in bytes: // Measured: `174` - // Estimated: `16389` - // Minimum execution time: 69_610_000 picoseconds. - Weight::from_parts(77_275_000, 16389) + // Estimated: `6114` + // Minimum execution time: 54_690_000 picoseconds. + Weight::from_parts(55_060_000, 6114) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -217,8 +227,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `206` // Estimated: `8621` - // Minimum execution time: 22_273_000 picoseconds. - Weight::from_parts(22_672_000, 8621) + // Minimum execution time: 18_016_000 picoseconds. + Weight::from_parts(18_387_000, 8621) .saturating_add(T::DbWeight::get().reads(3_u64)) } /// Storage: PolkadotXcm VersionNotifyTargets (r:4 w:2) @@ -227,8 +237,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `173` // Estimated: `11063` - // Minimum execution time: 39_760_000 picoseconds. - Weight::from_parts(40_857_000, 11063) + // Minimum execution time: 31_664_000 picoseconds. + Weight::from_parts(33_247_000, 11063) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -247,16 +257,9 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn migrate_and_notify_old_targets () -> Weight { // Proof Size summary in bytes: // Measured: `177` - // Estimated: `21357` - // Minimum execution time: 88_134_000 picoseconds. - Weight::from_parts(97_021_000, 21357) - .saturating_add(T::DbWeight::get().reads(9_u64)) - .saturating_add(T::DbWeight::get().writes(4_u64)) - } - - fn force_suspension() -> Weight { - // todo: write and run benchmark - Weight::from_parts(97_021_000, 21357) + // Estimated: `11067` + // Minimum execution time: 66_794_000 picoseconds. + Weight::from_parts(67_596_000, 11067) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } diff --git a/parachain/runtime/interlay/src/weights/pallet_xcm_benchmarks_fungible.rs b/parachain/runtime/interlay/src/weights/pallet_xcm_benchmarks_fungible.rs index c44e4fd122..441c30d05c 100644 --- a/parachain/runtime/interlay/src/weights/pallet_xcm_benchmarks_fungible.rs +++ b/parachain/runtime/interlay/src/weights/pallet_xcm_benchmarks_fungible.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_xcm_benchmarks::fungible //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -48,10 +48,10 @@ impl WeightInfo { /// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(35), added: 2510, mode: MaxEncodedLen) pub fn withdraw_asset () -> Weight { // Proof Size summary in bytes: - // Measured: `544` - // Estimated: `11089` - // Minimum execution time: 63_422_000 picoseconds. - Weight::from_parts(75_445_000, 11089) + // Measured: `761` + // Estimated: `4226` + // Minimum execution time: 55_160_000 picoseconds. + Weight::from_parts(81_553_000, 4226) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -61,10 +61,10 @@ impl WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) pub fn transfer_asset () -> Weight { // Proof Size summary in bytes: - // Measured: `370` - // Estimated: `12366` - // Minimum execution time: 80_750_000 picoseconds. - Weight::from_parts(82_773_000, 12366) + // Measured: `715` + // Estimated: `6196` + // Minimum execution time: 71_543_000 picoseconds. + Weight::from_parts(72_395_000, 6196) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -86,10 +86,10 @@ impl WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) pub fn transfer_reserve_asset () -> Weight { // Proof Size summary in bytes: - // Measured: `509` - // Estimated: `25805` - // Minimum execution time: 134_171_000 picoseconds. - Weight::from_parts(140_144_000, 25805) + // Measured: `891` + // Estimated: `6196` + // Minimum execution time: 111_123_000 picoseconds. + Weight::from_parts(112_295_000, 6196) .saturating_add(T::DbWeight::get().reads(10_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -101,10 +101,10 @@ impl WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) pub fn deposit_asset () -> Weight { // Proof Size summary in bytes: - // Measured: `218` - // Estimated: `10673` - // Minimum execution time: 69_690_000 picoseconds. - Weight::from_parts(73_001_000, 10673) + // Measured: `513` + // Estimated: `3593` + // Minimum execution time: 57_986_000 picoseconds. + Weight::from_parts(58_517_000, 3593) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -128,10 +128,10 @@ impl WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) pub fn deposit_reserve_asset () -> Weight { // Proof Size summary in bytes: - // Measured: `357` - // Estimated: `23352` - // Minimum execution time: 126_531_000 picoseconds. - Weight::from_parts(128_286_000, 23352) + // Measured: `689` + // Estimated: `4154` + // Minimum execution time: 103_648_000 picoseconds. + Weight::from_parts(105_992_000, 4154) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -149,10 +149,10 @@ impl WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) pub fn initiate_teleport () -> Weight { // Proof Size summary in bytes: - // Measured: `139` - // Estimated: `11589` - // Minimum execution time: 66_860_000 picoseconds. - Weight::from_parts(79_180_000, 11589) + // Measured: `176` + // Estimated: `3641` + // Minimum execution time: 49_880_000 picoseconds. + Weight::from_parts(50_912_000, 3641) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } diff --git a/parachain/runtime/interlay/src/weights/pallet_xcm_benchmarks_generic.rs b/parachain/runtime/interlay/src/weights/pallet_xcm_benchmarks_generic.rs index eb977d473b..534dc34255 100644 --- a/parachain/runtime/interlay/src/weights/pallet_xcm_benchmarks_generic.rs +++ b/parachain/runtime/interlay/src/weights/pallet_xcm_benchmarks_generic.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_xcm_benchmarks::generic //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -54,10 +54,10 @@ impl WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) pub fn report_holding () -> Weight { // Proof Size summary in bytes: - // Measured: `139` - // Estimated: `11589` - // Minimum execution time: 161_504_000 picoseconds. - Weight::from_parts(179_386_000, 11589) + // Measured: `176` + // Estimated: `3641` + // Minimum execution time: 108_617_000 picoseconds. + Weight::from_parts(109_519_000, 3641) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -65,8 +65,8 @@ impl WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_605_000 picoseconds. - Weight::from_parts(5_302_000, 0) + // Minimum execution time: 3_006_000 picoseconds. + Weight::from_parts(3_066_000, 0) } /// Storage: PolkadotXcm Queries (r:1 w:0) /// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured) @@ -74,61 +74,61 @@ impl WeightInfo { // Proof Size summary in bytes: // Measured: `103` // Estimated: `3568` - // Minimum execution time: 24_352_000 picoseconds. - Weight::from_parts(26_768_000, 3568) + // Minimum execution time: 18_467_000 picoseconds. + Weight::from_parts(18_678_000, 3568) .saturating_add(T::DbWeight::get().reads(1_u64)) } pub fn transact () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 15_067_000 picoseconds. - Weight::from_parts(15_999_000, 0) + // Minimum execution time: 10_612_000 picoseconds. + Weight::from_parts(11_012_000, 0) } /// Storage: ParachainInfo ParachainId (r:1 w:0) /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) pub fn refund_surplus () -> Weight { // Proof Size summary in bytes: - // Measured: `32` + // Measured: `69` // Estimated: `1489` - // Minimum execution time: 14_037_000 picoseconds. - Weight::from_parts(15_172_000, 1489) + // Minimum execution time: 11_703_000 picoseconds. + Weight::from_parts(11_994_000, 1489) .saturating_add(T::DbWeight::get().reads(1_u64)) } pub fn set_error_handler () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_281_000 picoseconds. - Weight::from_parts(4_458_000, 0) + // Minimum execution time: 2_695_000 picoseconds. + Weight::from_parts(2_806_000, 0) } pub fn set_appendix () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_256_000 picoseconds. - Weight::from_parts(6_556_000, 0) + // Minimum execution time: 2_736_000 picoseconds. + Weight::from_parts(2_815_000, 0) } pub fn clear_error () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_217_000 picoseconds. - Weight::from_parts(6_289_000, 0) + // Minimum execution time: 2_605_000 picoseconds. + Weight::from_parts(2_695_000, 0) } pub fn descend_origin () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 5_375_000 picoseconds. - Weight::from_parts(5_847_000, 0) + // Minimum execution time: 3_407_000 picoseconds. + Weight::from_parts(3_507_000, 0) } pub fn clear_origin () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_119_000 picoseconds. - Weight::from_parts(4_250_000, 0) + // Minimum execution time: 2_575_000 picoseconds. + Weight::from_parts(2_725_000, 0) } /// Storage: ParachainInfo ParachainId (r:1 w:0) /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -144,10 +144,10 @@ impl WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) pub fn report_error () -> Weight { // Proof Size summary in bytes: - // Measured: `139` - // Estimated: `11589` - // Minimum execution time: 55_788_000 picoseconds. - Weight::from_parts(61_921_000, 11589) + // Measured: `176` + // Estimated: `3641` + // Minimum execution time: 43_447_000 picoseconds. + Weight::from_parts(43_928_000, 3641) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -157,8 +157,8 @@ impl WeightInfo { // Proof Size summary in bytes: // Measured: `160` // Estimated: `3625` - // Minimum execution time: 33_340_000 picoseconds. - Weight::from_parts(36_931_000, 3625) + // Minimum execution time: 25_631_000 picoseconds. + Weight::from_parts(26_152_000, 3625) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -166,8 +166,8 @@ impl WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_200_000 picoseconds. - Weight::from_parts(4_454_000, 0) + // Minimum execution time: 2_615_000 picoseconds. + Weight::from_parts(2_715_000, 0) } /// Storage: PolkadotXcm VersionNotifyTargets (r:1 w:1) /// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured) @@ -184,9 +184,9 @@ impl WeightInfo { pub fn subscribe_version () -> Weight { // Proof Size summary in bytes: // Measured: `107` - // Estimated: `13512` - // Minimum execution time: 61_838_000 picoseconds. - Weight::from_parts(64_080_000, 13512) + // Estimated: `3572` + // Minimum execution time: 49_099_000 picoseconds. + Weight::from_parts(49_399_000, 3572) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -196,8 +196,8 @@ impl WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 9_565_000 picoseconds. - Weight::from_parts(10_474_000, 0) + // Minimum execution time: 6_774_000 picoseconds. + Weight::from_parts(6_934_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: ParachainInfo ParachainId (r:1 w:0) @@ -214,10 +214,10 @@ impl WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) pub fn initiate_reserve_withdraw () -> Weight { // Proof Size summary in bytes: - // Measured: `139` - // Estimated: `11589` - // Minimum execution time: 154_343_000 picoseconds. - Weight::from_parts(165_251_000, 11589) + // Measured: `176` + // Estimated: `3641` + // Minimum execution time: 102_094_000 picoseconds. + Weight::from_parts(103_127_000, 3641) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -225,36 +225,36 @@ impl WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 30_106_000 picoseconds. - Weight::from_parts(31_191_000, 0) + // Minimum execution time: 17_415_000 picoseconds. + Weight::from_parts(17_505_000, 0) } pub fn expect_asset () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 6_040_000 picoseconds. - Weight::from_parts(6_502_000, 0) + // Minimum execution time: 3_868_000 picoseconds. + Weight::from_parts(3_998_000, 0) } pub fn expect_origin () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_319_000 picoseconds. - Weight::from_parts(4_916_000, 0) + // Minimum execution time: 2_746_000 picoseconds. + Weight::from_parts(2_856_000, 0) } pub fn expect_error () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_163_000 picoseconds. - Weight::from_parts(4_830_000, 0) + // Minimum execution time: 2_615_000 picoseconds. + Weight::from_parts(2_755_000, 0) } pub fn expect_transact_status () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_635_000 picoseconds. - Weight::from_parts(4_687_000, 0) + // Minimum execution time: 2_996_000 picoseconds. + Weight::from_parts(3_046_000, 0) } /// Storage: ParachainInfo ParachainId (r:1 w:0) /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -270,10 +270,10 @@ impl WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) pub fn query_pallet () -> Weight { // Proof Size summary in bytes: - // Measured: `139` - // Estimated: `11589` - // Minimum execution time: 84_125_000 picoseconds. - Weight::from_parts(86_998_000, 11589) + // Measured: `176` + // Estimated: `3641` + // Minimum execution time: 67_074_000 picoseconds. + Weight::from_parts(67_846_000, 3641) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -281,8 +281,8 @@ impl WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 25_588_000 picoseconds. - Weight::from_parts(26_555_000, 0) + // Minimum execution time: 22_164_000 picoseconds. + Weight::from_parts(22_566_000, 0) } /// Storage: ParachainInfo ParachainId (r:1 w:0) /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -298,10 +298,10 @@ impl WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) pub fn report_transact_status () -> Weight { // Proof Size summary in bytes: - // Measured: `139` - // Estimated: `11589` - // Minimum execution time: 56_117_000 picoseconds. - Weight::from_parts(67_543_000, 11589) + // Measured: `176` + // Estimated: `3641` + // Minimum execution time: 43_667_000 picoseconds. + Weight::from_parts(44_108_000, 3641) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -309,35 +309,35 @@ impl WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_335_000 picoseconds. - Weight::from_parts(6_706_000, 0) + // Minimum execution time: 2_786_000 picoseconds. + Weight::from_parts(2_875_000, 0) } pub fn set_topic () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_137_000 picoseconds. - Weight::from_parts(4_484_000, 0) + // Minimum execution time: 2_705_000 picoseconds. + Weight::from_parts(2_795_000, 0) } pub fn clear_topic () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_133_000 picoseconds. - Weight::from_parts(4_338_000, 0) + // Minimum execution time: 2_585_000 picoseconds. + Weight::from_parts(2_635_000, 0) } pub fn set_fees_mode () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_068_000 picoseconds. - Weight::from_parts(4_240_000, 0) + // Minimum execution time: 2_605_000 picoseconds. + Weight::from_parts(2_725_000, 0) } pub fn unpaid_execution () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_389_000 picoseconds. - Weight::from_parts(9_599_000, 0) + // Minimum execution time: 2_835_000 picoseconds. + Weight::from_parts(2_915_000, 0) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/redeem.rs b/parachain/runtime/interlay/src/weights/redeem.rs index 208a07378d..07f30bc059 100644 --- a/parachain/runtime/interlay/src/weights/redeem.rs +++ b/parachain/runtime/interlay/src/weights/redeem.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for redeem //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -40,8 +40,6 @@ pub struct WeightInfo(PhantomData); impl redeem::WeightInfo for WeightInfo { - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Tokens Accounts (r:2 w:1) /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) /// Storage: Fee RedeemFee (r:1 w:0) @@ -96,11 +94,11 @@ impl redeem::WeightInfo for WeightInfo { /// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(245), added: 2720, mode: MaxEncodedLen) fn request_redeem () -> Weight { // Proof Size summary in bytes: - // Measured: `2928` - // Estimated: `73398` - // Minimum execution time: 414_761_000 picoseconds. - Weight::from_parts(438_116_000, 73398) - .saturating_add(T::DbWeight::get().reads(29_u64)) + // Measured: `3155` + // Estimated: `6260` + // Minimum execution time: 310_652_000 picoseconds. + Weight::from_parts(313_168_000, 6260) + .saturating_add(T::DbWeight::get().reads(28_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } /// Storage: Tokens Accounts (r:3 w:3) @@ -129,10 +127,10 @@ impl redeem::WeightInfo for WeightInfo { /// Proof: Loans AccountDeposits (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) fn liquidation_redeem () -> Weight { // Proof Size summary in bytes: - // Measured: `1918` - // Estimated: `52855` - // Minimum execution time: 379_381_000 picoseconds. - Weight::from_parts(394_071_000, 52855) + // Measured: `2173` + // Estimated: `8760` + // Minimum execution time: 283_197_000 picoseconds. + Weight::from_parts(284_509_000, 8760) .saturating_add(T::DbWeight::get().reads(16_u64)) .saturating_add(T::DbWeight::get().writes(11_u64)) } @@ -162,23 +160,23 @@ impl redeem::WeightInfo for WeightInfo { /// The range of component `i` is `[1, 10]`. /// The range of component `o` is `[2, 3]`. /// The range of component `b` is `[541, 2048]`. - fn execute_redeem (h: u32, i: u32, _o: u32, b: u32, ) -> Weight { + fn execute_redeem (h: u32, i: u32, o: u32, b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `2122` - // Estimated: `29111` - // Minimum execution time: 242_719_000 picoseconds. - Weight::from_parts(223_820_863, 29111) - // Standard Error: 136_817 - .saturating_add(Weight::from_parts(8_379_355, 0).saturating_mul(h.into())) - // Standard Error: 123_343 - .saturating_add(Weight::from_parts(836_211, 0).saturating_mul(i.into())) - // Standard Error: 753 - .saturating_add(Weight::from_parts(4_951, 0).saturating_mul(b.into())) + // Measured: `2295 + o * (1 ±0)` + // Estimated: `3725` + // Minimum execution time: 183_618_000 picoseconds. + Weight::from_parts(155_534_743, 3725) + // Standard Error: 117_935 + .saturating_add(Weight::from_parts(3_687_939, 0).saturating_mul(h.into())) + // Standard Error: 106_320 + .saturating_add(Weight::from_parts(952_959, 0).saturating_mul(i.into())) + // Standard Error: 644_527 + .saturating_add(Weight::from_parts(862_990, 0).saturating_mul(o.into())) + // Standard Error: 649 + .saturating_add(Weight::from_parts(4_928, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Redeem RedeemRequests (r:1 w:1) /// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(245), added: 2720, mode: MaxEncodedLen) /// Storage: Redeem RedeemPeriod (r:1 w:0) @@ -250,11 +248,11 @@ impl redeem::WeightInfo for WeightInfo { /// Storage: VaultRewards TotalStake (r:1 w:1) /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultRewards RewardCurrencies (r:1 w:0) - /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) + /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(50), added: 2525, mode: MaxEncodedLen) /// Storage: VaultCapacity TotalStake (r:1 w:1) /// Proof: VaultCapacity TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: VaultCapacity RewardCurrencies (r:1 w:0) - /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(39), added: 2514, mode: MaxEncodedLen) /// Storage: Loans RewardSupplyState (r:1 w:1) /// Proof: Loans RewardSupplyState (max_values: None, max_size: Some(47), added: 2522, mode: MaxEncodedLen) /// Storage: Loans RewardSupplySpeed (r:1 w:0) @@ -269,15 +267,13 @@ impl redeem::WeightInfo for WeightInfo { /// Proof: VaultRegistry PunishmentDelay (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) fn cancel_redeem_reimburse () -> Weight { // Proof Size summary in bytes: - // Measured: `5091` - // Estimated: `179726` - // Minimum execution time: 1_189_309_000 picoseconds. - Weight::from_parts(1_214_681_000, 179726) - .saturating_add(T::DbWeight::get().reads(60_u64)) + // Measured: `5396` + // Estimated: `11350` + // Minimum execution time: 847_787_000 picoseconds. + Weight::from_parts(851_295_000, 11350) + .saturating_add(T::DbWeight::get().reads(59_u64)) .saturating_add(T::DbWeight::get().writes(29_u64)) } - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Redeem RedeemRequests (r:1 w:1) /// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(245), added: 2720, mode: MaxEncodedLen) /// Storage: Redeem RedeemPeriod (r:1 w:0) @@ -349,11 +345,11 @@ impl redeem::WeightInfo for WeightInfo { /// Storage: VaultRewards TotalStake (r:1 w:1) /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultRewards RewardCurrencies (r:1 w:0) - /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) + /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(50), added: 2525, mode: MaxEncodedLen) /// Storage: VaultCapacity TotalStake (r:1 w:1) /// Proof: VaultCapacity TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: VaultCapacity RewardCurrencies (r:1 w:0) - /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(39), added: 2514, mode: MaxEncodedLen) /// Storage: Loans RewardSupplyState (r:1 w:1) /// Proof: Loans RewardSupplyState (max_values: None, max_size: Some(47), added: 2522, mode: MaxEncodedLen) /// Storage: Loans RewardSupplySpeed (r:1 w:0) @@ -368,11 +364,11 @@ impl redeem::WeightInfo for WeightInfo { /// Proof: VaultRegistry PunishmentDelay (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) fn cancel_redeem_retry () -> Weight { // Proof Size summary in bytes: - // Measured: `5091` - // Estimated: `177216` - // Minimum execution time: 1_087_583_000 picoseconds. - Weight::from_parts(1_120_115_000, 177216) - .saturating_add(T::DbWeight::get().reads(59_u64)) + // Measured: `5396` + // Estimated: `11350` + // Minimum execution time: 775_122_000 picoseconds. + Weight::from_parts(783_890_000, 11350) + .saturating_add(T::DbWeight::get().reads(58_u64)) .saturating_add(T::DbWeight::get().writes(28_u64)) } /// Storage: Redeem RedeemPeriod (r:0 w:1) @@ -381,8 +377,8 @@ impl redeem::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 22_297_000 picoseconds. - Weight::from_parts(22_756_000, 0) + // Minimum execution time: 18_136_000 picoseconds. + Weight::from_parts(18_727_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: VaultRegistry Vaults (r:1 w:1) @@ -393,10 +389,10 @@ impl redeem::WeightInfo for WeightInfo { /// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(35), added: 2510, mode: MaxEncodedLen) fn self_redeem () -> Weight { // Proof Size summary in bytes: - // Measured: `1171` - // Estimated: `10805` - // Minimum execution time: 194_312_000 picoseconds. - Weight::from_parts(202_058_000, 10805) + // Measured: `1427` + // Estimated: `3725` + // Minimum execution time: 149_329_000 picoseconds. + Weight::from_parts(152_415_000, 3725) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } diff --git a/parachain/runtime/interlay/src/weights/replace.rs b/parachain/runtime/interlay/src/weights/replace.rs index 5c58c34c88..4e9c7c0970 100644 --- a/parachain/runtime/interlay/src/weights/replace.rs +++ b/parachain/runtime/interlay/src/weights/replace.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for replace //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -46,8 +46,6 @@ impl replace::WeightInfo for WeightInfo { /// Proof: Nomination Vaults (max_values: None, max_size: Some(71), added: 2546, mode: MaxEncodedLen) /// Storage: Replace ReplaceBtcDustValue (r:1 w:0) /// Proof: Replace ReplaceBtcDustValue (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: Fee ReplaceGriefingCollateral (r:1 w:0) @@ -56,11 +54,11 @@ impl replace::WeightInfo for WeightInfo { /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) fn request_replace () -> Weight { // Proof Size summary in bytes: - // Measured: `1777` - // Estimated: `18838` - // Minimum execution time: 174_897_000 picoseconds. - Weight::from_parts(181_413_000, 18838) - .saturating_add(T::DbWeight::get().reads(7_u64)) + // Measured: `2035` + // Estimated: `3725` + // Minimum execution time: 131_042_000 picoseconds. + Weight::from_parts(135_822_000, 3725) + .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } /// Storage: VaultRegistry Vaults (r:1 w:1) @@ -69,8 +67,8 @@ impl replace::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `701` // Estimated: `3725` - // Minimum execution time: 78_794_000 picoseconds. - Weight::from_parts(86_238_000, 3725) + // Minimum execution time: 55_932_000 picoseconds. + Weight::from_parts(58_086_000, 3725) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -117,15 +115,13 @@ impl replace::WeightInfo for WeightInfo { /// Storage: VaultRewards TotalStake (r:1 w:1) /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultRewards RewardCurrencies (r:1 w:0) - /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) + /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(50), added: 2525, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: VaultCapacity TotalStake (r:1 w:1) /// Proof: VaultCapacity TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: VaultCapacity RewardCurrencies (r:1 w:0) - /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(39), added: 2514, mode: MaxEncodedLen) /// Storage: Tokens Accounts (r:1 w:1) /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) /// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1) @@ -146,11 +142,11 @@ impl replace::WeightInfo for WeightInfo { /// Proof: Replace ReplaceRequests (max_values: None, max_size: Some(250), added: 2725, mode: MaxEncodedLen) fn accept_replace () -> Weight { // Proof Size summary in bytes: - // Measured: `4114` - // Estimated: `129743` - // Minimum execution time: 792_846_000 picoseconds. - Weight::from_parts(804_374_000, 129743) - .saturating_add(T::DbWeight::get().reads(43_u64)) + // Measured: `4306` + // Estimated: `6460` + // Minimum execution time: 623_749_000 picoseconds. + Weight::from_parts(628_388_000, 6460) + .saturating_add(T::DbWeight::get().reads(42_u64)) .saturating_add(T::DbWeight::get().writes(26_u64)) } /// Storage: Replace ReplaceRequests (r:1 w:1) @@ -179,18 +175,18 @@ impl replace::WeightInfo for WeightInfo { /// The range of component `b` is `[541, 2048]`. fn execute_pending_replace (h: u32, i: u32, o: u32, b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `3700` - // Estimated: `28351` - // Minimum execution time: 321_693_000 picoseconds. - Weight::from_parts(299_069_738, 28351) - // Standard Error: 116_546 - .saturating_add(Weight::from_parts(2_709_504, 0).saturating_mul(h.into())) - // Standard Error: 105_067 - .saturating_add(Weight::from_parts(1_555_605, 0).saturating_mul(i.into())) - // Standard Error: 636_932 - .saturating_add(Weight::from_parts(1_431_533, 0).saturating_mul(o.into())) - // Standard Error: 641 - .saturating_add(Weight::from_parts(8_464, 0).saturating_mul(b.into())) + // Measured: `3962` + // Estimated: `6460` + // Minimum execution time: 201_203_000 picoseconds. + Weight::from_parts(166_625_346, 6460) + // Standard Error: 77_399 + .saturating_add(Weight::from_parts(3_797_260, 0).saturating_mul(h.into())) + // Standard Error: 69_776 + .saturating_add(Weight::from_parts(1_249_996, 0).saturating_mul(i.into())) + // Standard Error: 422_991 + .saturating_add(Weight::from_parts(3_113_568, 0).saturating_mul(o.into())) + // Standard Error: 426 + .saturating_add(Weight::from_parts(3_662, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -214,8 +210,6 @@ impl replace::WeightInfo for WeightInfo { /// Proof: VaultRegistry Vaults (max_values: None, max_size: Some(260), added: 2735, mode: MaxEncodedLen) /// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0) /// Proof: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: VaultStaking Nonce (r:1 w:0) @@ -226,19 +220,21 @@ impl replace::WeightInfo for WeightInfo { /// The range of component `i` is `[1, 10]`. /// The range of component `o` is `[2, 3]`. /// The range of component `b` is `[541, 2048]`. - fn execute_cancelled_replace (h: u32, i: u32, _o: u32, b: u32, ) -> Weight { + fn execute_cancelled_replace (h: u32, i: u32, o: u32, b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `4006` - // Estimated: `40395` - // Minimum execution time: 387_665_000 picoseconds. - Weight::from_parts(383_077_649, 40395) - // Standard Error: 175_118 - .saturating_add(Weight::from_parts(2_479_693, 0).saturating_mul(h.into())) - // Standard Error: 157_871 - .saturating_add(Weight::from_parts(1_580_414, 0).saturating_mul(i.into())) - // Standard Error: 964 - .saturating_add(Weight::from_parts(4_640, 0).saturating_mul(b.into())) - .saturating_add(T::DbWeight::get().reads(15_u64)) + // Measured: `4084` + // Estimated: `6460` + // Minimum execution time: 244_751_000 picoseconds. + Weight::from_parts(221_003_188, 6460) + // Standard Error: 69_845 + .saturating_add(Weight::from_parts(3_504_737, 0).saturating_mul(h.into())) + // Standard Error: 62_966 + .saturating_add(Weight::from_parts(526_198, 0).saturating_mul(i.into())) + // Standard Error: 381_710 + .saturating_add(Weight::from_parts(2_470_971, 0).saturating_mul(o.into())) + // Standard Error: 384 + .saturating_add(Weight::from_parts(4_539, 0).saturating_mul(b.into())) + .saturating_add(T::DbWeight::get().reads(14_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } /// Storage: Replace ReplaceRequests (r:1 w:1) @@ -263,8 +259,6 @@ impl replace::WeightInfo for WeightInfo { /// Proof: VaultRegistry MinimumCollateralVault (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0) /// Proof: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1) @@ -301,11 +295,11 @@ impl replace::WeightInfo for WeightInfo { /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) fn cancel_replace () -> Weight { // Proof Size summary in bytes: - // Measured: `4406` - // Estimated: `118165` - // Minimum execution time: 723_347_000 picoseconds. - Weight::from_parts(746_025_000, 118165) - .saturating_add(T::DbWeight::get().reads(38_u64)) + // Measured: `4744` + // Estimated: `6460` + // Minimum execution time: 499_671_000 picoseconds. + Weight::from_parts(507_496_000, 6460) + .saturating_add(T::DbWeight::get().reads(37_u64)) .saturating_add(T::DbWeight::get().writes(19_u64)) } /// Storage: Replace ReplacePeriod (r:0 w:1) @@ -314,8 +308,8 @@ impl replace::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 22_574_000 picoseconds. - Weight::from_parts(23_334_000, 0) + // Minimum execution time: 17_806_000 picoseconds. + Weight::from_parts(18_467_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/security.rs b/parachain/runtime/interlay/src/weights/security.rs index dab8110d45..a34d043d73 100644 --- a/parachain/runtime/interlay/src/weights/security.rs +++ b/parachain/runtime/interlay/src/weights/security.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for security //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -34,34 +34,33 @@ use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; use sp_std::marker::PhantomData; -use frame_system::RawOrigin; /// Weights for security using the Substrate node and recommended hardware. pub struct WeightInfo(PhantomData); impl security::WeightInfo for WeightInfo { - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) + /// Storage: Security IsDeactivated (r:1 w:0) + /// Proof: Security IsDeactivated (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Security ActiveBlockCount (r:1 w:1) /// Proof: Security ActiveBlockCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) fn on_initialize () -> Weight { // Proof Size summary in bytes: - // Measured: `126` - // Estimated: `2975` - // Minimum execution time: 22_966_000 picoseconds. - Weight::from_parts(23_794_000, 2975) + // Measured: `99` + // Estimated: `1489` + // Minimum execution time: 17_345_000 picoseconds. + Weight::from_parts(18_226_000, 1489) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } - /// Storage: Security ParachainStatus (r:0 w:1) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) + /// Storage: Security IsDeactivated (r:0 w:1) + /// Proof: Security IsDeactivated (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) fn activate_counter () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_665_000 picoseconds. - Weight::from_parts(10_979_000, 0) + // Minimum execution time: 14_158_000 picoseconds. + Weight::from_parts(15_060_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/supply.rs b/parachain/runtime/interlay/src/weights/supply.rs index 346d903e3f..6e3f345469 100644 --- a/parachain/runtime/interlay/src/weights/supply.rs +++ b/parachain/runtime/interlay/src/weights/supply.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for supply //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -52,10 +52,10 @@ impl supply::WeightInfo for WeightInfo { /// Proof: Supply LastEmission (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) fn on_initialize () -> Weight { // Proof Size summary in bytes: - // Measured: `299` - // Estimated: `22547` - // Minimum execution time: 231_169_000 picoseconds. - Weight::from_parts(235_848_000, 22547) + // Measured: `606` + // Estimated: `11350` + // Minimum execution time: 197_536_000 picoseconds. + Weight::from_parts(199_199_000, 11350) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -65,8 +65,8 @@ impl supply::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 11_652_000 picoseconds. - Weight::from_parts(12_229_000, 0) + // Minimum execution time: 9_499_000 picoseconds. + Weight::from_parts(9_769_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/interlay/src/weights/tx_pause.rs b/parachain/runtime/interlay/src/weights/tx_pause.rs index 89ec621090..d22e2ed604 100644 --- a/parachain/runtime/interlay/src/weights/tx_pause.rs +++ b/parachain/runtime/interlay/src/weights/tx_pause.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for tx_pause //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -46,8 +46,8 @@ impl tx_pause::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `3` // Estimated: `6494` - // Minimum execution time: 39_692_000 picoseconds. - Weight::from_parts(41_248_000, 6494) + // Minimum execution time: 32_074_000 picoseconds. + Weight::from_parts(32_575_000, 6494) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -57,8 +57,8 @@ impl tx_pause::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `308` // Estimated: `6494` - // Minimum execution time: 45_488_000 picoseconds. - Weight::from_parts(46_533_000, 6494) + // Minimum execution time: 36_412_000 picoseconds. + Weight::from_parts(37_174_000, 6494) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/parachain/runtime/interlay/src/weights/vault_registry.rs b/parachain/runtime/interlay/src/weights/vault_registry.rs index d210cd78e3..5cb215bb7e 100644 --- a/parachain/runtime/interlay/src/weights/vault_registry.rs +++ b/parachain/runtime/interlay/src/weights/vault_registry.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for vault_registry //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-jrrg4`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("interlay-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/interlay/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -112,19 +112,17 @@ impl vault_registry::WeightInfo for WeightInfo { /// Proof: Loans MinExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) /// Storage: Loans MaxExchangeRate (r:1 w:0) /// Proof: Loans MaxExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1) /// Proof: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) fn register_vault () -> Weight { // Proof Size summary in bytes: - // Measured: `2500` - // Estimated: `153273` - // Minimum execution time: 599_603_000 picoseconds. - Weight::from_parts(620_154_000, 153273) - .saturating_add(T::DbWeight::get().reads(48_u64)) + // Measured: `2723` + // Estimated: `6260` + // Minimum execution time: 470_102_000 picoseconds. + Weight::from_parts(474_480_000, 6260) + .saturating_add(T::DbWeight::get().reads(47_u64)) .saturating_add(T::DbWeight::get().writes(17_u64)) } /// Storage: VaultRegistry VaultBitcoinPublicKey (r:1 w:1) @@ -133,8 +131,8 @@ impl vault_registry::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `365` // Estimated: `3546` - // Minimum execution time: 41_173_000 picoseconds. - Weight::from_parts(41_816_000, 3546) + // Minimum execution time: 30_792_000 picoseconds. + Weight::from_parts(31_042_000, 3546) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -190,17 +188,15 @@ impl vault_registry::WeightInfo for WeightInfo { /// Proof: Loans MinExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) /// Storage: Loans MaxExchangeRate (r:1 w:0) /// Proof: Loans MaxExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) fn accept_new_issues () -> Weight { // Proof Size summary in bytes: - // Measured: `3442` - // Estimated: `111557` - // Minimum execution time: 484_070_000 picoseconds. - Weight::from_parts(505_433_000, 111557) - .saturating_add(T::DbWeight::get().reads(36_u64)) + // Measured: `3665` + // Estimated: `6260` + // Minimum execution time: 372_286_000 picoseconds. + Weight::from_parts(375_271_000, 6260) + .saturating_add(T::DbWeight::get().reads(35_u64)) .saturating_add(T::DbWeight::get().writes(12_u64)) } /// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0) @@ -255,17 +251,15 @@ impl vault_registry::WeightInfo for WeightInfo { /// Proof: Loans MinExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) /// Storage: Loans MaxExchangeRate (r:1 w:0) /// Proof: Loans MaxExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) fn set_custom_secure_threshold () -> Weight { // Proof Size summary in bytes: - // Measured: `3442` - // Estimated: `111557` - // Minimum execution time: 491_781_000 picoseconds. - Weight::from_parts(504_920_000, 111557) - .saturating_add(T::DbWeight::get().reads(36_u64)) + // Measured: `3665` + // Estimated: `6260` + // Minimum execution time: 370_863_000 picoseconds. + Weight::from_parts(377_126_000, 6260) + .saturating_add(T::DbWeight::get().reads(35_u64)) .saturating_add(T::DbWeight::get().writes(12_u64)) } /// Storage: VaultRegistry MinimumCollateralVault (r:0 w:1) @@ -274,8 +268,8 @@ impl vault_registry::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 12_864_000 picoseconds. - Weight::from_parts(13_979_000, 0) + // Minimum execution time: 10_281_000 picoseconds. + Weight::from_parts(10_431_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: VaultRegistry SystemCollateralCeiling (r:0 w:1) @@ -284,8 +278,8 @@ impl vault_registry::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 13_539_000 picoseconds. - Weight::from_parts(14_105_000, 0) + // Minimum execution time: 10_441_000 picoseconds. + Weight::from_parts(10_581_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: VaultRegistry SecureCollateralThreshold (r:0 w:1) @@ -294,8 +288,8 @@ impl vault_registry::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 25_949_000 picoseconds. - Weight::from_parts(26_888_000, 0) + // Minimum execution time: 20_171_000 picoseconds. + Weight::from_parts(20_662_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: VaultRegistry PremiumRedeemThreshold (r:0 w:1) @@ -304,8 +298,8 @@ impl vault_registry::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 26_027_000 picoseconds. - Weight::from_parts(27_337_000, 0) + // Minimum execution time: 20_311_000 picoseconds. + Weight::from_parts(20_812_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: VaultRegistry LiquidationCollateralThreshold (r:0 w:1) @@ -314,8 +308,8 @@ impl vault_registry::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 42_707_000 picoseconds. - Weight::from_parts(50_021_000, 0) + // Minimum execution time: 20_170_000 picoseconds. + Weight::from_parts(20_982_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: VaultRegistry Vaults (r:1 w:1) @@ -348,8 +342,6 @@ impl vault_registry::WeightInfo for WeightInfo { /// Proof: Loans MinExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) /// Storage: Loans MaxExchangeRate (r:1 w:0) /// Proof: Loans MaxExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: VaultStaking Stake (r:1 w:1) @@ -358,7 +350,7 @@ impl vault_registry::WeightInfo for WeightInfo { /// Proof: VaultStaking SlashPerToken (max_values: None, max_size: Some(106), added: 2581, mode: MaxEncodedLen) /// Storage: VaultStaking SlashTally (r:1 w:1) /// Proof: VaultStaking SlashTally (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) - /// Storage: VaultCapacity Stake (r:1 w:1) + /// Storage: VaultCapacity Stake (r:1 w:0) /// Proof: VaultCapacity Stake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultCapacity RewardPerToken (r:2 w:0) /// Proof: VaultCapacity RewardPerToken (max_values: None, max_size: Some(59), added: 2534, mode: MaxEncodedLen) @@ -384,14 +376,10 @@ impl vault_registry::WeightInfo for WeightInfo { /// Proof: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) /// Storage: VaultRewards TotalStake (r:1 w:1) /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) - /// Storage: VaultCapacity TotalStake (r:1 w:1) - /// Proof: VaultCapacity TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) - /// Storage: VaultCapacity RewardCurrencies (r:1 w:0) - /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) /// Storage: VaultStaking RewardTally (r:2 w:2) /// Proof: VaultStaking RewardTally (max_values: None, max_size: Some(149), added: 2624, mode: MaxEncodedLen) /// Storage: VaultRewards RewardCurrencies (r:1 w:0) - /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) + /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(50), added: 2525, mode: MaxEncodedLen) /// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1) /// Proof: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) /// Storage: Loans RewardSupplyState (r:1 w:1) @@ -410,12 +398,12 @@ impl vault_registry::WeightInfo for WeightInfo { /// Proof: VaultRegistry LiquidationVault (max_values: None, max_size: Some(124), added: 2599, mode: MaxEncodedLen) fn report_undercollateralized_vault () -> Weight { // Proof Size summary in bytes: - // Measured: `4670` - // Estimated: `190133` - // Minimum execution time: 1_770_343_000 picoseconds. - Weight::from_parts(1_812_136_000, 190133) - .saturating_add(T::DbWeight::get().reads(60_u64)) - .saturating_add(T::DbWeight::get().writes(32_u64)) + // Measured: `4926` + // Estimated: `8799` + // Minimum execution time: 1_391_186_000 picoseconds. + Weight::from_parts(1_425_946_000, 8799) + .saturating_add(T::DbWeight::get().reads(57_u64)) + .saturating_add(T::DbWeight::get().writes(30_u64)) } /// Storage: VaultRegistry Vaults (r:1 w:1) /// Proof: VaultRegistry Vaults (max_values: None, max_size: Some(260), added: 2735, mode: MaxEncodedLen) @@ -423,8 +411,8 @@ impl vault_registry::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `669` // Estimated: `3725` - // Minimum execution time: 43_053_000 picoseconds. - Weight::from_parts(46_600_000, 3725) + // Minimum execution time: 30_451_000 picoseconds. + Weight::from_parts(31_273_000, 3725) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/parachain/runtime/interlay/src/xcm_config.rs b/parachain/runtime/interlay/src/xcm_config.rs index 1cb0f0e598..0baafddf3f 100644 --- a/parachain/runtime/interlay/src/xcm_config.rs +++ b/parachain/runtime/interlay/src/xcm_config.rs @@ -217,6 +217,7 @@ impl xcm_executor::Config for XcmConfig { type SafeCallFilter = SafeCallFilter; type CallDispatcher = WithOriginFilter; type UniversalLocation = UniversalLocation; + type Aliasers = Nothing; } /// No local origins on this chain are allowed to dispatch XCM sends/executions. @@ -261,6 +262,8 @@ impl pallet_xcm::Config for Runtime { #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; type AdminOrigin = EnsureRoot; + type MaxRemoteLockConsumers = ConstU32<0>; + type RemoteLockConsumerIdentifier = (); } impl cumulus_pallet_xcm::Config for Runtime { @@ -587,6 +590,11 @@ mod benchmark_impls { // We don't support exporting messages Err(BenchmarkError::Skip) } + + fn alias_origin() -> Result<(MultiLocation, MultiLocation), BenchmarkError> { + // The XCM executor of Polkadot doesn't have a configured `Aliasers` + Err(BenchmarkError::Skip) + } } } diff --git a/parachain/runtime/kintsugi/Cargo.toml b/parachain/runtime/kintsugi/Cargo.toml index 2ef39bee03..6f75eafa70 100644 --- a/parachain/runtime/kintsugi/Cargo.toml +++ b/parachain/runtime/kintsugi/Cargo.toml @@ -9,7 +9,7 @@ targets = ['x86_64-unknown-linux-gnu'] [dependencies] log = { version = "0.4.17", default-features = false } -serde = { version = "1.0.130", default-features = false, features = ["derive"], optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } hex-literal = { version = "0.3.1" } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -32,7 +32,7 @@ sp-weights = { git = "https://github.com/paritytech/substrate", branch = "polkad frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false } frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false } frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false, optional = true } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false, optional = true} frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false, optional = true } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false } pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false } @@ -137,7 +137,7 @@ orml-asset-registry= { git = "https://github.com/open-web3-stack/open-runtime-mo # Frontier dependencies fp-rpc = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42", default-features = false } -fp-self-contained = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42", default-features = false } +fp-self-contained = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42", default-features = false, features = ["serde"] } pallet-base-fee = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42", default-features = false } pallet-ethereum = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42", default-features = false } pallet-evm = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42", default-features = false } @@ -162,7 +162,7 @@ disable-runtime-api = [] vesting-any = [] std = [ "log/std", - "serde", + "serde/std", "codec/std", "sp-std/std", @@ -304,6 +304,7 @@ runtime-benchmarks = [ "pallet-society/runtime-benchmarks", "cumulus-pallet-xcmp-queue/runtime-benchmarks", + "cumulus-pallet-parachain-system/runtime-benchmarks", "pallet-xcm/runtime-benchmarks", "pallet-xcm-benchmarks/runtime-benchmarks", diff --git a/parachain/runtime/kintsugi/src/contracts.rs b/parachain/runtime/kintsugi/src/contracts.rs index 9347f866aa..0c5d778970 100644 --- a/parachain/runtime/kintsugi/src/contracts.rs +++ b/parachain/runtime/kintsugi/src/contracts.rs @@ -1,5 +1,4 @@ -use crate::{BaseCallFilter, NativeCurrency, Runtime, RuntimeCall, RuntimeEvent, Timestamp, Weight}; -use bitcoin::types::{MerkleProof, Transaction}; +use crate::{NativeCurrency, Runtime, RuntimeCall, RuntimeEvent, Timestamp, Weight}; use btc_relay::FullTransactionProof; use codec::{Decode, Encode}; use frame_support::{ @@ -36,14 +35,16 @@ impl Convert for DummyWeightPrice { // contracts parameter_types! { pub const DeletionQueueDepth: u32 = 10; - pub const DeletionWeightLimit: Weight = Weight::from_ref_time(100000000 as u64); pub const DepositPerByte: Balance = 1; pub const DepositPerItem: Balance = 1; - pub const MaxCodeLen: u32 = 123 * 1024; + // can't increase much beyond 400k unless we decrease max call stack height + pub const MaxCodeLen: u32 = 400_000; pub const MaxStorageKeyLen: u32 = 128; pub const UnsafeUnstableInterface: bool = false; pub const MaxDebugBufferLen: u32 = 2 * 1024 * 1024; pub const DefaultDepositLimit: Balance = 1_000_000_000_000; + // address 943dd009e661df00c8a21661ce6b89d4 + pub storage EnableContracts: bool = false; } pub struct NativeCurrencyWithEd; @@ -266,7 +267,7 @@ impl pallet_contracts::Config for Runtime { type WeightInfo = (); type ChainExtension = BtcRelayExtension; type Schedule = DefaultSchedule; - type CallStack = [pallet_contracts::Frame; 5]; + type CallStack = [pallet_contracts::Frame; 1]; type DepositPerByte = DepositPerByte; type DepositPerItem = DepositPerItem; type DefaultDepositLimit = DefaultDepositLimit; @@ -275,4 +276,5 @@ impl pallet_contracts::Config for Runtime { type MaxStorageKeyLen = MaxStorageKeyLen; type UnsafeUnstableInterface = UnsafeUnstableInterface; type MaxDebugBufferLen = MaxDebugBufferLen; + type Migrations = (); } diff --git a/parachain/runtime/kintsugi/src/lib.rs b/parachain/runtime/kintsugi/src/lib.rs index d5ed050368..32afda18f3 100644 --- a/parachain/runtime/kintsugi/src/lib.rs +++ b/parachain/runtime/kintsugi/src/lib.rs @@ -1,8 +1,8 @@ //! The kintsugi runtime. This can be compiled with `#[no_std]`, ready for Wasm. #![cfg_attr(not(feature = "std"), no_std)] -// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. -#![recursion_limit = "256"] +// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 512. +#![recursion_limit = "512"] // Make the WASM binary available. #[cfg(feature = "std")] @@ -60,7 +60,7 @@ pub use frame_support::{ construct_runtime, dispatch::DispatchClass, parameter_types, - traits::{Everything, Get, KeyOwnerProofSystem, LockIdentifier, Nothing}, + traits::{ConstBool, Everything, Get, KeyOwnerProofSystem, LockIdentifier, Nothing}, weights::{ constants::{RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND}, IdentityFee, Weight, @@ -100,6 +100,9 @@ pub mod evm; type VaultId = primitives::VaultId; +type EventRecord = + frame_system::EventRecord<::RuntimeEvent, ::Hash>; + impl_opaque_keys! { pub struct SessionKeys { pub aura: Aura, @@ -112,10 +115,13 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("kintsugi-parachain"), impl_name: create_runtime_str!("kintsugi-parachain"), authoring_version: 1, - spec_version: 1025000, + spec_version: 1025002, impl_version: 1, - transaction_version: 4, + #[cfg(not(feature = "disable-runtime-api"))] apis: RUNTIME_API_VERSIONS, + #[cfg(feature = "disable-runtime-api")] + apis: sp_version::create_apis_vec![[]], + transaction_version: 4, state_version: 0, }; @@ -196,11 +202,15 @@ impl Contains for BaseCallFilter { ) { // always allow core calls true - } else if let RuntimeCall::PolkadotXcm(_) = call { - // For security reasons, disallow usage of the xcm package by users. Sudo and + } else if let RuntimeCall::PolkadotXcm(polkadot_xcm_call) = call { + // For security reasons, disallow most usage of the xcm package by users. Sudo and // governance are still able to call these (sudo is explicitly white-listed, while // governance bypasses this call filter). - false + + // We do allow PolkadotXcm.send - it's needed for e.g. wormhole interactions on + // moonbeam/moonriver. We could probably also allow other functions, but this way + // we don't need to worry about security implications of these functions + matches!(polkadot_xcm_call, pallet_xcm::Call::::send { .. }) } else if let RuntimeCall::EVM(_) = call { // disable non-root EVM access false @@ -212,6 +222,7 @@ impl Contains for BaseCallFilter { } impl frame_system::Config for Runtime { + type Block = Block; /// The identifier used to distinguish between accounts. type AccountId = AccountId; /// The aggregated dispatch type that is available for extrinsics. @@ -219,15 +230,11 @@ impl frame_system::Config for Runtime { /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = IdentityLookup; /// The index type for storing how many extrinsics an account has signed. - type Index = Nonce; - /// The index type for blocks. - type BlockNumber = BlockNumber; + type Nonce = Nonce; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = Header; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -317,6 +324,7 @@ impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; type DisabledValidators = (); type MaxAuthorities = MaxAuthorities; + type AllowMultipleBlocksPerSlot = ConstBool; } parameter_types! { @@ -389,6 +397,7 @@ impl pallet_transaction_payment::Config for Runtime { impl pallet_sudo::Config for Runtime { type RuntimeCall = RuntimeCall; type RuntimeEvent = RuntimeEvent; + type WeightInfo = (); } impl pallet_utility::Config for Runtime { @@ -491,7 +500,7 @@ type EnsureRootOrAllTechnicalCommittee = EitherOfDiverse< >; parameter_types! { - pub const LaunchPeriod: u64 = 1000 * 60 * 60 * 24 * 7; // one week + pub const LaunchPeriod: u64 = 60 * 60 * 24 * 7; // one week (seconds) pub const VotingPeriod: BlockNumber = 2 * DAYS; pub const FastTrackVotingPeriod: BlockNumber = 3 * HOURS; // Require 5 vKINT to make a proposal. Given the crowdloan airdrop, this qualifies about 3500 @@ -724,12 +733,12 @@ impl EnsureOriginWithArg> for AssetAuthority { type Success = (); fn try_origin(origin: RuntimeOrigin, _asset_id: &Option) -> Result { - EnsureRoot::try_origin(origin) + as EnsureOrigin>::try_origin(origin) } #[cfg(feature = "runtime-benchmarks")] fn try_successful_origin(_: &Option) -> Result { - EnsureRoot::try_successful_origin() + as EnsureOrigin>::try_successful_origin() } } @@ -1201,12 +1210,9 @@ impl loans::Config for Runtime { } construct_runtime! { - pub enum Runtime where - Block = Block, - NodeBlock = primitives::Block, - UncheckedExtrinsic = UncheckedExtrinsic + pub enum Runtime { - System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, + System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 1, Utility: pallet_utility::{Pallet, Call, Event} = 2, TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event} = 3, @@ -1252,7 +1258,7 @@ construct_runtime! { Replace: replace::{Pallet, Call, Config, Storage, Event} = 65, Fee: fee::{Pallet, Call, Config, Storage} = 66, // Refund: 67 - Nomination: nomination::{Pallet, Call, Config, Storage, Event} = 68, + Nomination: nomination::{Pallet, Call, Storage, Config, Event} = 68, ClientsInfo: clients_info::{Pallet, Call, Storage, Event} = 69, // # Governance @@ -1265,13 +1271,13 @@ construct_runtime! { CollatorSelection: collator_selection::{Pallet, Call, Storage, Event, Config} = 81, Session: pallet_session::{Pallet, Call, Storage, Event, Config} = 82, Aura: pallet_aura::{Pallet, Storage, Config} = 83, - AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config} = 84, - ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event} = 85, - ParachainInfo: parachain_info::{Pallet, Storage, Config} = 86, + AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config} = 84, + ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event} = 85, + ParachainInfo: parachain_info::{Pallet, Storage, Config} = 86, // # XCM helpers. XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event} = 90, - PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event, Origin, Config} = 91, + PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event, Origin, Config} = 91, CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event, Origin} = 92, DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event} = 93, @@ -1279,7 +1285,7 @@ construct_runtime! { UnknownTokens: orml_unknown_tokens::{Pallet, Storage, Event} = 95, // # Lending & AMM - Loans: loans::{Pallet, Call, Storage, Event, Config} = 100, + Loans: loans::{Pallet, Call, Storage, Event, Config} = 100, DexGeneral: dex_general::{Pallet, Call, Storage, Event} = 101, DexStable: dex_stable::{Pallet, Call, Storage, Event} = 102, DexSwapRouter: dex_swap_router::{Pallet, Call, Event} = 103, @@ -1287,9 +1293,9 @@ construct_runtime! { // # Smart contracts Contracts: pallet_contracts::{Pallet, Call, Storage, Event} = 110, BaseFee: pallet_base_fee::{Pallet, Call, Storage, Event, Config} = 111, - Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Config, Origin} = 112, - EVM: pallet_evm::{Pallet, Call, Storage, Event, Config} = 113, - EVMChainId: pallet_evm_chain_id::{Pallet, Storage, Config} = 114, + Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Config, Origin} = 112, + EVM: pallet_evm::{Pallet, Call, Storage, Event, Config} = 113, + EVMChainId: pallet_evm_chain_id::{Pallet, Storage, Config} = 114, } } @@ -1322,12 +1328,7 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPalletsWithSystem, - ( - orml_asset_registry::Migration, - orml_unknown_tokens::Migration, - issue::migration::v1::Migration, - evm::SetEvmChainId, - ), + (evm::SetEvmChainId,), >; impl fp_self_contained::SelfContainedCall for RuntimeCall { @@ -1607,8 +1608,16 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey}; - impl frame_system_benchmarking::Config for Runtime {} + use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey, BenchmarkError}; + impl frame_system_benchmarking::Config for Runtime { + fn setup_set_code_requirements(code: &sp_std::vec::Vec) -> Result<(), BenchmarkError> { + ParachainSystem::initialize_for_set_code_benchmark(code.len() as u32); + Ok(()) + } + fn verify_set_code() { + System::assert_last_event(cumulus_pallet_parachain_system::Event::::ValidationFunctionStored.into()); + } + } impl runtime_common::benchmarking::orml_tokens::Config for Runtime {} impl runtime_common::benchmarking::orml_vesting::Config for Runtime {} impl runtime_common::benchmarking::orml_asset_registry::Config for Runtime {} @@ -2157,6 +2166,121 @@ impl_runtime_apis! { ) } } + + impl pallet_contracts::ContractsApi for Runtime { + fn call( + origin: AccountId, + dest: AccountId, + value: Balance, + gas_limit: Option, + storage_deposit_limit: Option, + input_data: Vec, + ) -> pallet_contracts_primitives::ContractExecResult { + let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block); + Contracts::bare_call( + origin, + dest, + value, + gas_limit, + storage_deposit_limit, + input_data, + pallet_contracts::DebugInfo::UnsafeDebug, + pallet_contracts::CollectEvents::UnsafeCollect, + pallet_contracts::Determinism::Enforced, + ) + } + + fn instantiate( + origin: AccountId, + value: Balance, + gas_limit: Option, + storage_deposit_limit: Option, + code: pallet_contracts_primitives::Code, + data: Vec, + salt: Vec, + ) -> pallet_contracts_primitives::ContractInstantiateResult + { + let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block); + Contracts::bare_instantiate( + origin, + value, + gas_limit, + storage_deposit_limit, + code, + data, + salt, + pallet_contracts::DebugInfo::UnsafeDebug, + pallet_contracts::CollectEvents::UnsafeCollect, + ) + } + + fn upload_code( + origin: AccountId, + code: Vec, + storage_deposit_limit: Option, + determinism: pallet_contracts::Determinism, + ) -> pallet_contracts_primitives::CodeUploadResult + { + Contracts::bare_upload_code( + origin, + code, + storage_deposit_limit, + determinism, + ) + } + + fn get_storage( + address: AccountId, + key: Vec, + ) -> pallet_contracts_primitives::GetStorageResult { + Contracts::get_storage( + address, + key + ) + } + } + + // todo: enable this once we add contracts benchmarking +// #[cfg(feature = "runtime-benchmarks")] +// impl frame_benchmarking::Benchmark for Runtime { +// fn benchmark_metadata(extra: bool) -> ( +// Vec, +// Vec, +// ) { +// use frame_benchmarking::{baseline, Benchmarking, BenchmarkList}; +// use frame_support::traits::StorageInfoTrait; +// use frame_system_benchmarking::Pallet as SystemBench; +// use baseline::Pallet as BaselineBench; +// +// let mut list = Vec::::new(); +// list_benchmarks!(list, extra); +// +// let storage_info = AllPalletsWithSystem::storage_info(); +// +// (list, storage_info) +// } +// +// fn dispatch_benchmark( +// config: frame_benchmarking::BenchmarkConfig +// ) -> Result, sp_runtime::RuntimeString> { +// use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch, TrackedStorageKey}; +// use frame_system_benchmarking::Pallet as SystemBench; +// use baseline::Pallet as BaselineBench; +// +// impl frame_system_benchmarking::Config for Runtime {} +// impl baseline::Config for Runtime {} +// +// use frame_support::traits::WhitelistedStorageKeys; +// let whitelist: Vec = AllPalletsWithSystem::whitelisted_storage_keys(); +// +// let mut batches = Vec::::new(); +// let params = (&config, &whitelist); +// add_benchmarks!(params, batches); +// +// if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } +// Ok(batches) +// } +// } } struct CheckInherents; diff --git a/parachain/runtime/kintsugi/src/weights/annuity_escrow_annuity.rs b/parachain/runtime/kintsugi/src/weights/annuity_escrow_annuity.rs index 66ab9ad633..e2eff42995 100644 --- a/parachain/runtime/kintsugi/src/weights/annuity_escrow_annuity.rs +++ b/parachain/runtime/kintsugi/src/weights/annuity_escrow_annuity.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for annuity //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -44,8 +44,8 @@ impl annuity::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 17_085_000 picoseconds. - Weight::from_parts(18_252_000, 0) + // Minimum execution time: 13_728_000 picoseconds. + Weight::from_parts(14_158_000, 0) } /// Storage: EscrowRewards Stake (r:1 w:0) /// Proof: EscrowRewards Stake (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) @@ -61,10 +61,10 @@ impl annuity::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn withdraw_rewards () -> Weight { // Proof Size summary in bytes: - // Measured: `747` - // Estimated: `23880` - // Minimum execution time: 153_976_000 picoseconds. - Weight::from_parts(164_810_000, 23880) + // Measured: `1014` + // Estimated: `6170` + // Minimum execution time: 121_143_000 picoseconds. + Weight::from_parts(123_798_000, 6170) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -72,17 +72,17 @@ impl annuity::WeightInfo for WeightInfo { /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) fn update_rewards () -> Weight { // Proof Size summary in bytes: - // Measured: `319` + // Measured: `536` // Estimated: `3580` - // Minimum execution time: 27_481_000 picoseconds. - Weight::from_parts(29_748_000, 3580) + // Minimum execution time: 22_445_000 picoseconds. + Weight::from_parts(23_297_000, 3580) .saturating_add(T::DbWeight::get().reads(1_u64)) } fn set_reward_per_wrapped () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_313_000 picoseconds. - Weight::from_parts(10_906_000, 0) + // Minimum execution time: 8_597_000 picoseconds. + Weight::from_parts(9_098_000, 0) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/annuity_vault_annuity.rs b/parachain/runtime/kintsugi/src/weights/annuity_vault_annuity.rs index 6d3689fa5e..5b5d2c3996 100644 --- a/parachain/runtime/kintsugi/src/weights/annuity_vault_annuity.rs +++ b/parachain/runtime/kintsugi/src/weights/annuity_vault_annuity.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for annuity //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -44,8 +44,8 @@ impl annuity::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 17_766_000 picoseconds. - Weight::from_parts(19_482_000, 0) + // Minimum execution time: 14_188_000 picoseconds. + Weight::from_parts(14_780_000, 0) } fn withdraw_rewards () -> Weight { // Proof Size summary in bytes: @@ -58,17 +58,17 @@ impl annuity::WeightInfo for WeightInfo { /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) fn update_rewards () -> Weight { // Proof Size summary in bytes: - // Measured: `319` + // Measured: `536` // Estimated: `3580` - // Minimum execution time: 27_247_000 picoseconds. - Weight::from_parts(28_914_000, 3580) + // Minimum execution time: 22_295_000 picoseconds. + Weight::from_parts(23_336_000, 3580) .saturating_add(T::DbWeight::get().reads(1_u64)) } fn set_reward_per_wrapped () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_352_000 picoseconds. - Weight::from_parts(11_276_000, 0) + // Minimum execution time: 8_397_000 picoseconds. + Weight::from_parts(8_838_000, 0) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/btc_relay.rs b/parachain/runtime/kintsugi/src/weights/btc_relay.rs index 6b304bca0f..4a89ccbe56 100644 --- a/parachain/runtime/kintsugi/src/weights/btc_relay.rs +++ b/parachain/runtime/kintsugi/src/weights/btc_relay.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for btc_relay //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -62,10 +62,10 @@ impl btc_relay::WeightInfo for WeightInfo { /// Proof: BTCRelay BlockHeaders (max_values: None, max_size: Some(200), added: 2675, mode: MaxEncodedLen) fn initialize () -> Weight { // Proof Size summary in bytes: - // Measured: `430` - // Estimated: `9470` - // Minimum execution time: 88_622_000 picoseconds. - Weight::from_parts(92_834_000, 9470) + // Measured: `403` + // Estimated: `3489` + // Minimum execution time: 66_834_000 picoseconds. + Weight::from_parts(67_535_000, 3489) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -87,10 +87,10 @@ impl btc_relay::WeightInfo for WeightInfo { /// Proof: BTCRelay BestBlockHeight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) fn store_block_header () -> Weight { // Proof Size summary in bytes: - // Measured: `901` - // Estimated: `17838` - // Minimum execution time: 107_478_000 picoseconds. - Weight::from_parts(124_199_000, 17838) + // Measured: `874` + // Estimated: `6340` + // Minimum execution time: 82_235_000 picoseconds. + Weight::from_parts(83_036_000, 6340) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -113,16 +113,16 @@ impl btc_relay::WeightInfo for WeightInfo { /// The range of component `f` is `[1, 6]`. fn store_block_header_new_fork_sorted (f: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `841 + f * (92 ±0)` - // Estimated: `16800 + f * (5006 ±0)` - // Minimum execution time: 127_171_000 picoseconds. - Weight::from_parts(119_162_694, 16800) - // Standard Error: 289_559 - .saturating_add(Weight::from_parts(15_384_438, 0).saturating_mul(f.into())) + // Measured: `806 + f * (101 ±0)` + // Estimated: `6340 + f * (2507 ±0)` + // Minimum execution time: 93_938_000 picoseconds. + Weight::from_parts(85_636_123, 6340) + // Standard Error: 86_395 + .saturating_add(Weight::from_parts(10_763_758, 0).saturating_mul(f.into())) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(f.into()))) .saturating_add(T::DbWeight::get().writes(5_u64)) - .saturating_add(Weight::from_parts(0, 5006).saturating_mul(f.into())) + .saturating_add(Weight::from_parts(0, 2507).saturating_mul(f.into())) } /// Storage: BTCRelay ChainCounter (r:1 w:1) /// Proof: BTCRelay ChainCounter (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -143,17 +143,17 @@ impl btc_relay::WeightInfo for WeightInfo { /// The range of component `f` is `[1, 6]`. fn store_block_header_new_fork_unsorted (f: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `920 + f * (98 ±0)` - // Estimated: `19871 + f * (2975 ±0)` - // Minimum execution time: 129_690_000 picoseconds. - Weight::from_parts(125_641_286, 19871) - // Standard Error: 277_759 - .saturating_add(Weight::from_parts(17_567_366, 0).saturating_mul(f.into())) + // Measured: `842 + f * (99 ±0)` + // Estimated: `6340 + f * (2499 ±31)` + // Minimum execution time: 95_491_000 picoseconds. + Weight::from_parts(87_545_230, 6340) + // Standard Error: 88_777 + .saturating_add(Weight::from_parts(13_033_203, 0).saturating_mul(f.into())) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(f.into()))) .saturating_add(T::DbWeight::get().writes(4_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(f.into()))) - .saturating_add(Weight::from_parts(0, 2975).saturating_mul(f.into())) + .saturating_add(Weight::from_parts(0, 2499).saturating_mul(f.into())) } /// Storage: BTCRelay ChainCounter (r:1 w:0) /// Proof: BTCRelay ChainCounter (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -178,12 +178,12 @@ impl btc_relay::WeightInfo for WeightInfo { /// The range of component `f` is `[3, 6]`. fn store_block_header_reorganize_chains (f: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `4937 + f * (199 ±0)` - // Estimated: `109561 + f * (1340 ±45)` - // Minimum execution time: 663_509_000 picoseconds. - Weight::from_parts(656_899_818, 109561) - // Standard Error: 923_781 - .saturating_add(Weight::from_parts(16_944_084, 0).saturating_mul(f.into())) + // Measured: `4741 + f * (240 ±0)` + // Estimated: `54490 + f * (1340 ±45)` + // Minimum execution time: 513_248_000 picoseconds. + Weight::from_parts(504_054_659, 54490) + // Standard Error: 322_620 + .saturating_add(Weight::from_parts(7_203_738, 0).saturating_mul(f.into())) .saturating_add(T::DbWeight::get().reads(42_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(f.into()))) .saturating_add(T::DbWeight::get().writes(46_u64)) diff --git a/parachain/runtime/kintsugi/src/weights/clients_info.rs b/parachain/runtime/kintsugi/src/weights/clients_info.rs index 6a28c005e4..8002badb38 100644 --- a/parachain/runtime/kintsugi/src/weights/clients_info.rs +++ b/parachain/runtime/kintsugi/src/weights/clients_info.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for clients_info //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -44,30 +44,30 @@ impl clients_info::WeightInfo for WeightInfo { /// Proof: ClientsInfo CurrentClientReleases (max_values: None, max_size: Some(562), added: 3037, mode: MaxEncodedLen) /// The range of component `n` is `[0, 255]`. /// The range of component `u` is `[0, 255]`. - fn set_current_client_release (n: u32, _u: u32, ) -> Weight { + fn set_current_client_release (n: u32, u: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 29_991_000 picoseconds. - Weight::from_parts(33_156_363, 0) - // Standard Error: 2_280 - .saturating_add(Weight::from_parts(5_748, 0).saturating_mul(n.into())) + // Minimum execution time: 23_156_000 picoseconds. + Weight::from_parts(15_199_745, 0) + // Standard Error: 2_357 + .saturating_add(Weight::from_parts(33_907, 0).saturating_mul(n.into())) + // Standard Error: 2_357 + .saturating_add(Weight::from_parts(25_678, 0).saturating_mul(u.into())) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: ClientsInfo PendingClientReleases (r:0 w:1) /// Proof: ClientsInfo PendingClientReleases (max_values: None, max_size: Some(562), added: 3037, mode: MaxEncodedLen) /// The range of component `n` is `[0, 255]`. /// The range of component `u` is `[0, 255]`. - fn set_pending_client_release (n: u32, u: u32, ) -> Weight { + fn set_pending_client_release (_n: u32, u: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 30_050_000 picoseconds. - Weight::from_parts(30_251_578, 0) - // Standard Error: 1_658 - .saturating_add(Weight::from_parts(12_923, 0).saturating_mul(n.into())) - // Standard Error: 1_658 - .saturating_add(Weight::from_parts(6_099, 0).saturating_mul(u.into())) + // Minimum execution time: 23_888_000 picoseconds. + Weight::from_parts(25_894_200, 0) + // Standard Error: 752 + .saturating_add(Weight::from_parts(712, 0).saturating_mul(u.into())) .saturating_add(T::DbWeight::get().writes(1_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/collator_selection.rs b/parachain/runtime/kintsugi/src/weights/collator_selection.rs index ef73b545f7..6c9695a663 100644 --- a/parachain/runtime/kintsugi/src/weights/collator_selection.rs +++ b/parachain/runtime/kintsugi/src/weights/collator_selection.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for collator_selection //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -47,12 +47,12 @@ impl collator_selection::WeightInfo for WeightInfo { /// The range of component `b` is `[1, 100]`. fn set_invulnerables (b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `217 + b * (78 ±0)` - // Estimated: `1207 + b * (2554 ±0)` - // Minimum execution time: 35_613_000 picoseconds. - Weight::from_parts(31_790_848, 1207) - // Standard Error: 36_475 - .saturating_add(Weight::from_parts(6_820_740, 0).saturating_mul(b.into())) + // Measured: `252 + b * (78 ±0)` + // Estimated: `1241 + b * (2554 ±0)` + // Minimum execution time: 28_928_000 picoseconds. + Weight::from_parts(30_022_286, 1241) + // Standard Error: 9_605 + .saturating_add(Weight::from_parts(4_927_606, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(Weight::from_parts(0, 2554).saturating_mul(b.into())) @@ -63,8 +63,8 @@ impl collator_selection::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 18_488_000 picoseconds. - Weight::from_parts(19_167_000, 0) + // Minimum execution time: 15_451_000 picoseconds. + Weight::from_parts(15_882_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: CollatorSelection CandidacyBond (r:0 w:1) @@ -73,8 +73,8 @@ impl collator_selection::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 18_984_000 picoseconds. - Weight::from_parts(19_609_000, 0) + // Minimum execution time: 16_102_000 picoseconds. + Weight::from_parts(16_673_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: CollatorSelection Candidates (r:1 w:1) @@ -95,18 +95,18 @@ impl collator_selection::WeightInfo for WeightInfo { /// Proof: Escrow Reserved (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) /// Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) /// Proof: CollatorSelection LastAuthoredBlock (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) - /// The range of component `c` is `[1, 999]`. + /// The range of component `c` is `[1, 19]`. fn register_as_candidate (c: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `2801 + c * (49 ±0)` - // Estimated: `73766 + c * (50 ±0)` - // Minimum execution time: 98_960_000 picoseconds. - Weight::from_parts(132_006_984, 73766) - // Standard Error: 4_063 - .saturating_add(Weight::from_parts(281_283, 0).saturating_mul(c.into())) + // Measured: `902 + c * (96 ±0)` + // Estimated: `49487 + c * (97 ±0)` + // Minimum execution time: 77_295_000 picoseconds. + Weight::from_parts(80_119_617, 49487) + // Standard Error: 10_631 + .saturating_add(Weight::from_parts(333_051, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 50).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 97).saturating_mul(c.into())) } /// Storage: CollatorSelection Candidates (r:1 w:1) /// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(48002), added: 48497, mode: MaxEncodedLen) @@ -114,15 +114,15 @@ impl collator_selection::WeightInfo for WeightInfo { /// Proof: Escrow Reserved (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) /// Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) /// Proof: CollatorSelection LastAuthoredBlock (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) - /// The range of component `c` is `[6, 1000]`. + /// The range of component `c` is `[6, 20]`. fn leave_intent (c: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `983 + c * (48 ±0)` - // Estimated: `53016` - // Minimum execution time: 58_156_000 picoseconds. - Weight::from_parts(94_971_545, 53016) - // Standard Error: 13_379 - .saturating_add(Weight::from_parts(252_123, 0).saturating_mul(c.into())) + // Measured: `402 + c * (64 ±0)` + // Estimated: `49487` + // Minimum execution time: 41_543_000 picoseconds. + Weight::from_parts(41_188_765, 49487) + // Standard Error: 10_873 + .saturating_add(Weight::from_parts(201_069, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -134,10 +134,10 @@ impl collator_selection::WeightInfo for WeightInfo { /// Proof: CollatorSelection LastAuthoredBlock (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) fn note_author () -> Weight { // Proof Size summary in bytes: - // Measured: `319` - // Estimated: `9763` - // Minimum execution time: 84_973_000 picoseconds. - Weight::from_parts(87_916_000, 9763) + // Measured: `650` + // Estimated: `6170` + // Minimum execution time: 71_283_000 picoseconds. + Weight::from_parts(72_435_000, 6170) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -145,30 +145,30 @@ impl collator_selection::WeightInfo for WeightInfo { /// Proof: CollatorSelection Candidates (max_values: Some(1), max_size: Some(48002), added: 48497, mode: MaxEncodedLen) /// Storage: CollatorSelection CandidacyBond (r:1 w:0) /// Proof: CollatorSelection CandidacyBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - /// Storage: CollatorSelection LastAuthoredBlock (r:999 w:0) + /// Storage: CollatorSelection LastAuthoredBlock (r:20 w:0) /// Proof: CollatorSelection LastAuthoredBlock (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) - /// Storage: Escrow UserPointEpoch (r:999 w:0) + /// Storage: Escrow UserPointEpoch (r:20 w:0) /// Proof: Escrow UserPointEpoch (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen) - /// Storage: Escrow UserPointHistory (r:999 w:0) + /// Storage: Escrow UserPointHistory (r:20 w:0) /// Proof: Escrow UserPointHistory (max_values: None, max_size: Some(88), added: 2563, mode: MaxEncodedLen) /// Storage: CollatorSelection Invulnerables (r:1 w:0) /// Proof: CollatorSelection Invulnerables (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) - /// Storage: Escrow Reserved (r:995 w:995) + /// Storage: Escrow Reserved (r:15 w:15) /// Proof: Escrow Reserved (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) - /// The range of component `r` is `[1, 1000]`. - /// The range of component `c` is `[1, 1000]`. + /// The range of component `r` is `[1, 20]`. + /// The range of component `c` is `[1, 20]`. fn new_session (r: u32, c: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `23641 + r * (50 ±0) + c * (193 ±0)` - // Estimated: `58645 + c * (7610 ±0) + r * (2538 ±0)` - // Minimum execution time: 69_800_000 picoseconds. - Weight::from_parts(71_300_000, 58645) - // Standard Error: 1_581_374 - .saturating_add(Weight::from_parts(89_845_173, 0).saturating_mul(c.into())) + // Measured: `793 + c * (194 ±0) + r * (47 ±0)` + // Estimated: `49487 + c * (2563 ±0) + r * (2207 ±23)` + // Minimum execution time: 52_586_000 picoseconds. + Weight::from_parts(53_397_000, 49487) + // Standard Error: 441_635 + .saturating_add(Weight::from_parts(25_597_481, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(c.into()))) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into()))) - .saturating_add(Weight::from_parts(0, 7610).saturating_mul(c.into())) - .saturating_add(Weight::from_parts(0, 2538).saturating_mul(r.into())) + .saturating_add(Weight::from_parts(0, 2563).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 2207).saturating_mul(r.into())) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/cumulus_pallet_xcmp_queue.rs b/parachain/runtime/kintsugi/src/weights/cumulus_pallet_xcmp_queue.rs index 4ddfa187d4..1325f37aa3 100644 --- a/parachain/runtime/kintsugi/src/weights/cumulus_pallet_xcmp_queue.rs +++ b/parachain/runtime/kintsugi/src/weights/cumulus_pallet_xcmp_queue.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for cumulus_pallet_xcmp_queue //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -46,8 +46,8 @@ impl cumulus_pallet_xcmp_queue::WeightInfo for WeightIn // Proof Size summary in bytes: // Measured: `4` // Estimated: `1489` - // Minimum execution time: 13_474_000 picoseconds. - Weight::from_parts(14_433_000, 1489) + // Minimum execution time: 10_922_000 picoseconds. + Weight::from_parts(11_643_000, 1489) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -57,8 +57,8 @@ impl cumulus_pallet_xcmp_queue::WeightInfo for WeightIn // Proof Size summary in bytes: // Measured: `4` // Estimated: `1489` - // Minimum execution time: 13_779_000 picoseconds. - Weight::from_parts(14_656_000, 1489) + // Minimum execution time: 10_761_000 picoseconds. + Weight::from_parts(11_012_000, 1489) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/parachain/runtime/kintsugi/src/weights/democracy.rs b/parachain/runtime/kintsugi/src/weights/democracy.rs index 1e7682031b..586b9d429f 100644 --- a/parachain/runtime/kintsugi/src/weights/democracy.rs +++ b/parachain/runtime/kintsugi/src/weights/democracy.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for democracy //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -54,10 +54,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: Democracy DepositOf (max_values: None, max_size: Some(3230), added: 5705, mode: MaxEncodedLen) fn propose () -> Weight { // Proof Size summary in bytes: - // Measured: `6110` - // Estimated: `30275` - // Minimum execution time: 117_322_000 picoseconds. - Weight::from_parts(131_587_000, 30275) + // Measured: `6137` + // Estimated: `18187` + // Minimum execution time: 71_353_000 picoseconds. + Weight::from_parts(72_285_000, 18187) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -71,10 +71,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: Escrow Reserved (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) fn second () -> Weight { // Proof Size summary in bytes: - // Measured: `4802` - // Estimated: `17294` - // Minimum execution time: 89_592_000 picoseconds. - Weight::from_parts(97_799_000, 17294) + // Measured: `4829` + // Estimated: `6695` + // Minimum execution time: 57_224_000 picoseconds. + Weight::from_parts(58_467_000, 6695) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -90,10 +90,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: Democracy VotingOf (max_values: None, max_size: Some(2142), added: 4617, mode: MaxEncodedLen) fn vote_new () -> Weight { // Proof Size summary in bytes: - // Measured: `3160` - // Estimated: `19872` - // Minimum execution time: 93_699_000 picoseconds. - Weight::from_parts(101_855_000, 19872) + // Measured: `3187` + // Estimated: `5607` + // Minimum execution time: 57_756_000 picoseconds. + Weight::from_parts(59_539_000, 5607) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -109,10 +109,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: Democracy VotingOf (max_values: None, max_size: Some(2142), added: 4617, mode: MaxEncodedLen) fn vote_existing () -> Weight { // Proof Size summary in bytes: - // Measured: `3181` - // Estimated: `19872` - // Minimum execution time: 97_734_000 picoseconds. - Weight::from_parts(106_301_000, 19872) + // Measured: `3208` + // Estimated: `5607` + // Minimum execution time: 57_966_000 picoseconds. + Weight::from_parts(58_347_000, 5607) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -128,10 +128,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen) fn fast_track () -> Weight { // Proof Size summary in bytes: - // Measured: `398` - // Estimated: `29900` - // Minimum execution time: 74_046_000 picoseconds. - Weight::from_parts(75_221_000, 29900) + // Measured: `425` + // Estimated: `18187` + // Minimum execution time: 57_796_000 picoseconds. + Weight::from_parts(59_529_000, 18187) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -139,10 +139,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen) fn fast_track_referendum () -> Weight { // Proof Size summary in bytes: - // Measured: `221` + // Measured: `248` // Estimated: `3666` - // Minimum execution time: 40_319_000 picoseconds. - Weight::from_parts(42_100_000, 3666) + // Minimum execution time: 32_916_000 picoseconds. + Weight::from_parts(33_847_000, 3666) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -154,10 +154,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: Escrow Reserved (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) fn cancel_proposal () -> Weight { // Proof Size summary in bytes: - // Measured: `6169` - // Estimated: `28411` - // Minimum execution time: 151_246_000 picoseconds. - Weight::from_parts(159_233_000, 28411) + // Measured: `6196` + // Estimated: `18187` + // Minimum execution time: 93_818_000 picoseconds. + Weight::from_parts(96_243_000, 18187) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -165,10 +165,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: Democracy ReferendumInfoOf (max_values: None, max_size: Some(201), added: 2676, mode: MaxEncodedLen) fn cancel_referendum () -> Weight { // Proof Size summary in bytes: - // Measured: `221` + // Measured: `248` // Estimated: `3666` - // Minimum execution time: 35_511_000 picoseconds. - Weight::from_parts(36_860_000, 3666) + // Minimum execution time: 27_725_000 picoseconds. + Weight::from_parts(28_487_000, 3666) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -195,12 +195,12 @@ impl democracy::WeightInfo for WeightInfo { /// The range of component `r` is `[0, 99]`. fn on_initialize_public (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `426 + r * (86 ±0)` - // Estimated: `40282 + r * (2677 ±0)` - // Minimum execution time: 83_314_000 picoseconds. - Weight::from_parts(95_868_472, 40282) - // Standard Error: 58_322 - .saturating_add(Weight::from_parts(24_100_198, 0).saturating_mul(r.into())) + // Measured: `453 + r * (86 ±0)` + // Estimated: `18187 + r * (2677 ±0)` + // Minimum execution time: 69_790_000 picoseconds. + Weight::from_parts(74_778_560, 18187) + // Standard Error: 33_978 + .saturating_add(Weight::from_parts(19_026_642, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(6_u64)) @@ -222,12 +222,12 @@ impl democracy::WeightInfo for WeightInfo { /// The range of component `r` is `[0, 99]`. fn on_initialize_base (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `144 + r * (86 ±0)` - // Estimated: `25141 + r * (2676 ±0)` - // Minimum execution time: 21_865_000 picoseconds. - Weight::from_parts(22_116_633, 25141) - // Standard Error: 26_988 - .saturating_add(Weight::from_parts(6_739_860, 0).saturating_mul(r.into())) + // Measured: `171 + r * (86 ±0)` + // Estimated: `18187 + r * (2676 ±0)` + // Minimum execution time: 19_809_000 picoseconds. + Weight::from_parts(20_605_829, 18187) + // Standard Error: 11_119 + .saturating_add(Weight::from_parts(5_000_060, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) @@ -248,12 +248,12 @@ impl democracy::WeightInfo for WeightInfo { /// The range of component `r` is `[0, 99]`. fn on_initialize_base_with_launch_period (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `144 + r * (86 ±0)` - // Estimated: `25141 + r * (2676 ±0)` - // Minimum execution time: 21_960_000 picoseconds. - Weight::from_parts(22_159_000, 25141) - // Standard Error: 160_991 - .saturating_add(Weight::from_parts(7_413_232, 0).saturating_mul(r.into())) + // Measured: `171 + r * (86 ±0)` + // Estimated: `18187 + r * (2676 ±0)` + // Minimum execution time: 19_840_000 picoseconds. + Weight::from_parts(13_604_611, 18187) + // Standard Error: 72_687 + .saturating_add(Weight::from_parts(5_272_806, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) @@ -265,8 +265,8 @@ impl democracy::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 17_879_000 picoseconds. - Weight::from_parts(26_076_000, 0) + // Minimum execution time: 6_814_000 picoseconds. + Weight::from_parts(7_104_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Democracy ReferendumInfoOf (r:1 w:1) @@ -276,12 +276,12 @@ impl democracy::WeightInfo for WeightInfo { /// The range of component `r` is `[1, 100]`. fn remove_vote (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `598 + r * (25 ±0)` - // Estimated: `9273` - // Minimum execution time: 41_711_000 picoseconds. - Weight::from_parts(100_426_550, 9273) - // Standard Error: 108_886 - .saturating_add(Weight::from_parts(797_476, 0).saturating_mul(r.into())) + // Measured: `625 + r * (25 ±0)` + // Estimated: `5607` + // Minimum execution time: 28_086_000 picoseconds. + Weight::from_parts(33_138_291, 5607) + // Standard Error: 3_852 + .saturating_add(Weight::from_parts(113_162, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -291,10 +291,10 @@ impl democracy::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn spend_from_treasury () -> Weight { // Proof Size summary in bytes: - // Measured: `319` - // Estimated: `9763` - // Minimum execution time: 151_809_000 picoseconds. - Weight::from_parts(255_556_000, 9763) + // Measured: `536` + // Estimated: `6170` + // Minimum execution time: 67_766_000 picoseconds. + Weight::from_parts(69_309_000, 6170) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } diff --git a/parachain/runtime/kintsugi/src/weights/dex_general.rs b/parachain/runtime/kintsugi/src/weights/dex_general.rs index fa2c68af89..7d520b8937 100644 --- a/parachain/runtime/kintsugi/src/weights/dex_general.rs +++ b/parachain/runtime/kintsugi/src/weights/dex_general.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for dex_general //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -44,10 +44,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: DexGeneral FeeMeta (max_values: Some(1), max_size: Some(34), added: 529, mode: MaxEncodedLen) fn set_fee_receiver () -> Weight { // Proof Size summary in bytes: - // Measured: `3` + // Measured: `4` // Estimated: `1519` - // Minimum execution time: 30_872_000 picoseconds. - Weight::from_parts(33_884_000, 1519) + // Minimum execution time: 13_237_000 picoseconds. + Weight::from_parts(13_527_000, 1519) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -55,10 +55,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: DexGeneral FeeMeta (max_values: Some(1), max_size: Some(34), added: 529, mode: MaxEncodedLen) fn set_fee_point () -> Weight { // Proof Size summary in bytes: - // Measured: `3` + // Measured: `4` // Estimated: `1519` - // Minimum execution time: 48_165_000 picoseconds. - Weight::from_parts(56_968_000, 1519) + // Minimum execution time: 22_024_000 picoseconds. + Weight::from_parts(22_796_000, 1519) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -68,10 +68,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: DexGeneral LiquidityPairs (max_values: None, max_size: Some(50), added: 2525, mode: MaxEncodedLen) fn create_pair () -> Weight { // Proof Size summary in bytes: - // Measured: `3` + // Measured: `4` // Estimated: `3628` - // Minimum execution time: 63_937_000 picoseconds. - Weight::from_parts(86_321_000, 3628) + // Minimum execution time: 32_094_000 picoseconds. + Weight::from_parts(32_836_000, 3628) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -85,14 +85,14 @@ impl dex_general::WeightInfo for WeightInfo { /// The range of component `l` is `[1, 10]`. fn bootstrap_create (r: u32, l: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `3` + // Measured: `4` // Estimated: `3628` - // Minimum execution time: 51_733_000 picoseconds. - Weight::from_parts(110_419_525, 3628) - // Standard Error: 803_059 - .saturating_add(Weight::from_parts(1_188_210, 0).saturating_mul(r.into())) - // Standard Error: 803_059 - .saturating_add(Weight::from_parts(1_519_748, 0).saturating_mul(l.into())) + // Minimum execution time: 38_747_000 picoseconds. + Weight::from_parts(38_599_014, 3628) + // Standard Error: 6_559 + .saturating_add(Weight::from_parts(69_180, 0).saturating_mul(r.into())) + // Standard Error: 6_559 + .saturating_add(Weight::from_parts(152_288, 0).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -108,10 +108,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn bootstrap_contribute () -> Weight { // Proof Size summary in bytes: - // Measured: `671` - // Estimated: `52635` - // Minimum execution time: 216_308_000 picoseconds. - Weight::from_parts(740_397_000, 52635) + // Measured: `941` + // Estimated: `30497` + // Minimum execution time: 156_172_000 picoseconds. + Weight::from_parts(158_808_000, 30497) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -131,10 +131,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: DexGeneral BootstrapRewards (max_values: None, max_size: Some(27032), added: 29507, mode: MaxEncodedLen) fn bootstrap_claim () -> Weight { // Proof Size summary in bytes: - // Measured: `1231` - // Estimated: `54598` - // Minimum execution time: 295_123_000 picoseconds. - Weight::from_parts(514_541_000, 54598) + // Measured: `1486` + // Estimated: `30497` + // Minimum execution time: 131_593_000 picoseconds. + Weight::from_parts(133_668_000, 30497) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -152,10 +152,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: DexGeneral BootstrapEndStatus (max_values: None, max_size: Some(163), added: 2638, mode: MaxEncodedLen) fn bootstrap_end () -> Weight { // Proof Size summary in bytes: - // Measured: `893` - // Estimated: `27264` - // Minimum execution time: 489_279_000 picoseconds. - Weight::from_parts(1_033_867_000, 27264) + // Measured: `1200` + // Estimated: `13940` + // Minimum execution time: 193_808_000 picoseconds. + Weight::from_parts(195_532_000, 13940) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(10_u64)) } @@ -169,14 +169,14 @@ impl dex_general::WeightInfo for WeightInfo { /// The range of component `l` is `[1, 10]`. fn bootstrap_update (r: u32, l: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `259 + r * (21 ±0)` - // Estimated: `34125` - // Minimum execution time: 63_115_000 picoseconds. - Weight::from_parts(128_977_323, 34125) - // Standard Error: 845_796 - .saturating_add(Weight::from_parts(1_311_388, 0).saturating_mul(r.into())) - // Standard Error: 845_796 - .saturating_add(Weight::from_parts(1_817_881, 0).saturating_mul(l.into())) + // Measured: `260 + r * (21 ±0)` + // Estimated: `30497` + // Minimum execution time: 47_184_000 picoseconds. + Weight::from_parts(46_969_960, 30497) + // Standard Error: 17_557 + .saturating_add(Weight::from_parts(280_693, 0).saturating_mul(r.into())) + // Standard Error: 17_557 + .saturating_add(Weight::from_parts(82_621, 0).saturating_mul(l.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -190,10 +190,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn bootstrap_refund () -> Weight { // Proof Size summary in bytes: - // Measured: `1046` - // Estimated: `22138` - // Minimum execution time: 263_656_000 picoseconds. - Weight::from_parts(354_866_000, 22138) + // Measured: `1301` + // Estimated: `11350` + // Minimum execution time: 121_774_000 picoseconds. + Weight::from_parts(123_046_000, 11350) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } @@ -213,10 +213,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn add_liquidity () -> Weight { // Proof Size summary in bytes: - // Measured: `704` - // Estimated: `33222` - // Minimum execution time: 496_537_000 picoseconds. - Weight::from_parts(659_502_000, 33222) + // Measured: `974` + // Estimated: `13940` + // Minimum execution time: 215_782_000 picoseconds. + Weight::from_parts(216_514_000, 13940) .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(9_u64)) } @@ -236,10 +236,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn remove_liquidity () -> Weight { // Proof Size summary in bytes: - // Measured: `1188` - // Estimated: `33222` - // Minimum execution time: 422_836_000 picoseconds. - Weight::from_parts(483_090_000, 33222) + // Measured: `1443` + // Estimated: `13940` + // Minimum execution time: 182_105_000 picoseconds. + Weight::from_parts(183_497_000, 13940) .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -252,16 +252,16 @@ impl dex_general::WeightInfo for WeightInfo { /// The range of component `a` is `[2, 10]`. fn swap_exact_assets_for_assets (a: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `0 + a * (435 ±0)` - // Estimated: `8211 + a * (8825 ±0)` - // Minimum execution time: 172_610_000 picoseconds. - Weight::from_parts(29_758_854, 8211) - // Standard Error: 5_812_451 - .saturating_add(Weight::from_parts(186_798_476, 0).saturating_mul(a.into())) + // Measured: `224 + a * (459 ±0)` + // Estimated: `3628 + a * (5180 ±0)` + // Minimum execution time: 134_419_000 picoseconds. + Weight::from_parts(8_495_929, 3628) + // Standard Error: 92_959 + .saturating_add(Weight::from_parts(64_344_913, 0).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into()))) - .saturating_add(Weight::from_parts(0, 8825).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(0, 5180).saturating_mul(a.into())) } /// Storage: Tokens Accounts (r:20 w:20) /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) @@ -272,16 +272,16 @@ impl dex_general::WeightInfo for WeightInfo { /// The range of component `a` is `[2, 10]`. fn swap_assets_for_exact_assets (a: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `0 + a * (435 ±0)` - // Estimated: `8211 + a * (8825 ±22)` - // Minimum execution time: 182_279_000 picoseconds. - Weight::from_parts(470_682_585, 8211) - // Standard Error: 3_226_168 - .saturating_add(Weight::from_parts(29_735_625, 0).saturating_mul(a.into())) + // Measured: `224 + a * (459 ±0)` + // Estimated: `3628 + a * (5180 ±22)` + // Minimum execution time: 134_610_000 picoseconds. + Weight::from_parts(9_747_661, 3628) + // Standard Error: 97_108 + .saturating_add(Weight::from_parts(63_951_511, 0).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(a.into()))) - .saturating_add(Weight::from_parts(0, 8825).saturating_mul(a.into())) + .saturating_add(Weight::from_parts(0, 5180).saturating_mul(a.into())) } /// Storage: DexGeneral BootstrapRewards (r:1 w:1) /// Proof: DexGeneral BootstrapRewards (max_values: None, max_size: Some(27032), added: 29507, mode: MaxEncodedLen) @@ -292,12 +292,12 @@ impl dex_general::WeightInfo for WeightInfo { /// The range of component `r` is `[1, 10]`. fn bootstrap_charge_reward (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `376 + r * (88 ±0)` - // Estimated: `35080 + r * (5180 ±0)` - // Minimum execution time: 110_830_000 picoseconds. - Weight::from_parts(66_891_238, 35080) - // Standard Error: 239_313 - .saturating_add(Weight::from_parts(56_380_379, 0).saturating_mul(r.into())) + // Measured: `646 + r * (88 ±0)` + // Estimated: `30497 + r * (5180 ±0)` + // Minimum execution time: 93_807_000 picoseconds. + Weight::from_parts(52_406_460, 30497) + // Standard Error: 40_599 + .saturating_add(Weight::from_parts(43_799_179, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(2_u64)) @@ -308,10 +308,10 @@ impl dex_general::WeightInfo for WeightInfo { /// Proof: DexGeneral BootstrapRewards (max_values: None, max_size: Some(27032), added: 29507, mode: MaxEncodedLen) fn bootstrap_withdraw_reward () -> Weight { // Proof Size summary in bytes: - // Measured: `135` + // Measured: `136` // Estimated: `30497` - // Minimum execution time: 39_192_000 picoseconds. - Weight::from_parts(42_401_000, 30497) + // Minimum execution time: 29_780_000 picoseconds. + Weight::from_parts(30_321_000, 30497) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/parachain/runtime/kintsugi/src/weights/dex_stable.rs b/parachain/runtime/kintsugi/src/weights/dex_stable.rs index fb3ff28b75..93ac2b6b24 100644 --- a/parachain/runtime/kintsugi/src/weights/dex_stable.rs +++ b/parachain/runtime/kintsugi/src/weights/dex_stable.rs @@ -2,17 +2,17 @@ //! Autogenerated weights for dex_stable //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-07-10, STEPS: `10`, REPEAT: `1`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: ``, CPU: `Intel(R) Core(TM) i7-6700 CPU @ 3.40GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: -// ./target/debug/interbtc-parachain +// target/release/interbtc-parachain // benchmark // pallet // --pallet -// dex-stable +// * // --extrinsic // * // --chain @@ -20,11 +20,11 @@ // --execution=wasm // --wasm-execution=compiled // --steps -// 10 +// 50 // --repeat -// 1 +// 10 // --output -// parachain/runtime/kintsugi/src/weights +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -52,12 +52,12 @@ impl dex_stable::WeightInfo for WeightInfo { /// The range of component `s` is `[0, 50]`. fn create_base_pool (b: u32, _s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `175` + // Measured: `227` // Estimated: `4281` - // Minimum execution time: 923_222_000 picoseconds. - Weight::from_parts(930_939_034, 4281) - // Standard Error: 317_902 - .saturating_add(Weight::from_parts(154_311, 0).saturating_mul(b.into())) + // Minimum execution time: 55_992_000 picoseconds. + Weight::from_parts(56_658_626, 4281) + // Standard Error: 8_375 + .saturating_add(Weight::from_parts(154_956, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -77,14 +77,14 @@ impl dex_stable::WeightInfo for WeightInfo { /// The range of component `s` is `[0, 50]`. fn create_meta_pool (m: u32, s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `1355` + // Measured: `1426` // Estimated: `7572` - // Minimum execution time: 1_510_682_000 picoseconds. - Weight::from_parts(1_509_960_386, 7572) - // Standard Error: 602_158 - .saturating_add(Weight::from_parts(914_689, 0).saturating_mul(m.into())) - // Standard Error: 103_829 - .saturating_add(Weight::from_parts(96_679, 0).saturating_mul(s.into())) + // Minimum execution time: 104_991_000 picoseconds. + Weight::from_parts(106_170_089, 7572) + // Standard Error: 150_554 + .saturating_add(Weight::from_parts(92_297, 0).saturating_mul(m.into())) + // Standard Error: 25_055 + .saturating_add(Weight::from_parts(69_010, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -101,12 +101,12 @@ impl dex_stable::WeightInfo for WeightInfo { /// The range of component `b` is `[2, 10]`. fn add_liquidity (b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `948 + b * (125 ±0)` + // Measured: `1264 + b * (125 ±0)` // Estimated: `4281 + b * (5180 ±0)` - // Minimum execution time: 3_222_842_000 picoseconds. - Weight::from_parts(1_446_309_446, 4281) - // Standard Error: 885_938 - .saturating_add(Weight::from_parts(889_673_438, 0).saturating_mul(b.into())) + // Minimum execution time: 196_874_000 picoseconds. + Weight::from_parts(98_585_099, 4281) + // Standard Error: 77_387 + .saturating_add(Weight::from_parts(50_481_828, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().writes(4_u64)) @@ -123,10 +123,10 @@ impl dex_stable::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn swap () -> Weight { // Proof Size summary in bytes: - // Measured: `2108` + // Measured: `2366` // Estimated: `11350` - // Minimum execution time: 2_137_339_000 picoseconds. - Weight::from_parts(2_137_339_000, 11350) + // Minimum execution time: 155_441_000 picoseconds. + Weight::from_parts(157_406_000, 11350) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -141,12 +141,12 @@ impl dex_stable::WeightInfo for WeightInfo { /// The range of component `b` is `[2, 10]`. fn remove_liquidity (b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `1057 + b * (192 ±0)` + // Measured: `1315 + b * (192 ±0)` // Estimated: `4281 + b * (5180 ±0)` - // Minimum execution time: 2_515_350_000 picoseconds. - Weight::from_parts(1_306_368_241, 4281) - // Standard Error: 2_505_739 - .saturating_add(Weight::from_parts(599_062_653, 0).saturating_mul(b.into())) + // Minimum execution time: 152_626_000 picoseconds. + Weight::from_parts(84_999_040, 4281) + // Standard Error: 67_946 + .saturating_add(Weight::from_parts(34_274_766, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) @@ -165,10 +165,10 @@ impl dex_stable::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn remove_liquidity_one_currency () -> Weight { // Proof Size summary in bytes: - // Measured: `2207` + // Measured: `2465` // Estimated: `8760` - // Minimum execution time: 2_167_491_000 picoseconds. - Weight::from_parts(2_167_491_000, 8760) + // Minimum execution time: 178_487_000 picoseconds. + Weight::from_parts(180_611_000, 8760) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -185,12 +185,12 @@ impl dex_stable::WeightInfo for WeightInfo { /// The range of component `b` is `[2, 10]`. fn remove_liquidity_imbalance (b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `1099 + b * (192 ±0)` + // Measured: `1357 + b * (192 ±0)` // Estimated: `4281 + b * (5180 ±0)` - // Minimum execution time: 2_586_449_000 picoseconds. - Weight::from_parts(1_361_082_704, 4281) - // Standard Error: 2_175_713 - .saturating_add(Weight::from_parts(608_779_034, 0).saturating_mul(b.into())) + // Minimum execution time: 177_556_000 picoseconds. + Weight::from_parts(99_852_974, 4281) + // Standard Error: 65_802 + .saturating_add(Weight::from_parts(39_938_485, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) @@ -211,14 +211,14 @@ impl dex_stable::WeightInfo for WeightInfo { /// The range of component `m` is `[2, 10]`. fn add_pool_and_base_pool_liquidity (b: u32, m: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `1437 + b * (187 ±0) + m * (121 ±0)` + // Measured: `1733 + b * (187 ±0) + m * (117 ±0)` // Estimated: `7572 + b * (5180 ±0) + m * (5180 ±0)` - // Minimum execution time: 11_589_457_000 picoseconds. - Weight::from_parts(2_489_097_862, 7572) - // Standard Error: 1_840_926 - .saturating_add(Weight::from_parts(730_145_710, 0).saturating_mul(b.into())) - // Standard Error: 1_840_926 - .saturating_add(Weight::from_parts(896_050_781, 0).saturating_mul(m.into())) + // Minimum execution time: 703_438_000 picoseconds. + Weight::from_parts(153_195_964, 7572) + // Standard Error: 149_131 + .saturating_add(Weight::from_parts(44_949_828, 0).saturating_mul(b.into())) + // Standard Error: 149_131 + .saturating_add(Weight::from_parts(55_200_238, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(m.into()))) @@ -240,14 +240,14 @@ impl dex_stable::WeightInfo for WeightInfo { /// The range of component `m` is `[2, 10]`. fn remove_pool_and_base_pool_liquidity (b: u32, m: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `1658 + b * (187 ±0) + m * (187 ±0)` + // Measured: `1978 + b * (187 ±0) + m * (185 ±0)` // Estimated: `7572 + b * (5180 ±0) + m * (5180 ±0)` - // Minimum execution time: 9_593_347_000 picoseconds. - Weight::from_parts(2_422_602_274, 7572) - // Standard Error: 3_066_114 - .saturating_add(Weight::from_parts(599_022_504, 0).saturating_mul(b.into())) - // Standard Error: 3_066_114 - .saturating_add(Weight::from_parts(598_545_261, 0).saturating_mul(m.into())) + // Minimum execution time: 556_584_000 picoseconds. + Weight::from_parts(166_130_458, 7572) + // Standard Error: 92_741 + .saturating_add(Weight::from_parts(33_437_802, 0).saturating_mul(b.into())) + // Standard Error: 92_741 + .saturating_add(Weight::from_parts(33_260_031, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(m.into()))) @@ -269,10 +269,10 @@ impl dex_stable::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn remove_pool_and_base_pool_liquidity_one_currency () -> Weight { // Proof Size summary in bytes: - // Measured: `4012` + // Measured: `4307` // Estimated: `13940` - // Minimum execution time: 4_107_621_000 picoseconds. - Weight::from_parts(4_107_621_000, 13940) + // Minimum execution time: 346_995_000 picoseconds. + Weight::from_parts(349_299_000, 13940) .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().writes(9_u64)) } @@ -288,10 +288,10 @@ impl dex_stable::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn swap_pool_from_base () -> Weight { // Proof Size summary in bytes: - // Measured: `4279` + // Measured: `4537` // Estimated: `39840` - // Minimum execution time: 5_638_902_000 picoseconds. - Weight::from_parts(5_638_902_000, 39840) + // Minimum execution time: 418_448_000 picoseconds. + Weight::from_parts(420_742_000, 39840) .saturating_add(T::DbWeight::get().reads(20_u64)) .saturating_add(T::DbWeight::get().writes(9_u64)) } @@ -307,10 +307,10 @@ impl dex_stable::WeightInfo for WeightInfo { /// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(35), added: 2510, mode: MaxEncodedLen) fn swap_pool_to_base () -> Weight { // Proof Size summary in bytes: - // Measured: `4042` + // Measured: `4337` // Estimated: `16530` - // Minimum execution time: 4_095_901_000 picoseconds. - Weight::from_parts(4_095_901_000, 16530) + // Minimum execution time: 325_201_000 picoseconds. + Weight::from_parts(328_067_000, 16530) .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().writes(9_u64)) } @@ -324,10 +324,10 @@ impl dex_stable::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn swap_meta_pool_underlying () -> Weight { // Proof Size summary in bytes: - // Measured: `2459` + // Measured: `2680` // Estimated: `11350` - // Minimum execution time: 2_196_520_000 picoseconds. - Weight::from_parts(2_196_520_000, 11350) + // Minimum execution time: 161_353_000 picoseconds. + Weight::from_parts(162_265_000, 11350) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -337,8 +337,8 @@ impl dex_stable::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `874` // Estimated: `4281` - // Minimum execution time: 505_835_000 picoseconds. - Weight::from_parts(505_835_000, 4281) + // Minimum execution time: 33_076_000 picoseconds. + Weight::from_parts(33_587_000, 4281) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -348,8 +348,8 @@ impl dex_stable::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `874` // Estimated: `4281` - // Minimum execution time: 516_813_000 picoseconds. - Weight::from_parts(516_813_000, 4281) + // Minimum execution time: 33_607_000 picoseconds. + Weight::from_parts(34_058_000, 4281) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -359,8 +359,8 @@ impl dex_stable::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `874` // Estimated: `4281` - // Minimum execution time: 506_259_000 picoseconds. - Weight::from_parts(506_259_000, 4281) + // Minimum execution time: 33_196_000 picoseconds. + Weight::from_parts(33_427_000, 4281) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -372,8 +372,8 @@ impl dex_stable::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `968` // Estimated: `4281` - // Minimum execution time: 651_728_000 picoseconds. - Weight::from_parts(651_728_000, 4281) + // Minimum execution time: 41_062_000 picoseconds. + Weight::from_parts(41_213_000, 4281) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -385,8 +385,8 @@ impl dex_stable::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `968` // Estimated: `4281` - // Minimum execution time: 643_370_000 picoseconds. - Weight::from_parts(643_370_000, 4281) + // Minimum execution time: 40_882_000 picoseconds. + Weight::from_parts(41_273_000, 4281) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -396,10 +396,10 @@ impl dex_stable::WeightInfo for WeightInfo { /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) fn withdraw_admin_fee () -> Weight { // Proof Size summary in bytes: - // Measured: `1843` + // Measured: `2064` // Estimated: `26890` - // Minimum execution time: 2_877_773_000 picoseconds. - Weight::from_parts(2_877_773_000, 26890) + // Minimum execution time: 170_291_000 picoseconds. + Weight::from_parts(171_493_000, 26890) .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/parachain/runtime/kintsugi/src/weights/dex_swap_router.rs b/parachain/runtime/kintsugi/src/weights/dex_swap_router.rs index fb79e2af29..16e8120fc8 100644 --- a/parachain/runtime/kintsugi/src/weights/dex_swap_router.rs +++ b/parachain/runtime/kintsugi/src/weights/dex_swap_router.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for dex_swap_router //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -45,9 +45,9 @@ impl dex_swap_router::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 787_000 picoseconds. - Weight::from_parts(687_931, 0) - // Standard Error: 1_758 - .saturating_add(Weight::from_parts(122_125, 0).saturating_mul(a.into())) + // Minimum execution time: 602_000 picoseconds. + Weight::from_parts(481_496, 0) + // Standard Error: 648 + .saturating_add(Weight::from_parts(104_815, 0).saturating_mul(a.into())) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/escrow.rs b/parachain/runtime/kintsugi/src/weights/escrow.rs index e5f68849f8..4ae4fb65d8 100644 --- a/parachain/runtime/kintsugi/src/weights/escrow.rs +++ b/parachain/runtime/kintsugi/src/weights/escrow.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for escrow //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -65,17 +65,21 @@ impl escrow::WeightInfo for WeightInfo { /// Storage: EscrowRewards TotalStake (r:1 w:1) /// Proof: EscrowRewards TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: EscrowRewards RewardCurrencies (r:1 w:0) - /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen) + /// Storage: EscrowRewards RewardTally (r:1 w:1) + /// Proof: EscrowRewards RewardTally (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) + /// Storage: EscrowRewards RewardPerToken (r:1 w:0) + /// Proof: EscrowRewards RewardPerToken (max_values: None, max_size: Some(59), added: 2534, mode: MaxEncodedLen) /// Storage: Escrow UserPointHistory (r:0 w:1) /// Proof: Escrow UserPointHistory (max_values: None, max_size: Some(88), added: 2563, mode: MaxEncodedLen) fn create_lock () -> Weight { // Proof Size summary in bytes: - // Measured: `540` - // Estimated: `178187` - // Minimum execution time: 545_084_000 picoseconds. - Weight::from_parts(554_318_000, 178187) - .saturating_add(T::DbWeight::get().reads(66_u64)) - .saturating_add(T::DbWeight::get().writes(62_u64)) + // Measured: `1094` + // Estimated: `136584` + // Minimum execution time: 463_989_000 picoseconds. + Weight::from_parts(466_794_000, 136584) + .saturating_add(T::DbWeight::get().reads(68_u64)) + .saturating_add(T::DbWeight::get().writes(63_u64)) } /// Storage: Escrow Locked (r:1 w:1) /// Proof: Escrow Locked (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen) @@ -100,17 +104,21 @@ impl escrow::WeightInfo for WeightInfo { /// Storage: EscrowRewards TotalStake (r:1 w:1) /// Proof: EscrowRewards TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: EscrowRewards RewardCurrencies (r:1 w:0) - /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen) + /// Storage: EscrowRewards RewardTally (r:1 w:1) + /// Proof: EscrowRewards RewardTally (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) + /// Storage: EscrowRewards RewardPerToken (r:1 w:0) + /// Proof: EscrowRewards RewardPerToken (max_values: None, max_size: Some(59), added: 2534, mode: MaxEncodedLen) /// Storage: Escrow UserPointHistory (r:0 w:1) /// Proof: Escrow UserPointHistory (max_values: None, max_size: Some(88), added: 2563, mode: MaxEncodedLen) fn increase_amount () -> Weight { // Proof Size summary in bytes: - // Measured: `1273` - // Estimated: `41511` - // Minimum execution time: 239_088_000 picoseconds. - Weight::from_parts(246_953_000, 41511) - .saturating_add(T::DbWeight::get().reads(12_u64)) - .saturating_add(T::DbWeight::get().writes(10_u64)) + // Measured: `1683` + // Estimated: `4733` + // Minimum execution time: 207_245_000 picoseconds. + Weight::from_parts(208_998_000, 4733) + .saturating_add(T::DbWeight::get().reads(14_u64)) + .saturating_add(T::DbWeight::get().writes(11_u64)) } /// Storage: Escrow Locked (r:1 w:1) /// Proof: Escrow Locked (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen) @@ -135,17 +143,21 @@ impl escrow::WeightInfo for WeightInfo { /// Storage: EscrowRewards TotalStake (r:1 w:1) /// Proof: EscrowRewards TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: EscrowRewards RewardCurrencies (r:1 w:0) - /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen) + /// Storage: EscrowRewards RewardTally (r:1 w:1) + /// Proof: EscrowRewards RewardTally (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) + /// Storage: EscrowRewards RewardPerToken (r:1 w:0) + /// Proof: EscrowRewards RewardPerToken (max_values: None, max_size: Some(59), added: 2534, mode: MaxEncodedLen) /// Storage: Escrow UserPointHistory (r:0 w:1) /// Proof: Escrow UserPointHistory (max_values: None, max_size: Some(88), added: 2563, mode: MaxEncodedLen) fn increase_unlock_height () -> Weight { // Proof Size summary in bytes: - // Measured: `1273` - // Estimated: `282567` - // Minimum execution time: 854_940_000 picoseconds. - Weight::from_parts(889_374_000, 282567) - .saturating_add(T::DbWeight::get().reads(108_u64)) - .saturating_add(T::DbWeight::get().writes(105_u64)) + // Measured: `1683` + // Estimated: `244557` + // Minimum execution time: 699_982_000 picoseconds. + Weight::from_parts(706_124_000, 244557) + .saturating_add(T::DbWeight::get().reads(110_u64)) + .saturating_add(T::DbWeight::get().writes(106_u64)) } /// Storage: Escrow Locked (r:1 w:1) /// Proof: Escrow Locked (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen) @@ -154,7 +166,11 @@ impl escrow::WeightInfo for WeightInfo { /// Storage: EscrowRewards TotalStake (r:1 w:1) /// Proof: EscrowRewards TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: EscrowRewards RewardCurrencies (r:1 w:0) - /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen) + /// Storage: EscrowRewards RewardTally (r:1 w:1) + /// Proof: EscrowRewards RewardTally (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) + /// Storage: EscrowRewards RewardPerToken (r:1 w:0) + /// Proof: EscrowRewards RewardPerToken (max_values: None, max_size: Some(59), added: 2534, mode: MaxEncodedLen) /// Storage: Escrow SlopeChanges (r:97 w:0) /// Proof: Escrow SlopeChanges (max_values: None, max_size: Some(36), added: 2511, mode: MaxEncodedLen) /// Storage: Escrow Epoch (r:1 w:1) @@ -173,15 +189,33 @@ impl escrow::WeightInfo for WeightInfo { /// Proof: Escrow UserPointHistory (max_values: None, max_size: Some(88), added: 2563, mode: MaxEncodedLen) fn withdraw () -> Weight { // Proof Size summary in bytes: - // Measured: `1455` - // Estimated: `282678` - // Minimum execution time: 847_706_000 picoseconds. - Weight::from_parts(869_922_000, 282678) - .saturating_add(T::DbWeight::get().reads(108_u64)) - .saturating_add(T::DbWeight::get().writes(107_u64)) + // Measured: `1902` + // Estimated: `244557` + // Minimum execution time: 681_896_000 picoseconds. + Weight::from_parts(684_381_000, 244557) + .saturating_add(T::DbWeight::get().reads(110_u64)) + .saturating_add(T::DbWeight::get().writes(108_u64)) + } + /// Storage: Escrow Limits (r:0 w:1) + /// Proof: Escrow Limits (max_values: None, max_size: Some(56), added: 2531, mode: MaxEncodedLen) + fn set_account_limit () -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 10_631_000 picoseconds. + Weight::from_parts(10_732_000, 0) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: Escrow Blocks (r:0 w:1) + /// Proof: Escrow Blocks (max_values: None, max_size: Some(49), added: 2524, mode: MaxEncodedLen) + fn set_account_block () -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 10_291_000 picoseconds. + Weight::from_parts(10_481_000, 0) + .saturating_add(T::DbWeight::get().writes(1_u64)) } - /// Storage: EscrowRewards Stake (r:1 w:1) - /// Proof: EscrowRewards Stake (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) /// Storage: Escrow Locked (r:1 w:1) /// Proof: Escrow Locked (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen) /// Storage: Tokens Accounts (r:1 w:1) @@ -200,41 +234,21 @@ impl escrow::WeightInfo for WeightInfo { /// Proof: Escrow PointHistory (max_values: None, max_size: Some(40), added: 2515, mode: MaxEncodedLen) /// Storage: Escrow UserPointEpoch (r:1 w:1) /// Proof: Escrow UserPointEpoch (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen) + /// Storage: EscrowRewards Stake (r:1 w:1) + /// Proof: EscrowRewards Stake (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) /// Storage: EscrowRewards TotalStake (r:1 w:1) /// Proof: EscrowRewards TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: EscrowRewards RewardCurrencies (r:1 w:0) - /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) - /// Storage: Escrow ThresholdPercentage (r:1 w:0) - /// Proof: Escrow ThresholdPercentage (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) + /// Proof: EscrowRewards RewardCurrencies (max_values: None, max_size: Some(28), added: 2503, mode: MaxEncodedLen) /// Storage: Escrow UserPointHistory (r:0 w:1) /// Proof: Escrow UserPointHistory (max_values: None, max_size: Some(88), added: 2563, mode: MaxEncodedLen) fn update_user_stake () -> Weight { // Proof Size summary in bytes: - // Measured: `1273` - // Estimated: `281542` - // Minimum execution time: 359_000_000 picoseconds. - Weight::from_parts(363_000_000, 281542) - .saturating_add(T::DbWeight::get().reads(108_u64)) - .saturating_add(T::DbWeight::get().writes(104_u64)) - } - - fn set_account_limit () -> Weight { - // Proof Size summary in bytes: - // Measured: `1273` - // Estimated: `281542` - // Minimum execution time: 359_000_000 picoseconds. - Weight::from_parts(363_000_000, 281542) - .saturating_add(T::DbWeight::get().reads(108_u64)) - .saturating_add(T::DbWeight::get().writes(104_u64)) - } - - fn set_account_block () -> Weight { - // Proof Size summary in bytes: - // Measured: `1273` - // Estimated: `281542` - // Minimum execution time: 359_000_000 picoseconds. - Weight::from_parts(363_000_000, 281542) - .saturating_add(T::DbWeight::get().reads(108_u64)) + // Measured: `1490` + // Estimated: `242046` + // Minimum execution time: 661_555_000 picoseconds. + Weight::from_parts(667_447_000, 242046) + .saturating_add(T::DbWeight::get().reads(107_u64)) .saturating_add(T::DbWeight::get().writes(104_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/farming.rs b/parachain/runtime/kintsugi/src/weights/farming.rs index 0e183f8620..1722a01b33 100644 --- a/parachain/runtime/kintsugi/src/weights/farming.rs +++ b/parachain/runtime/kintsugi/src/weights/farming.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for farming //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -47,15 +47,15 @@ impl farming::WeightInfo for WeightInfo { /// The range of component `c` is `[1, 4]`. fn on_initialize (c: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `189 + c * (41 ±0)` - // Estimated: `6342 + c * (3717 ±45)` - // Minimum execution time: 36_730_000 picoseconds. - Weight::from_parts(24_682_700, 6342) - // Standard Error: 165_655 - .saturating_add(Weight::from_parts(14_905_914, 0).saturating_mul(c.into())) + // Measured: `208 + c * (41 ±0)` + // Estimated: `3539 + c * (2549 ±0)` + // Minimum execution time: 28_858_000 picoseconds. + Weight::from_parts(18_114_846, 3539) + // Standard Error: 91_877 + .saturating_add(Weight::from_parts(12_423_979, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into()))) - .saturating_add(Weight::from_parts(0, 3717).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 2549).saturating_mul(c.into())) } /// Storage: Tokens Accounts (r:2 w:2) /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) @@ -65,10 +65,10 @@ impl farming::WeightInfo for WeightInfo { /// Proof: Farming RewardSchedules (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen) fn update_reward_schedule () -> Weight { // Proof Size summary in bytes: - // Measured: `435` - // Estimated: `13302` - // Minimum execution time: 118_144_000 picoseconds. - Weight::from_parts(133_960_000, 13302) + // Measured: `847` + // Estimated: `6170` + // Minimum execution time: 97_555_000 picoseconds. + Weight::from_parts(97_986_000, 6170) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -80,10 +80,10 @@ impl farming::WeightInfo for WeightInfo { /// Proof: Farming RewardSchedules (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen) fn remove_reward_schedule () -> Weight { // Proof Size summary in bytes: - // Measured: `582` - // Estimated: `9763` - // Minimum execution time: 94_335_000 picoseconds. - Weight::from_parts(101_456_000, 9763) + // Measured: `945` + // Estimated: `6170` + // Minimum execution time: 76_313_000 picoseconds. + Weight::from_parts(76_793_000, 6170) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -102,17 +102,17 @@ impl farming::WeightInfo for WeightInfo { /// The range of component `c` is `[1, 4]`. fn deposit (c: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `683 + c * (70 ±0)` - // Estimated: `16211 + c * (5122 ±0)` - // Minimum execution time: 118_990_000 picoseconds. - Weight::from_parts(108_592_878, 16211) - // Standard Error: 360_926 - .saturating_add(Weight::from_parts(18_648_671, 0).saturating_mul(c.into())) + // Measured: `900 + c * (70 ±0)` + // Estimated: `3603 + c * (2577 ±0)` + // Minimum execution time: 92_445_000 picoseconds. + Weight::from_parts(81_740_057, 3603) + // Standard Error: 37_348 + .saturating_add(Weight::from_parts(12_635_191, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into()))) - .saturating_add(Weight::from_parts(0, 5122).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 2577).saturating_mul(c.into())) } /// Storage: FarmingRewards RewardCurrencies (r:1 w:0) /// Proof: FarmingRewards RewardCurrencies (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) @@ -129,17 +129,17 @@ impl farming::WeightInfo for WeightInfo { /// The range of component `c` is `[1, 4]`. fn withdraw (c: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `683 + c * (70 ±0)` - // Estimated: `16211 + c * (5122 ±0)` - // Minimum execution time: 110_617_000 picoseconds. - Weight::from_parts(98_027_403, 16211) - // Standard Error: 283_984 - .saturating_add(Weight::from_parts(18_696_973, 0).saturating_mul(c.into())) + // Measured: `900 + c * (70 ±0)` + // Estimated: `3603 + c * (2577 ±0)` + // Minimum execution time: 85_862_000 picoseconds. + Weight::from_parts(74_571_773, 3603) + // Standard Error: 47_353 + .saturating_add(Weight::from_parts(12_753_635, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into()))) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into()))) - .saturating_add(Weight::from_parts(0, 5122).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 2577).saturating_mul(c.into())) } /// Storage: FarmingRewards Stake (r:1 w:0) /// Proof: FarmingRewards Stake (max_values: None, max_size: Some(75), added: 2550, mode: MaxEncodedLen) @@ -155,10 +155,10 @@ impl farming::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn claim () -> Weight { // Proof Size summary in bytes: - // Measured: `956` - // Estimated: `23913` - // Minimum execution time: 160_561_000 picoseconds. - Weight::from_parts(171_999_000, 23913) + // Measured: `1318` + // Estimated: `6170` + // Minimum execution time: 127_536_000 picoseconds. + Weight::from_parts(130_081_000, 6170) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } diff --git a/parachain/runtime/kintsugi/src/weights/fee.rs b/parachain/runtime/kintsugi/src/weights/fee.rs index b56e56275f..0829a577f0 100644 --- a/parachain/runtime/kintsugi/src/weights/fee.rs +++ b/parachain/runtime/kintsugi/src/weights/fee.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for fee //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -51,7 +51,7 @@ impl fee::WeightInfo for WeightInfo { /// Storage: VaultRewards TotalStake (r:1 w:0) /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultRewards RewardCurrencies (r:1 w:1) - /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) + /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(50), added: 2525, mode: MaxEncodedLen) /// Storage: VaultRewards RewardPerToken (r:2 w:2) /// Proof: VaultRewards RewardPerToken (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen) /// Storage: VaultRewards TotalRewards (r:2 w:2) @@ -86,10 +86,10 @@ impl fee::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn withdraw_rewards () -> Weight { // Proof Size summary in bytes: - // Measured: `2602` - // Estimated: `111780` - // Minimum execution time: 754_264_000 picoseconds. - Weight::from_parts(767_173_000, 111780) + // Measured: `2962` + // Estimated: `11350` + // Minimum execution time: 590_372_000 picoseconds. + Weight::from_parts(594_450_000, 11350) .saturating_add(T::DbWeight::get().reads(35_u64)) .saturating_add(T::DbWeight::get().writes(25_u64)) } @@ -99,8 +99,8 @@ impl fee::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_847_000 picoseconds. - Weight::from_parts(11_537_000, 0) + // Minimum execution time: 8_747_000 picoseconds. + Weight::from_parts(9_008_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Fee IssueGriefingCollateral (r:0 w:1) @@ -109,8 +109,8 @@ impl fee::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_990_000 picoseconds. - Weight::from_parts(11_634_000, 0) + // Minimum execution time: 8_737_000 picoseconds. + Weight::from_parts(8_998_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Fee RedeemFee (r:0 w:1) @@ -119,8 +119,8 @@ impl fee::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 11_158_000 picoseconds. - Weight::from_parts(11_732_000, 0) + // Minimum execution time: 8_868_000 picoseconds. + Weight::from_parts(9_038_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Fee PremiumRedeemFee (r:0 w:1) @@ -129,8 +129,8 @@ impl fee::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 11_054_000 picoseconds. - Weight::from_parts(11_731_000, 0) + // Minimum execution time: 8_757_000 picoseconds. + Weight::from_parts(8_957_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Fee PunishmentFee (r:0 w:1) @@ -139,8 +139,8 @@ impl fee::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 11_047_000 picoseconds. - Weight::from_parts(12_013_000, 0) + // Minimum execution time: 8_948_000 picoseconds. + Weight::from_parts(9_099_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Fee ReplaceGriefingCollateral (r:0 w:1) @@ -149,18 +149,21 @@ impl fee::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_872_000 picoseconds. - Weight::from_parts(11_479_000, 0) + // Minimum execution time: 8_858_000 picoseconds. + Weight::from_parts(9_028_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } + /// Storage: Nomination Vaults (r:1 w:0) + /// Proof: Nomination Vaults (max_values: None, max_size: Some(71), added: 2546, mode: MaxEncodedLen) /// Storage: Fee Commission (r:0 w:1) /// Proof: Fee Commission (max_values: None, max_size: Some(86), added: 2561, mode: MaxEncodedLen) fn set_commission () -> Weight { // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 14_132_000 picoseconds. - Weight::from_parts(14_831_000, 0) + // Measured: `167` + // Estimated: `3536` + // Minimum execution time: 19_309_000 picoseconds. + Weight::from_parts(19_509_000, 3536) + .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/frame_system.rs b/parachain/runtime/kintsugi/src/weights/frame_system.rs index ef4cd08092..3d55f7f149 100644 --- a/parachain/runtime/kintsugi/src/weights/frame_system.rs +++ b/parachain/runtime/kintsugi/src/weights/frame_system.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for frame_system //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -45,20 +45,20 @@ impl frame_system::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 6_185_000 picoseconds. - Weight::from_parts(6_457_000, 0) - // Standard Error: 1 - .saturating_add(Weight::from_parts(676, 0).saturating_mul(b.into())) + // Minimum execution time: 4_750_000 picoseconds. + Weight::from_parts(15_710_877, 0) + // Standard Error: 14 + .saturating_add(Weight::from_parts(576, 0).saturating_mul(b.into())) } /// The range of component `b` is `[0, 3932160]`. fn remark_with_event (b: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 20_064_000 picoseconds. - Weight::from_parts(20_580_000, 0) - // Standard Error: 2 - .saturating_add(Weight::from_parts(2_705, 0).saturating_mul(b.into())) + // Minimum execution time: 15_521_000 picoseconds. + Weight::from_parts(15_681_000, 0) + // Standard Error: 7 + .saturating_add(Weight::from_parts(1_829, 0).saturating_mul(b.into())) } /// Storage: System Digest (r:1 w:1) /// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured) @@ -68,8 +68,8 @@ impl frame_system::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `1485` - // Minimum execution time: 11_596_000 picoseconds. - Weight::from_parts(12_481_000, 1485) + // Minimum execution time: 9_218_000 picoseconds. + Weight::from_parts(9_369_000, 1485) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -80,10 +80,10 @@ impl frame_system::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 6_243_000 picoseconds. - Weight::from_parts(6_294_000, 0) - // Standard Error: 3_877 - .saturating_add(Weight::from_parts(1_691_833, 0).saturating_mul(i.into())) + // Minimum execution time: 4_710_000 picoseconds. + Weight::from_parts(4_800_000, 0) + // Standard Error: 7_041 + .saturating_add(Weight::from_parts(1_289_318, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) } /// Storage: Skipped Metadata (r:0 w:0) @@ -93,10 +93,10 @@ impl frame_system::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 6_147_000 picoseconds. - Weight::from_parts(6_203_000, 0) - // Standard Error: 2_228 - .saturating_add(Weight::from_parts(1_139_334, 0).saturating_mul(i.into())) + // Minimum execution time: 4_789_000 picoseconds. + Weight::from_parts(4_920_000, 0) + // Standard Error: 2_480 + .saturating_add(Weight::from_parts(867_765, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) } /// Storage: Skipped Metadata (r:0 w:0) @@ -104,14 +104,29 @@ impl frame_system::WeightInfo for WeightInfo { /// The range of component `p` is `[0, 1000]`. fn kill_prefix (p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `98 + p * (69 ±0)` - // Estimated: `94 + p * (70 ±0)` - // Minimum execution time: 10_838_000 picoseconds. - Weight::from_parts(11_004_000, 94) - // Standard Error: 5_042 - .saturating_add(Weight::from_parts(2_160_326, 0).saturating_mul(p.into())) + // Measured: `124 + p * (69 ±0)` + // Estimated: `111 + p * (70 ±0)` + // Minimum execution time: 8_587_000 picoseconds. + Weight::from_parts(8_767_000, 111) + // Standard Error: 1_790 + .saturating_add(Weight::from_parts(1_508_078, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into()))) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into()))) .saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into())) } + /// Storage: System Digest (r:1 w:1) + /// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured) + /// Storage: unknown `0x3a636f6465` (r:0 w:1) + /// Proof Skipped: unknown `0x3a636f6465` (r:0 w:1) + fn set_code() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `1485` + // Minimum execution time: 93_052_017_000 picoseconds. + Weight::from_parts(98_271_042_000, 0) + .saturating_add(Weight::from_parts(0, 1485)) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(2)) + } + } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/issue.rs b/parachain/runtime/kintsugi/src/weights/issue.rs index ac2222ea27..10f28c57a2 100644 --- a/parachain/runtime/kintsugi/src/weights/issue.rs +++ b/parachain/runtime/kintsugi/src/weights/issue.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for issue //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -48,8 +48,6 @@ impl issue::WeightInfo for WeightInfo { /// Proof: BTCRelay BestBlockHeight (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) /// Storage: VaultRegistry Vaults (r:1 w:1) /// Proof: VaultRegistry Vaults (max_values: None, max_size: Some(260), added: 2735, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:2 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: Fee IssueGriefingCollateral (r:1 w:0) @@ -80,11 +78,11 @@ impl issue::WeightInfo for WeightInfo { /// Proof: Issue IssueRequests (max_values: None, max_size: Some(272), added: 2747, mode: MaxEncodedLen) fn request_issue () -> Weight { // Proof Size summary in bytes: - // Measured: `2485` - // Estimated: `43976` - // Minimum execution time: 814_670_000 picoseconds. - Weight::from_parts(855_324_000, 43976) - .saturating_add(T::DbWeight::get().reads(19_u64)) + // Measured: `2718` + // Estimated: `6028` + // Minimum execution time: 558_298_000 picoseconds. + Weight::from_parts(565_393_000, 6028) + .saturating_add(T::DbWeight::get().reads(18_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } /// Storage: Issue IssueRequests (r:1 w:1) @@ -117,18 +115,18 @@ impl issue::WeightInfo for WeightInfo { /// The range of component `b` is `[770, 2048]`. fn execute_issue_exact (h: u32, i: u32, o: u32, b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `2196` - // Estimated: `32731` - // Minimum execution time: 258_357_000 picoseconds. - Weight::from_parts(229_089_248, 32731) - // Standard Error: 163_921 - .saturating_add(Weight::from_parts(6_691_991, 0).saturating_mul(h.into())) - // Standard Error: 147_709 - .saturating_add(Weight::from_parts(1_729_821, 0).saturating_mul(i.into())) - // Standard Error: 147_709 - .saturating_add(Weight::from_parts(601_182, 0).saturating_mul(o.into())) - // Standard Error: 1_059 - .saturating_add(Weight::from_parts(6_098, 0).saturating_mul(b.into())) + // Measured: `2434` + // Estimated: `3737` + // Minimum execution time: 198_538_000 picoseconds. + Weight::from_parts(171_478_384, 3737) + // Standard Error: 67_279 + .saturating_add(Weight::from_parts(3_496_696, 0).saturating_mul(h.into())) + // Standard Error: 60_626 + .saturating_add(Weight::from_parts(794_967, 0).saturating_mul(i.into())) + // Standard Error: 60_626 + .saturating_add(Weight::from_parts(420_219, 0).saturating_mul(o.into())) + // Standard Error: 435 + .saturating_add(Weight::from_parts(5_157, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -152,8 +150,6 @@ impl issue::WeightInfo for WeightInfo { /// Proof: VaultRegistry Vaults (max_values: None, max_size: Some(260), added: 2735, mode: MaxEncodedLen) /// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0) /// Proof: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: VaultStaking Nonce (r:1 w:0) @@ -174,19 +170,19 @@ impl issue::WeightInfo for WeightInfo { /// The range of component `b` is `[770, 2048]`. fn execute_issue_overpayment (h: u32, i: u32, o: u32, b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `3018` - // Estimated: `49856` - // Minimum execution time: 417_315_000 picoseconds. - Weight::from_parts(426_906_569, 49856) - // Standard Error: 220_929 - .saturating_add(Weight::from_parts(7_225_197, 0).saturating_mul(h.into())) - // Standard Error: 199_079 - .saturating_add(Weight::from_parts(393_016, 0).saturating_mul(i.into())) - // Standard Error: 199_079 - .saturating_add(Weight::from_parts(13_273, 0).saturating_mul(o.into())) - // Standard Error: 1_428 - .saturating_add(Weight::from_parts(257, 0).saturating_mul(b.into())) - .saturating_add(T::DbWeight::get().reads(18_u64)) + // Measured: `3285` + // Estimated: `3737` + // Minimum execution time: 316_013_000 picoseconds. + Weight::from_parts(296_206_373, 3737) + // Standard Error: 170_956 + .saturating_add(Weight::from_parts(3_648_998, 0).saturating_mul(h.into())) + // Standard Error: 154_049 + .saturating_add(Weight::from_parts(965_687, 0).saturating_mul(i.into())) + // Standard Error: 154_049 + .saturating_add(Weight::from_parts(440_368, 0).saturating_mul(o.into())) + // Standard Error: 1_105 + .saturating_add(Weight::from_parts(1_242, 0).saturating_mul(b.into())) + .saturating_add(T::DbWeight::get().reads(17_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } /// Storage: Issue IssueRequests (r:1 w:1) @@ -219,20 +215,18 @@ impl issue::WeightInfo for WeightInfo { /// The range of component `i` is `[1, 10]`. /// The range of component `o` is `[1, 10]`. /// The range of component `b` is `[770, 2048]`. - fn execute_issue_underpayment (h: u32, i: u32, o: u32, b: u32, ) -> Weight { + fn execute_issue_underpayment (h: u32, i: u32, o: u32, _b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `2449` - // Estimated: `34232` - // Minimum execution time: 307_256_000 picoseconds. - Weight::from_parts(293_418_122, 34232) - // Standard Error: 194_866 - .saturating_add(Weight::from_parts(6_661_934, 0).saturating_mul(h.into())) - // Standard Error: 175_594 - .saturating_add(Weight::from_parts(781_581, 0).saturating_mul(i.into())) - // Standard Error: 175_594 - .saturating_add(Weight::from_parts(408_936, 0).saturating_mul(o.into())) - // Standard Error: 1_260 - .saturating_add(Weight::from_parts(5_842, 0).saturating_mul(b.into())) + // Measured: `2739` + // Estimated: `3737` + // Minimum execution time: 236_814_000 picoseconds. + Weight::from_parts(218_087_002, 3737) + // Standard Error: 143_849 + .saturating_add(Weight::from_parts(3_739_468, 0).saturating_mul(h.into())) + // Standard Error: 129_622 + .saturating_add(Weight::from_parts(1_289_008, 0).saturating_mul(i.into())) + // Standard Error: 129_622 + .saturating_add(Weight::from_parts(452_541, 0).saturating_mul(o.into())) .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -266,18 +260,18 @@ impl issue::WeightInfo for WeightInfo { /// The range of component `b` is `[770, 2048]`. fn execute_expired_issue_exact (h: u32, i: u32, o: u32, b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `3119 + o * (8 ±0)` - // Estimated: `32731` - // Minimum execution time: 321_847_000 picoseconds. - Weight::from_parts(307_881_120, 32731) - // Standard Error: 116_140 - .saturating_add(Weight::from_parts(2_633_088, 0).saturating_mul(h.into())) - // Standard Error: 104_654 - .saturating_add(Weight::from_parts(1_883_088, 0).saturating_mul(i.into())) - // Standard Error: 104_654 - .saturating_add(Weight::from_parts(516_606, 0).saturating_mul(o.into())) - // Standard Error: 751 - .saturating_add(Weight::from_parts(7_190, 0).saturating_mul(b.into())) + // Measured: `3567` + // Estimated: `3737` + // Minimum execution time: 206_463_000 picoseconds. + Weight::from_parts(179_023_981, 3737) + // Standard Error: 118_695 + .saturating_add(Weight::from_parts(3_632_454, 0).saturating_mul(h.into())) + // Standard Error: 106_956 + .saturating_add(Weight::from_parts(825_036, 0).saturating_mul(i.into())) + // Standard Error: 106_956 + .saturating_add(Weight::from_parts(185_589, 0).saturating_mul(o.into())) + // Standard Error: 767 + .saturating_add(Weight::from_parts(6_936, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -301,8 +295,6 @@ impl issue::WeightInfo for WeightInfo { /// Proof: VaultRegistry Vaults (max_values: None, max_size: Some(260), added: 2735, mode: MaxEncodedLen) /// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0) /// Proof: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: VaultStaking Nonce (r:1 w:0) @@ -321,17 +313,21 @@ impl issue::WeightInfo for WeightInfo { /// The range of component `i` is `[1, 10]`. /// The range of component `o` is `[1, 10]`. /// The range of component `b` is `[770, 2048]`. - fn execute_expired_issue_overpayment (h: u32, i: u32, _o: u32, _b: u32, ) -> Weight { + fn execute_expired_issue_overpayment (h: u32, i: u32, o: u32, b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `3787 + i * (9 ±0)` - // Estimated: `49856` - // Minimum execution time: 509_824_000 picoseconds. - Weight::from_parts(524_007_287, 49856) - // Standard Error: 167_179 - .saturating_add(Weight::from_parts(2_125_670, 0).saturating_mul(h.into())) - // Standard Error: 150_645 - .saturating_add(Weight::from_parts(1_433_567, 0).saturating_mul(i.into())) - .saturating_add(T::DbWeight::get().reads(18_u64)) + // Measured: `4039 + h * (17 ±0) + i * (2 ±0)` + // Estimated: `3737` + // Minimum execution time: 326_534_000 picoseconds. + Weight::from_parts(312_629_634, 3737) + // Standard Error: 118_522 + .saturating_add(Weight::from_parts(3_380_960, 0).saturating_mul(h.into())) + // Standard Error: 106_800 + .saturating_add(Weight::from_parts(561_891, 0).saturating_mul(i.into())) + // Standard Error: 106_800 + .saturating_add(Weight::from_parts(164_257, 0).saturating_mul(o.into())) + // Standard Error: 766 + .saturating_add(Weight::from_parts(3_419, 0).saturating_mul(b.into())) + .saturating_add(T::DbWeight::get().reads(17_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } /// Storage: Issue IssueRequests (r:1 w:1) @@ -366,18 +362,18 @@ impl issue::WeightInfo for WeightInfo { /// The range of component `b` is `[770, 2048]`. fn execute_expired_issue_underpayment (h: u32, i: u32, o: u32, b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `3256 + h * (9 ±0) + i * (13 ±0)` - // Estimated: `34232` - // Minimum execution time: 389_642_000 picoseconds. - Weight::from_parts(379_986_977, 34232) - // Standard Error: 121_056 - .saturating_add(Weight::from_parts(2_111_609, 0).saturating_mul(h.into())) - // Standard Error: 109_084 - .saturating_add(Weight::from_parts(1_421_025, 0).saturating_mul(i.into())) - // Standard Error: 109_084 - .saturating_add(Weight::from_parts(541_226, 0).saturating_mul(o.into())) - // Standard Error: 782 - .saturating_add(Weight::from_parts(3_847, 0).saturating_mul(b.into())) + // Measured: `3633 + o * (11 ±0)` + // Estimated: `3737` + // Minimum execution time: 245_292_000 picoseconds. + Weight::from_parts(218_248_263, 3737) + // Standard Error: 75_656 + .saturating_add(Weight::from_parts(3_638_323, 0).saturating_mul(h.into())) + // Standard Error: 68_174 + .saturating_add(Weight::from_parts(1_189_484, 0).saturating_mul(i.into())) + // Standard Error: 68_174 + .saturating_add(Weight::from_parts(378_537, 0).saturating_mul(o.into())) + // Standard Error: 489 + .saturating_add(Weight::from_parts(4_279, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -393,10 +389,10 @@ impl issue::WeightInfo for WeightInfo { /// Proof: VaultRegistry Vaults (max_values: None, max_size: Some(260), added: 2735, mode: MaxEncodedLen) fn cancel_issue () -> Weight { // Proof Size summary in bytes: - // Measured: `1496` - // Estimated: `11929` - // Minimum execution time: 173_735_000 picoseconds. - Weight::from_parts(181_182_000, 11929) + // Measured: `1495` + // Estimated: `3737` + // Minimum execution time: 91_653_000 picoseconds. + Weight::from_parts(93_397_000, 3737) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -406,8 +402,8 @@ impl issue::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 23_418_000 picoseconds. - Weight::from_parts(24_350_000, 0) + // Minimum execution time: 18_417_000 picoseconds. + Weight::from_parts(18_597_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/loans.rs b/parachain/runtime/kintsugi/src/weights/loans.rs index d0a1374a8d..3b4ad2cf10 100644 --- a/parachain/runtime/kintsugi/src/weights/loans.rs +++ b/parachain/runtime/kintsugi/src/weights/loans.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for loans //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -53,9 +53,9 @@ impl loans::WeightInfo for WeightInfo { fn add_market () -> Weight { // Proof Size summary in bytes: // Measured: `78` - // Estimated: `11264` - // Minimum execution time: 70_297_000 picoseconds. - Weight::from_parts(77_026_000, 11264) + // Estimated: `6260` + // Minimum execution time: 55_221_000 picoseconds. + Weight::from_parts(55_742_000, 6260) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -65,8 +65,8 @@ impl loans::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `343` // Estimated: `3625` - // Minimum execution time: 35_711_000 picoseconds. - Weight::from_parts(38_488_000, 3625) + // Minimum execution time: 27_365_000 picoseconds. + Weight::from_parts(27_936_000, 3625) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -76,8 +76,8 @@ impl loans::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `343` // Estimated: `3625` - // Minimum execution time: 37_390_000 picoseconds. - Weight::from_parts(40_074_000, 3625) + // Minimum execution time: 28_928_000 picoseconds. + Weight::from_parts(29_940_000, 3625) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -87,8 +87,8 @@ impl loans::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `343` // Estimated: `3625` - // Minimum execution time: 41_759_000 picoseconds. - Weight::from_parts(43_543_000, 3625) + // Minimum execution time: 32_194_000 picoseconds. + Weight::from_parts(32_676_000, 3625) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -99,9 +99,9 @@ impl loans::WeightInfo for WeightInfo { fn force_update_market () -> Weight { // Proof Size summary in bytes: // Measured: `354` - // Estimated: `7128` - // Minimum execution time: 50_832_000 picoseconds. - Weight::from_parts(53_132_000, 7128) + // Estimated: `3625` + // Minimum execution time: 39_650_000 picoseconds. + Weight::from_parts(40_211_000, 3625) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -111,10 +111,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn add_reward () -> Weight { // Proof Size summary in bytes: - // Measured: `490` - // Estimated: `9763` - // Minimum execution time: 101_577_000 picoseconds. - Weight::from_parts(104_741_000, 9763) + // Measured: `821` + // Estimated: `6170` + // Minimum execution time: 85_942_000 picoseconds. + Weight::from_parts(86_864_000, 6170) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -131,9 +131,9 @@ impl loans::WeightInfo for WeightInfo { fn update_market_reward_speed () -> Weight { // Proof Size summary in bytes: // Measured: `357` - // Estimated: `20300` - // Minimum execution time: 83_498_000 picoseconds. - Weight::from_parts(84_524_000, 20300) + // Estimated: `6260` + // Minimum execution time: 64_088_000 picoseconds. + Weight::from_parts(64_479_000, 6260) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -167,10 +167,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn claim_reward () -> Weight { // Proof Size summary in bytes: - // Measured: `1808` - // Estimated: `57382` - // Minimum execution time: 268_339_000 picoseconds. - Weight::from_parts(289_641_000, 57382) + // Measured: `2066` + // Estimated: `8760` + // Minimum execution time: 207_856_000 picoseconds. + Weight::from_parts(209_128_000, 8760) .saturating_add(T::DbWeight::get().reads(17_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -204,10 +204,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn claim_reward_for_market () -> Weight { // Proof Size summary in bytes: - // Measured: `1808` - // Estimated: `54747` - // Minimum execution time: 251_481_000 picoseconds. - Weight::from_parts(262_703_000, 54747) + // Measured: `2066` + // Estimated: `8760` + // Minimum execution time: 196_654_000 picoseconds. + Weight::from_parts(199_430_000, 8760) .saturating_add(T::DbWeight::get().reads(16_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -243,10 +243,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans AccountDeposits (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) fn mint () -> Weight { // Proof Size summary in bytes: - // Measured: `1188` - // Estimated: `56787` - // Minimum execution time: 366_030_000 picoseconds. - Weight::from_parts(379_785_000, 56787) + // Measured: `1481` + // Estimated: `8760` + // Minimum execution time: 284_911_000 picoseconds. + Weight::from_parts(286_594_000, 8760) .saturating_add(T::DbWeight::get().reads(18_u64)) .saturating_add(T::DbWeight::get().writes(9_u64)) } @@ -288,10 +288,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans BorrowIndex (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) fn borrow () -> Weight { // Proof Size summary in bytes: - // Measured: `1698` - // Estimated: `62778` - // Minimum execution time: 349_521_000 picoseconds. - Weight::from_parts(356_928_000, 62778) + // Measured: `1991` + // Estimated: `6260` + // Minimum execution time: 265_201_000 picoseconds. + Weight::from_parts(267_325_000, 6260) .saturating_add(T::DbWeight::get().reads(20_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -329,10 +329,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans RewardAccrued (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) fn redeem () -> Weight { // Proof Size summary in bytes: - // Measured: `1723` - // Estimated: `58288` - // Minimum execution time: 438_880_000 picoseconds. - Weight::from_parts(444_590_000, 58288) + // Measured: `2016` + // Estimated: `8760` + // Minimum execution time: 345_392_000 picoseconds. + Weight::from_parts(346_684_000, 8760) .saturating_add(T::DbWeight::get().reads(19_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -370,10 +370,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans RewardAccrued (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) fn redeem_all () -> Weight { // Proof Size summary in bytes: - // Measured: `1723` - // Estimated: `58288` - // Minimum execution time: 445_559_000 picoseconds. - Weight::from_parts(457_766_000, 58288) + // Measured: `2016` + // Estimated: `8760` + // Minimum execution time: 347_676_000 picoseconds. + Weight::from_parts(351_133_000, 8760) .saturating_add(T::DbWeight::get().reads(19_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -401,10 +401,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans TotalBorrows (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) fn repay_borrow () -> Weight { // Proof Size summary in bytes: - // Measured: `1620` - // Estimated: `42116` - // Minimum execution time: 230_178_000 picoseconds. - Weight::from_parts(233_446_000, 42116) + // Measured: `1875` + // Estimated: `6260` + // Minimum execution time: 173_257_000 picoseconds. + Weight::from_parts(179_420_000, 6260) .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -432,10 +432,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans TotalBorrows (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) fn repay_borrow_all () -> Weight { // Proof Size summary in bytes: - // Measured: `1620` - // Estimated: `42116` - // Minimum execution time: 252_936_000 picoseconds. - Weight::from_parts(268_865_000, 42116) + // Measured: `1875` + // Estimated: `6260` + // Minimum execution time: 195_352_000 picoseconds. + Weight::from_parts(198_989_000, 6260) .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -449,10 +449,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans AccountDeposits (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) fn deposit_all_collateral () -> Weight { // Proof Size summary in bytes: - // Measured: `967` - // Estimated: `16899` - // Minimum execution time: 125_959_000 picoseconds. - Weight::from_parts(131_088_000, 16899) + // Measured: `1184` + // Estimated: `6260` + // Minimum execution time: 96_693_000 picoseconds. + Weight::from_parts(98_488_000, 6260) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -484,10 +484,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans AccountBorrows (max_values: None, max_size: Some(107), added: 2582, mode: MaxEncodedLen) fn withdraw_all_collateral () -> Weight { // Proof Size summary in bytes: - // Measured: `1628` - // Estimated: `45165` - // Minimum execution time: 290_826_000 picoseconds. - Weight::from_parts(307_097_000, 45165) + // Measured: `1921` + // Estimated: `6260` + // Minimum execution time: 226_734_000 picoseconds. + Weight::from_parts(229_600_000, 6260) .saturating_add(T::DbWeight::get().reads(15_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -515,8 +515,6 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans MinExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) /// Storage: Loans MaxExchangeRate (r:1 w:0) /// Proof: Loans MaxExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: Loans AccountBorrows (r:3 w:1) @@ -539,11 +537,11 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans RewardSupplierIndex (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) fn liquidate_borrow () -> Weight { // Proof Size summary in bytes: - // Measured: `3348` - // Estimated: `127253` - // Minimum execution time: 1_282_053_000 picoseconds. - Weight::from_parts(1_327_267_000, 127253) - .saturating_add(T::DbWeight::get().reads(44_u64)) + // Measured: `3610` + // Estimated: `16530` + // Minimum execution time: 803_780_000 picoseconds. + Weight::from_parts(830_373_000, 16530) + .saturating_add(T::DbWeight::get().reads(43_u64)) .saturating_add(T::DbWeight::get().writes(21_u64)) } /// Storage: Loans Markets (r:2 w:0) @@ -580,10 +578,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans RewardAccrued (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) fn reduce_incentive_reserves () -> Weight { // Proof Size summary in bytes: - // Measured: `2653` - // Estimated: `63481` - // Minimum execution time: 577_697_000 picoseconds. - Weight::from_parts(618_245_000, 63481) + // Measured: `2949` + // Estimated: `11350` + // Minimum execution time: 441_074_000 picoseconds. + Weight::from_parts(442_466_000, 11350) .saturating_add(T::DbWeight::get().reads(21_u64)) .saturating_add(T::DbWeight::get().writes(10_u64)) } @@ -601,10 +599,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: Loans TotalReserves (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) fn add_reserves () -> Weight { // Proof Size summary in bytes: - // Measured: `1012` - // Estimated: `24524` - // Minimum execution time: 159_083_000 picoseconds. - Weight::from_parts(167_413_000, 24524) + // Measured: `1305` + // Estimated: `6260` + // Minimum execution time: 123_878_000 picoseconds. + Weight::from_parts(124_660_000, 6260) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -622,10 +620,10 @@ impl loans::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn reduce_reserves () -> Weight { // Proof Size summary in bytes: - // Measured: `1243` - // Estimated: `24524` - // Minimum execution time: 142_174_000 picoseconds. - Weight::from_parts(151_776_000, 24524) + // Measured: `1536` + // Estimated: `6260` + // Minimum execution time: 107_725_000 picoseconds. + Weight::from_parts(108_537_000, 6260) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } diff --git a/parachain/runtime/kintsugi/src/weights/nomination.rs b/parachain/runtime/kintsugi/src/weights/nomination.rs index 81514a23ce..5c9825279e 100644 --- a/parachain/runtime/kintsugi/src/weights/nomination.rs +++ b/parachain/runtime/kintsugi/src/weights/nomination.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for nomination //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -46,25 +46,20 @@ impl nomination::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_494_000 picoseconds. - Weight::from_parts(11_404_000, 0) + // Minimum execution time: 8_698_000 picoseconds. + Weight::from_parts(8_858_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Nomination NominationLimit (r:0 w:1) /// Proof: Nomination NominationLimit (max_values: None, max_size: Some(86), added: 2561, mode: MaxEncodedLen) fn set_nomination_limit () -> Weight { // Proof Size summary in bytes: - // Measured: `126` - // Estimated: `1486` - // Minimum execution time: 26_907_000 picoseconds. - Weight::from_parts(28_499_000, 1486) - .saturating_add(T::DbWeight::get().reads(1_u64)) + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 12_535_000 picoseconds. + Weight::from_parts(12_716_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Nomination NominationEnabled (r:1 w:0) /// Proof: Nomination NominationEnabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: VaultRegistry Vaults (r:1 w:0) @@ -73,15 +68,13 @@ impl nomination::WeightInfo for WeightInfo { /// Proof: Nomination Vaults (max_values: None, max_size: Some(71), added: 2546, mode: MaxEncodedLen) fn opt_in_to_nomination () -> Weight { // Proof Size summary in bytes: - // Measured: `767` - // Estimated: `10233` - // Minimum execution time: 70_702_000 picoseconds. - Weight::from_parts(72_928_000, 10233) - .saturating_add(T::DbWeight::get().reads(4_u64)) + // Measured: `642` + // Estimated: `3725` + // Minimum execution time: 44_139_000 picoseconds. + Weight::from_parts(44_489_000, 3725) + .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Nomination Vaults (r:1 w:1) /// Proof: Nomination Vaults (max_values: None, max_size: Some(71), added: 2546, mode: MaxEncodedLen) /// Storage: VaultStaking Nonce (r:1 w:1) @@ -154,15 +147,13 @@ impl nomination::WeightInfo for WeightInfo { /// Proof: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) fn opt_out_of_nomination () -> Weight { // Proof Size summary in bytes: - // Measured: `4345` - // Estimated: `166107` - // Minimum execution time: 923_485_000 picoseconds. - Weight::from_parts(956_978_000, 166107) - .saturating_add(T::DbWeight::get().reads(54_u64)) + // Measured: `4568` + // Estimated: `11486` + // Minimum execution time: 712_978_000 picoseconds. + Weight::from_parts(716_875_000, 11486) + .saturating_add(T::DbWeight::get().reads(53_u64)) .saturating_add(T::DbWeight::get().writes(26_u64)) } - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: VaultStaking Nonce (r:1 w:0) /// Proof: VaultStaking Nonce (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen) /// Storage: VaultStaking TotalCurrentStake (r:1 w:1) @@ -205,18 +196,24 @@ impl nomination::WeightInfo for WeightInfo { /// Proof: VaultCapacity RewardTally (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen) /// Storage: VaultCapacity TotalRewards (r:2 w:2) /// Proof: VaultCapacity TotalRewards (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) + /// Storage: VaultRewards TotalStake (r:1 w:1) + /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) + /// Storage: VaultRewards RewardCurrencies (r:1 w:1) + /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(50), added: 2525, mode: MaxEncodedLen) + /// Storage: VaultRewards RewardPerToken (r:2 w:2) + /// Proof: VaultRewards RewardPerToken (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen) + /// Storage: VaultRewards TotalRewards (r:2 w:2) + /// Proof: VaultRewards TotalRewards (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultRewards Stake (r:1 w:1) /// Proof: VaultRewards Stake (max_values: None, max_size: Some(97), added: 2572, mode: MaxEncodedLen) - /// Storage: VaultRewards RewardPerToken (r:2 w:0) - /// Proof: VaultRewards RewardPerToken (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen) /// Storage: VaultRewards RewardTally (r:2 w:2) /// Proof: VaultRewards RewardTally (max_values: None, max_size: Some(124), added: 2599, mode: MaxEncodedLen) - /// Storage: VaultRewards TotalRewards (r:2 w:2) - /// Proof: VaultRewards TotalRewards (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: Fee Commission (r:1 w:0) /// Proof: Fee Commission (max_values: None, max_size: Some(86), added: 2561, mode: MaxEncodedLen) /// Storage: VaultStaking RewardPerToken (r:2 w:2) /// Proof: VaultStaking RewardPerToken (max_values: None, max_size: Some(117), added: 2592, mode: MaxEncodedLen) + /// Storage: VaultStaking TotalRewards (r:2 w:2) + /// Proof: VaultStaking TotalRewards (max_values: None, max_size: Some(117), added: 2592, mode: MaxEncodedLen) /// Storage: VaultStaking TotalStake (r:1 w:1) /// Proof: VaultStaking TotalStake (max_values: None, max_size: Some(106), added: 2581, mode: MaxEncodedLen) /// Storage: VaultStaking RewardTally (r:2 w:2) @@ -225,10 +222,6 @@ impl nomination::WeightInfo for WeightInfo { /// Proof: VaultRegistry Vaults (max_values: None, max_size: Some(260), added: 2735, mode: MaxEncodedLen) /// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0) /// Proof: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) - /// Storage: VaultRewards TotalStake (r:1 w:1) - /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) - /// Storage: VaultRewards RewardCurrencies (r:1 w:0) - /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) /// Storage: Timestamp Now (r:1 w:0) /// Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) /// Storage: Loans LastAccruedInterestTime (r:1 w:1) @@ -248,22 +241,20 @@ impl nomination::WeightInfo for WeightInfo { /// Storage: VaultCapacity TotalStake (r:1 w:1) /// Proof: VaultCapacity TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: VaultCapacity RewardCurrencies (r:1 w:0) - /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(39), added: 2514, mode: MaxEncodedLen) /// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1) /// Proof: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) /// Storage: VaultRegistry SystemCollateralCeiling (r:1 w:0) /// Proof: VaultRegistry SystemCollateralCeiling (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) fn deposit_collateral () -> Weight { // Proof Size summary in bytes: - // Measured: `5203` - // Estimated: `194221` - // Minimum execution time: 935_213_000 picoseconds. - Weight::from_parts(1_003_816_000, 194221) - .saturating_add(T::DbWeight::get().reads(62_u64)) - .saturating_add(T::DbWeight::get().writes(29_u64)) + // Measured: `5749` + // Estimated: `8760` + // Minimum execution time: 858_288_000 picoseconds. + Weight::from_parts(864_521_000, 8760) + .saturating_add(T::DbWeight::get().reads(63_u64)) + .saturating_add(T::DbWeight::get().writes(34_u64)) } - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: VaultStaking Nonce (r:1 w:0) /// Proof: VaultStaking Nonce (max_values: None, max_size: Some(74), added: 2549, mode: MaxEncodedLen) /// Storage: VaultRegistry Vaults (r:1 w:0) @@ -302,8 +293,6 @@ impl nomination::WeightInfo for WeightInfo { /// Proof: Nomination NominationEnabled (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Nomination Vaults (r:1 w:0) /// Proof: Nomination Vaults (max_values: None, max_size: Some(71), added: 2546, mode: MaxEncodedLen) - /// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1) - /// Proof: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) /// Storage: VaultCapacity Stake (r:1 w:1) /// Proof: VaultCapacity Stake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultCapacity RewardPerToken (r:2 w:0) @@ -312,18 +301,24 @@ impl nomination::WeightInfo for WeightInfo { /// Proof: VaultCapacity RewardTally (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen) /// Storage: VaultCapacity TotalRewards (r:2 w:2) /// Proof: VaultCapacity TotalRewards (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) + /// Storage: VaultRewards TotalStake (r:1 w:1) + /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) + /// Storage: VaultRewards RewardCurrencies (r:1 w:1) + /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(50), added: 2525, mode: MaxEncodedLen) + /// Storage: VaultRewards RewardPerToken (r:2 w:2) + /// Proof: VaultRewards RewardPerToken (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen) + /// Storage: VaultRewards TotalRewards (r:2 w:2) + /// Proof: VaultRewards TotalRewards (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultRewards Stake (r:1 w:1) /// Proof: VaultRewards Stake (max_values: None, max_size: Some(97), added: 2572, mode: MaxEncodedLen) - /// Storage: VaultRewards RewardPerToken (r:2 w:0) - /// Proof: VaultRewards RewardPerToken (max_values: None, max_size: Some(70), added: 2545, mode: MaxEncodedLen) /// Storage: VaultRewards RewardTally (r:2 w:2) /// Proof: VaultRewards RewardTally (max_values: None, max_size: Some(124), added: 2599, mode: MaxEncodedLen) - /// Storage: VaultRewards TotalRewards (r:2 w:2) - /// Proof: VaultRewards TotalRewards (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: Fee Commission (r:1 w:0) /// Proof: Fee Commission (max_values: None, max_size: Some(86), added: 2561, mode: MaxEncodedLen) /// Storage: VaultStaking RewardPerToken (r:2 w:2) /// Proof: VaultStaking RewardPerToken (max_values: None, max_size: Some(117), added: 2592, mode: MaxEncodedLen) + /// Storage: VaultStaking TotalRewards (r:2 w:2) + /// Proof: VaultStaking TotalRewards (max_values: None, max_size: Some(117), added: 2592, mode: MaxEncodedLen) /// Storage: VaultStaking Stake (r:1 w:1) /// Proof: VaultStaking Stake (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) /// Storage: VaultStaking SlashPerToken (r:1 w:0) @@ -334,14 +329,10 @@ impl nomination::WeightInfo for WeightInfo { /// Proof: VaultStaking TotalStake (max_values: None, max_size: Some(106), added: 2581, mode: MaxEncodedLen) /// Storage: VaultStaking RewardTally (r:2 w:2) /// Proof: VaultStaking RewardTally (max_values: None, max_size: Some(149), added: 2624, mode: MaxEncodedLen) - /// Storage: VaultRewards TotalStake (r:1 w:1) - /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) - /// Storage: VaultRewards RewardCurrencies (r:1 w:0) - /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) /// Storage: VaultCapacity TotalStake (r:1 w:1) /// Proof: VaultCapacity TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: VaultCapacity RewardCurrencies (r:1 w:0) - /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(39), added: 2514, mode: MaxEncodedLen) /// Storage: Loans RewardSupplyState (r:1 w:1) /// Proof: Loans RewardSupplyState (max_values: None, max_size: Some(47), added: 2522, mode: MaxEncodedLen) /// Storage: Loans RewardSupplySpeed (r:1 w:0) @@ -352,13 +343,15 @@ impl nomination::WeightInfo for WeightInfo { /// Proof: Loans RewardAccrued (max_values: None, max_size: Some(64), added: 2539, mode: MaxEncodedLen) /// Storage: Loans AccountDeposits (r:1 w:0) /// Proof: Loans AccountDeposits (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) + /// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1) + /// Proof: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) fn withdraw_collateral () -> Weight { // Proof Size summary in bytes: - // Measured: `5540` - // Estimated: `185433` - // Minimum execution time: 1_009_954_000 picoseconds. - Weight::from_parts(1_033_867_000, 185433) - .saturating_add(T::DbWeight::get().reads(59_u64)) - .saturating_add(T::DbWeight::get().writes(29_u64)) + // Measured: `6074` + // Estimated: `8760` + // Minimum execution time: 914_051_000 picoseconds. + Weight::from_parts(922_347_000, 8760) + .saturating_add(T::DbWeight::get().reads(60_u64)) + .saturating_add(T::DbWeight::get().writes(34_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/oracle.rs b/parachain/runtime/kintsugi/src/weights/oracle.rs index dbf396ddfe..ac6c254bde 100644 --- a/parachain/runtime/kintsugi/src/weights/oracle.rs +++ b/parachain/runtime/kintsugi/src/weights/oracle.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for oracle //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -50,10 +50,10 @@ impl oracle::WeightInfo for WeightInfo { /// Proof: Oracle MaxDelay (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) /// Storage: VaultRewards TotalStake (r:999 w:0) /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:1) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) - /// Storage: Security Errors (r:1 w:1) - /// Proof: Security Errors (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: VaultCapacity Stake (r:999 w:0) + /// Proof: VaultCapacity Stake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) + /// Storage: Loans Markets (r:999 w:0) + /// Proof: Loans Markets (max_values: None, max_size: Some(160), added: 2635, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:0 w:999) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: Oracle ValidUntil (r:0 w:999) @@ -61,17 +61,16 @@ impl oracle::WeightInfo for WeightInfo { /// The range of component `u` is `[1, 1000]`. fn on_initialize (u: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `687 + u * (127 ±0)` - // Estimated: `11433 + u * (10172 ±0)` - // Minimum execution time: 127_261_000 picoseconds. - Weight::from_parts(128_970_000, 11433) - // Standard Error: 50_008 - .saturating_add(Weight::from_parts(52_126_479, 0).saturating_mul(u.into())) - .saturating_add(T::DbWeight::get().reads(5_u64)) - .saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(u.into()))) - .saturating_add(T::DbWeight::get().writes(2_u64)) + // Measured: `678 + u * (127 ±0)` + // Estimated: `3494 + u * (5150 ±0)` + // Minimum execution time: 84_258_000 picoseconds. + Weight::from_parts(85_090_000, 3494) + // Standard Error: 50_885 + .saturating_add(Weight::from_parts(45_702_615, 0).saturating_mul(u.into())) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().reads((6_u64).saturating_mul(u.into()))) .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(u.into()))) - .saturating_add(Weight::from_parts(0, 10172).saturating_mul(u.into())) + .saturating_add(Weight::from_parts(0, 5150).saturating_mul(u.into())) } /// Storage: Oracle AuthorizedOracles (r:1 w:0) /// Proof: Oracle AuthorizedOracles (max_values: None, max_size: Some(305), added: 2780, mode: MaxEncodedLen) @@ -85,11 +84,11 @@ impl oracle::WeightInfo for WeightInfo { fn feed_values (u: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `295` - // Estimated: `5263` - // Minimum execution time: 49_951_000 picoseconds. - Weight::from_parts(51_093_000, 5263) - // Standard Error: 15_237 - .saturating_add(Weight::from_parts(10_441_256, 0).saturating_mul(u.into())) + // Estimated: `3770` + // Minimum execution time: 38_156_000 picoseconds. + Weight::from_parts(38_637_000, 3770) + // Standard Error: 33_449 + .saturating_add(Weight::from_parts(8_275_546, 0).saturating_mul(u.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(u.into()))) } @@ -99,8 +98,8 @@ impl oracle::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 30_897_000 picoseconds. - Weight::from_parts(33_392_000, 0) + // Minimum execution time: 23_347_000 picoseconds. + Weight::from_parts(23_587_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: Oracle AuthorizedOracles (r:0 w:1) @@ -109,8 +108,8 @@ impl oracle::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 27_673_000 picoseconds. - Weight::from_parts(29_602_000, 0) + // Minimum execution time: 20_942_000 picoseconds. + Weight::from_parts(21_332_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/orml_asset_registry.rs b/parachain/runtime/kintsugi/src/weights/orml_asset_registry.rs index 8de949beb6..e250abf53e 100644 --- a/parachain/runtime/kintsugi/src/weights/orml_asset_registry.rs +++ b/parachain/runtime/kintsugi/src/weights/orml_asset_registry.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for orml_asset_registry //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -49,9 +49,9 @@ impl orml_asset_registry::WeightInfo for WeightInfo fn register_asset () -> Weight { // Proof Size summary in bytes: // Measured: `107` - // Estimated: `8736` - // Minimum execution time: 56_246_000 picoseconds. - Weight::from_parts(58_393_000, 8736) + // Estimated: `3572` + // Minimum execution time: 43_197_000 picoseconds. + Weight::from_parts(43_718_000, 3572) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -62,9 +62,9 @@ impl orml_asset_registry::WeightInfo for WeightInfo fn update_asset () -> Weight { // Proof Size summary in bytes: // Measured: `774` - // Estimated: `8478` - // Minimum execution time: 69_020_000 picoseconds. - Weight::from_parts(71_366_000, 8478) + // Estimated: `4239` + // Minimum execution time: 51_513_000 picoseconds. + Weight::from_parts(52_796_000, 4239) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -72,7 +72,7 @@ impl orml_asset_registry::WeightInfo for WeightInfo // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 527_000 picoseconds. - Weight::from_parts(614_000, 0) + // Minimum execution time: 421_000 picoseconds. + Weight::from_parts(451_000, 0) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/orml_tokens.rs b/parachain/runtime/kintsugi/src/weights/orml_tokens.rs index dd0bbfb86d..50e442332c 100644 --- a/parachain/runtime/kintsugi/src/weights/orml_tokens.rs +++ b/parachain/runtime/kintsugi/src/weights/orml_tokens.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for orml_tokens //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -60,10 +60,10 @@ impl orml_tokens::WeightInfo for WeightInfo { /// Proof: Loans AccountDeposits (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) fn transfer () -> Weight { // Proof Size summary in bytes: - // Measured: `1517` - // Estimated: `42199` - // Minimum execution time: 261_154_000 picoseconds. - Weight::from_parts(272_290_000, 42199) + // Measured: `1743` + // Estimated: `6260` + // Minimum execution time: 211_062_000 picoseconds. + Weight::from_parts(213_427_000, 6260) .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -87,10 +87,10 @@ impl orml_tokens::WeightInfo for WeightInfo { /// Proof: Loans AccountDeposits (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) fn transfer_all () -> Weight { // Proof Size summary in bytes: - // Measured: `1517` - // Estimated: `42199` - // Minimum execution time: 275_185_000 picoseconds. - Weight::from_parts(301_987_000, 42199) + // Measured: `1743` + // Estimated: `6260` + // Minimum execution time: 217_896_000 picoseconds. + Weight::from_parts(220_561_000, 6260) .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -114,10 +114,10 @@ impl orml_tokens::WeightInfo for WeightInfo { /// Proof: Loans AccountDeposits (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) fn transfer_keep_alive () -> Weight { // Proof Size summary in bytes: - // Measured: `1517` - // Estimated: `42199` - // Minimum execution time: 262_301_000 picoseconds. - Weight::from_parts(281_639_000, 42199) + // Measured: `1743` + // Estimated: `6260` + // Minimum execution time: 208_959_000 picoseconds. + Weight::from_parts(214_179_000, 6260) .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -141,10 +141,10 @@ impl orml_tokens::WeightInfo for WeightInfo { /// Proof: Loans AccountDeposits (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) fn force_transfer () -> Weight { // Proof Size summary in bytes: - // Measured: `1517` - // Estimated: `42199` - // Minimum execution time: 264_521_000 picoseconds. - Weight::from_parts(282_929_000, 42199) + // Measured: `1743` + // Estimated: `6260` + // Minimum execution time: 210_782_000 picoseconds. + Weight::from_parts(211_844_000, 6260) .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -154,10 +154,10 @@ impl orml_tokens::WeightInfo for WeightInfo { /// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(35), added: 2510, mode: MaxEncodedLen) fn set_balance () -> Weight { // Proof Size summary in bytes: - // Measured: `218` - // Estimated: `7080` - // Minimum execution time: 67_303_000 picoseconds. - Weight::from_parts(70_396_000, 7080) + // Measured: `435` + // Estimated: `3580` + // Minimum execution time: 53_407_000 picoseconds. + Weight::from_parts(54_209_000, 3580) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } diff --git a/parachain/runtime/kintsugi/src/weights/orml_vesting.rs b/parachain/runtime/kintsugi/src/weights/orml_vesting.rs index 9f4435e3bd..2e6e6d62fe 100644 --- a/parachain/runtime/kintsugi/src/weights/orml_vesting.rs +++ b/parachain/runtime/kintsugi/src/weights/orml_vesting.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for orml_vesting //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -51,10 +51,10 @@ impl orml_vesting::WeightInfo for WeightInfo { /// The range of component `n` is `[0, 1]`. fn claim (_n: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `315 + n * (306 ±0)` - // Estimated: `15448` - // Minimum execution time: 87_385_000 picoseconds. - Weight::from_parts(101_058_776, 15448) + // Measured: `771 + n * (109 ±0)` + // Estimated: `4733` + // Minimum execution time: 69_630_000 picoseconds. + Weight::from_parts(85_988_378, 4733) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -68,10 +68,10 @@ impl orml_vesting::WeightInfo for WeightInfo { /// Proof: Tokens Locks (max_values: None, max_size: Some(1268), added: 3743, mode: MaxEncodedLen) fn vested_transfer () -> Weight { // Proof Size summary in bytes: - // Measured: `395` - // Estimated: `18038` - // Minimum execution time: 156_905_000 picoseconds. - Weight::from_parts(162_668_000, 18038) + // Measured: `851` + // Estimated: `6170` + // Minimum execution time: 133_136_000 picoseconds. + Weight::from_parts(135_141_000, 6170) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -86,10 +86,10 @@ impl orml_vesting::WeightInfo for WeightInfo { /// The range of component `n` is `[0, 1]`. fn update_vesting_schedules (_n: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `560` - // Estimated: `11906` - // Minimum execution time: 86_877_000 picoseconds. - Weight::from_parts(93_145_134, 11906) + // Measured: `894` + // Estimated: `4733` + // Minimum execution time: 73_317_000 picoseconds. + Weight::from_parts(77_789_707, 4733) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } diff --git a/parachain/runtime/kintsugi/src/weights/pallet_collective.rs b/parachain/runtime/kintsugi/src/weights/pallet_collective.rs index c20e036b69..7b8d54f478 100644 --- a/parachain/runtime/kintsugi/src/weights/pallet_collective.rs +++ b/parachain/runtime/kintsugi/src/weights/pallet_collective.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_collective //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -54,19 +54,19 @@ impl pallet_collective::WeightInfo for WeightInfo { fn set_members (m: u32, _n: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0 + m * (3232 ±0) + p * (3190 ±0)` - // Estimated: `19032 + m * (7796 ±30) + p * (10110 ±30)` - // Minimum execution time: 37_038_000 picoseconds. - Weight::from_parts(37_465_000, 19032) - // Standard Error: 171_101 - .saturating_add(Weight::from_parts(9_767_979, 0).saturating_mul(m.into())) - // Standard Error: 171_101 - .saturating_add(Weight::from_parts(17_255_253, 0).saturating_mul(p.into())) + // Estimated: `15762 + m * (1966 ±32) + p * (4332 ±32)` + // Minimum execution time: 27_555_000 picoseconds. + Weight::from_parts(27_886_000, 15762) + // Standard Error: 110_698 + .saturating_add(Weight::from_parts(6_544_430, 0).saturating_mul(m.into())) + // Standard Error: 110_698 + .saturating_add(Weight::from_parts(11_901_208, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into()))) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into()))) - .saturating_add(Weight::from_parts(0, 7796).saturating_mul(m.into())) - .saturating_add(Weight::from_parts(0, 10110).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 1966).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 4332).saturating_mul(p.into())) } /// Storage: TechnicalCommittee Members (r:1 w:0) /// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured) @@ -76,12 +76,12 @@ impl pallet_collective::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `103 + m * (32 ±0)` // Estimated: `1589 + m * (32 ±0)` - // Minimum execution time: 39_809_000 picoseconds. - Weight::from_parts(42_027_148, 1589) - // Standard Error: 653 - .saturating_add(Weight::from_parts(1_485, 0).saturating_mul(b.into())) - // Standard Error: 6_734 - .saturating_add(Weight::from_parts(27_554, 0).saturating_mul(m.into())) + // Minimum execution time: 30_882_000 picoseconds. + Weight::from_parts(30_466_976, 1589) + // Standard Error: 124 + .saturating_add(Weight::from_parts(2_030, 0).saturating_mul(b.into())) + // Standard Error: 1_283 + .saturating_add(Weight::from_parts(15_394, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into())) } @@ -94,15 +94,15 @@ impl pallet_collective::WeightInfo for WeightInfo { fn propose_execute (b: u32, m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `103 + m * (32 ±0)` - // Estimated: `5158 + m * (64 ±0)` - // Minimum execution time: 45_239_000 picoseconds. - Weight::from_parts(48_094_466, 5158) - // Standard Error: 754 - .saturating_add(Weight::from_parts(792, 0).saturating_mul(b.into())) - // Standard Error: 7_772 - .saturating_add(Weight::from_parts(45_343, 0).saturating_mul(m.into())) + // Estimated: `3569 + m * (32 ±0)` + // Minimum execution time: 35_902_000 picoseconds. + Weight::from_parts(35_558_309, 3569) + // Standard Error: 98 + .saturating_add(Weight::from_parts(1_600, 0).saturating_mul(b.into())) + // Standard Error: 1_013 + .saturating_add(Weight::from_parts(25_869, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into())) } /// Storage: TechnicalCommittee Members (r:1 w:0) /// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured) @@ -120,19 +120,19 @@ impl pallet_collective::WeightInfo for WeightInfo { fn propose_proposed (b: u32, m: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `393 + m * (32 ±0) + p * (36 ±0)` - // Estimated: `9510 + m * (165 ±0) + p * (180 ±0)` - // Minimum execution time: 60_312_000 picoseconds. - Weight::from_parts(59_919_902, 9510) - // Standard Error: 1_108 - .saturating_add(Weight::from_parts(6_692, 0).saturating_mul(b.into())) - // Standard Error: 11_569 - .saturating_add(Weight::from_parts(68_898, 0).saturating_mul(m.into())) - // Standard Error: 11_423 - .saturating_add(Weight::from_parts(653_673, 0).saturating_mul(p.into())) + // Estimated: `3783 + m * (33 ±0) + p * (36 ±0)` + // Minimum execution time: 46_312_000 picoseconds. + Weight::from_parts(46_713_011, 3783) + // Standard Error: 709 + .saturating_add(Weight::from_parts(4_788, 0).saturating_mul(b.into())) + // Standard Error: 7_405 + .saturating_add(Weight::from_parts(15_986, 0).saturating_mul(m.into())) + // Standard Error: 7_311 + .saturating_add(Weight::from_parts(298_350, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) - .saturating_add(Weight::from_parts(0, 165).saturating_mul(m.into())) - .saturating_add(Weight::from_parts(0, 180).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 33).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into())) } /// Storage: TechnicalCommittee Members (r:1 w:0) /// Proof Skipped: TechnicalCommittee Members (max_values: Some(1), max_size: None, mode: Measured) @@ -142,14 +142,14 @@ impl pallet_collective::WeightInfo for WeightInfo { fn vote (m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `842 + m * (64 ±0)` - // Estimated: `6632 + m * (128 ±0)` - // Minimum execution time: 69_321_000 picoseconds. - Weight::from_parts(76_588_048, 6632) - // Standard Error: 11_838 - .saturating_add(Weight::from_parts(153_256, 0).saturating_mul(m.into())) + // Estimated: `4306 + m * (64 ±0)` + // Minimum execution time: 39_509_000 picoseconds. + Weight::from_parts(41_107_426, 4306) + // Standard Error: 2_944 + .saturating_add(Weight::from_parts(44_135, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_parts(0, 128).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } /// Storage: TechnicalCommittee Voting (r:1 w:1) /// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured) @@ -164,17 +164,17 @@ impl pallet_collective::WeightInfo for WeightInfo { fn close_early_disapproved (m: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `431 + m * (64 ±0) + p * (36 ±0)` - // Estimated: `8075 + m * (260 ±0) + p * (144 ±0)` - // Minimum execution time: 70_839_000 picoseconds. - Weight::from_parts(69_678_612, 8075) - // Standard Error: 11_105 - .saturating_add(Weight::from_parts(106_289, 0).saturating_mul(m.into())) - // Standard Error: 10_829 - .saturating_add(Weight::from_parts(572_328, 0).saturating_mul(p.into())) + // Estimated: `3875 + m * (65 ±0) + p * (36 ±0)` + // Minimum execution time: 49_359_000 picoseconds. + Weight::from_parts(49_169_939, 3875) + // Standard Error: 10_006 + .saturating_add(Weight::from_parts(62_030, 0).saturating_mul(m.into())) + // Standard Error: 9_757 + .saturating_add(Weight::from_parts(323_855, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 260).saturating_mul(m.into())) - .saturating_add(Weight::from_parts(0, 144).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 65).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into())) } /// Storage: TechnicalCommittee Voting (r:1 w:1) /// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured) @@ -190,20 +190,20 @@ impl pallet_collective::WeightInfo for WeightInfo { fn close_early_approved (b: u32, m: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `733 + b * (1 ±0) + m * (64 ±0) + p * (40 ±0)` - // Estimated: `12228 + b * (4 ±0) + m * (264 ±0) + p * (160 ±0)` - // Minimum execution time: 101_255_000 picoseconds. - Weight::from_parts(113_763_725, 12228) - // Standard Error: 1_293 - .saturating_add(Weight::from_parts(5_131, 0).saturating_mul(b.into())) - // Standard Error: 13_671 - .saturating_add(Weight::from_parts(40_880, 0).saturating_mul(m.into())) - // Standard Error: 13_326 - .saturating_add(Weight::from_parts(679_723, 0).saturating_mul(p.into())) + // Estimated: `4047 + b * (1 ±0) + m * (66 ±0) + p * (40 ±0)` + // Minimum execution time: 75_562_000 picoseconds. + Weight::from_parts(77_588_078, 4047) + // Standard Error: 841 + .saturating_add(Weight::from_parts(2_992, 0).saturating_mul(b.into())) + // Standard Error: 8_896 + .saturating_add(Weight::from_parts(19_739, 0).saturating_mul(m.into())) + // Standard Error: 8_672 + .saturating_add(Weight::from_parts(301_339, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 4).saturating_mul(b.into())) - .saturating_add(Weight::from_parts(0, 264).saturating_mul(m.into())) - .saturating_add(Weight::from_parts(0, 160).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(0, 66).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 40).saturating_mul(p.into())) } /// Storage: TechnicalCommittee Voting (r:1 w:1) /// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured) @@ -220,17 +220,17 @@ impl pallet_collective::WeightInfo for WeightInfo { fn close_disapproved (m: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `451 + m * (64 ±0) + p * (36 ±0)` - // Estimated: `10070 + m * (325 ±0) + p * (180 ±0)` - // Minimum execution time: 75_093_000 picoseconds. - Weight::from_parts(77_876_620, 10070) - // Standard Error: 14_725 - .saturating_add(Weight::from_parts(75_929, 0).saturating_mul(m.into())) - // Standard Error: 14_358 - .saturating_add(Weight::from_parts(632_851, 0).saturating_mul(p.into())) + // Estimated: `3895 + m * (65 ±0) + p * (36 ±0)` + // Minimum execution time: 54_519_000 picoseconds. + Weight::from_parts(59_296_119, 3895) + // Standard Error: 10_728 + .saturating_add(Weight::from_parts(29_077, 0).saturating_mul(m.into())) + // Standard Error: 10_461 + .saturating_add(Weight::from_parts(288_109, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 325).saturating_mul(m.into())) - .saturating_add(Weight::from_parts(0, 180).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 65).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 36).saturating_mul(p.into())) } /// Storage: TechnicalCommittee Voting (r:1 w:1) /// Proof Skipped: TechnicalCommittee Voting (max_values: None, max_size: None, mode: Measured) @@ -248,20 +248,20 @@ impl pallet_collective::WeightInfo for WeightInfo { fn close_approved (b: u32, m: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `753 + b * (1 ±0) + m * (64 ±0) + p * (40 ±0)` - // Estimated: `14395 + b * (5 ±0) + m * (330 ±0) + p * (200 ±0)` - // Minimum execution time: 104_177_000 picoseconds. - Weight::from_parts(113_086_530, 14395) - // Standard Error: 1_484 - .saturating_add(Weight::from_parts(9_539, 0).saturating_mul(b.into())) - // Standard Error: 15_687 - .saturating_add(Weight::from_parts(67_273, 0).saturating_mul(m.into())) - // Standard Error: 15_291 - .saturating_add(Weight::from_parts(695_647, 0).saturating_mul(p.into())) + // Estimated: `4067 + b * (1 ±0) + m * (66 ±0) + p * (40 ±0)` + // Minimum execution time: 80_241_000 picoseconds. + Weight::from_parts(86_535_840, 4067) + // Standard Error: 920 + .saturating_add(Weight::from_parts(1_512, 0).saturating_mul(b.into())) + // Standard Error: 9_730 + .saturating_add(Weight::from_parts(16_230, 0).saturating_mul(m.into())) + // Standard Error: 9_484 + .saturating_add(Weight::from_parts(269_700, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 5).saturating_mul(b.into())) - .saturating_add(Weight::from_parts(0, 330).saturating_mul(m.into())) - .saturating_add(Weight::from_parts(0, 200).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(0, 66).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 40).saturating_mul(p.into())) } /// Storage: TechnicalCommittee Proposals (r:1 w:1) /// Proof Skipped: TechnicalCommittee Proposals (max_values: Some(1), max_size: None, mode: Measured) @@ -273,13 +273,13 @@ impl pallet_collective::WeightInfo for WeightInfo { fn disapprove_proposal (p: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `260 + p * (32 ±0)` - // Estimated: `2265 + p * (96 ±0)` - // Minimum execution time: 38_480_000 picoseconds. - Weight::from_parts(46_358_938, 2265) - // Standard Error: 11_896 - .saturating_add(Weight::from_parts(566_906, 0).saturating_mul(p.into())) + // Estimated: `1745 + p * (32 ±0)` + // Minimum execution time: 29_068_000 picoseconds. + Weight::from_parts(32_132_833, 1745) + // Standard Error: 8_681 + .saturating_add(Weight::from_parts(271_198, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 96).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 32).saturating_mul(p.into())) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/pallet_identity.rs b/parachain/runtime/kintsugi/src/weights/pallet_identity.rs index 4fe03dd626..d856d4081c 100644 --- a/parachain/runtime/kintsugi/src/weights/pallet_identity.rs +++ b/parachain/runtime/kintsugi/src/weights/pallet_identity.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_identity //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -45,12 +45,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `r` is `[1, 19]`. fn add_registrar (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `31 + r * (57 ±0)` + // Measured: `32 + r * (57 ±0)` // Estimated: `2626` - // Minimum execution time: 29_658_000 picoseconds. - Weight::from_parts(32_388_262, 2626) - // Standard Error: 28_613 - .saturating_add(Weight::from_parts(560_664, 0).saturating_mul(r.into())) + // Minimum execution time: 22_986_000 picoseconds. + Weight::from_parts(24_181_833, 2626) + // Standard Error: 4_421 + .saturating_add(Weight::from_parts(159_851, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -62,14 +62,14 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `x` is `[0, 100]`. fn set_identity (r: u32, x: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `797 + r * (17 ±0)` - // Estimated: `14583` - // Minimum execution time: 94_610_000 picoseconds. - Weight::from_parts(94_849_003, 14583) - // Standard Error: 77_224 - .saturating_add(Weight::from_parts(1_014_324, 0).saturating_mul(r.into())) - // Standard Error: 14_688 - .saturating_add(Weight::from_parts(1_265_870, 0).saturating_mul(x.into())) + // Measured: `1017 + r * (12 ±0)` + // Estimated: `11003` + // Minimum execution time: 65_391_000 picoseconds. + Weight::from_parts(69_077_970, 11003) + // Standard Error: 100_599 + .saturating_add(Weight::from_parts(449_513, 0).saturating_mul(r.into())) + // Standard Error: 19_134 + .saturating_add(Weight::from_parts(1_062_920, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -84,12 +84,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `s` is `[0, 100]`. fn set_subs_new (s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `419` - // Estimated: `22296 + s * (2589 ±0)` - // Minimum execution time: 23_473_000 picoseconds. - Weight::from_parts(65_673_234, 22296) - // Standard Error: 31_908 - .saturating_add(Weight::from_parts(7_788_428, 0).saturating_mul(s.into())) + // Measured: `637` + // Estimated: `11003 + s * (2589 ±0)` + // Minimum execution time: 17_816_000 picoseconds. + Weight::from_parts(55_350_473, 11003) + // Standard Error: 13_184 + .saturating_add(Weight::from_parts(6_219_407, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into()))) .saturating_add(T::DbWeight::get().writes(2_u64)) @@ -107,12 +107,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `p` is `[0, 100]`. fn set_subs_old (p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `512 + p * (32 ±0)` - // Estimated: `21306` - // Minimum execution time: 23_235_000 picoseconds. - Weight::from_parts(62_542_236, 21306) - // Standard Error: 18_980 - .saturating_add(Weight::from_parts(3_254_754, 0).saturating_mul(p.into())) + // Measured: `730 + p * (32 ±0)` + // Estimated: `11003` + // Minimum execution time: 18_006_000 picoseconds. + Weight::from_parts(46_076_762, 11003) + // Standard Error: 8_675 + .saturating_add(Weight::from_parts(2_452_286, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into()))) @@ -128,18 +128,16 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `r` is `[1, 20]`. /// The range of component `s` is `[0, 100]`. /// The range of component `x` is `[0, 100]`. - fn clear_identity (r: u32, s: u32, x: u32, ) -> Weight { + fn clear_identity (_r: u32, s: u32, x: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `825 + r * (17 ±0) + s * (32 ±0) + x * (66 ±0)` - // Estimated: `21306` - // Minimum execution time: 159_212_000 picoseconds. - Weight::from_parts(63_613_007, 21306) - // Standard Error: 108_422 - .saturating_add(Weight::from_parts(1_303_079, 0).saturating_mul(r.into())) - // Standard Error: 20_487 - .saturating_add(Weight::from_parts(3_343_144, 0).saturating_mul(s.into())) - // Standard Error: 20_487 - .saturating_add(Weight::from_parts(796_591, 0).saturating_mul(x.into())) + // Measured: `1049 + r * (12 ±0) + s * (32 ±0) + x * (66 ±0)` + // Estimated: `11003` + // Minimum execution time: 113_047_000 picoseconds. + Weight::from_parts(65_764_584, 11003) + // Standard Error: 31_578 + .saturating_add(Weight::from_parts(2_452_246, 0).saturating_mul(s.into())) + // Standard Error: 31_578 + .saturating_add(Weight::from_parts(545_909, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) @@ -154,14 +152,14 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `x` is `[0, 100]`. fn request_judgement (r: u32, x: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `721 + r * (69 ±0) + x * (66 ±0)` - // Estimated: `17209` - // Minimum execution time: 100_013_000 picoseconds. - Weight::from_parts(92_611_653, 17209) - // Standard Error: 70_701 - .saturating_add(Weight::from_parts(735_891, 0).saturating_mul(r.into())) - // Standard Error: 13_447 - .saturating_add(Weight::from_parts(1_326_583, 0).saturating_mul(x.into())) + // Measured: `942 + r * (64 ±0) + x * (66 ±0)` + // Estimated: `11003` + // Minimum execution time: 73_097_000 picoseconds. + Weight::from_parts(76_938_006, 11003) + // Standard Error: 59_507 + .saturating_add(Weight::from_parts(143_637, 0).saturating_mul(r.into())) + // Standard Error: 11_318 + .saturating_add(Weight::from_parts(1_036_500, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -173,14 +171,14 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `x` is `[0, 100]`. fn cancel_request (r: u32, x: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `753 + r * (12 ±0) + x * (66 ±0)` - // Estimated: `14583` - // Minimum execution time: 85_034_000 picoseconds. - Weight::from_parts(85_245_033, 14583) - // Standard Error: 73_722 - .saturating_add(Weight::from_parts(553_864, 0).saturating_mul(r.into())) - // Standard Error: 14_022 - .saturating_add(Weight::from_parts(1_236_075, 0).saturating_mul(x.into())) + // Measured: `973 + r * (7 ±0) + x * (66 ±0)` + // Estimated: `11003` + // Minimum execution time: 61_433_000 picoseconds. + Weight::from_parts(56_726_772, 11003) + // Standard Error: 87_425 + .saturating_add(Weight::from_parts(392_867, 0).saturating_mul(r.into())) + // Standard Error: 16_628 + .saturating_add(Weight::from_parts(1_113_492, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -189,12 +187,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `r` is `[1, 19]`. fn set_fee (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `88 + r * (57 ±0)` + // Measured: `89 + r * (57 ±0)` // Estimated: `2626` - // Minimum execution time: 18_469_000 picoseconds. - Weight::from_parts(20_943_735, 2626) - // Standard Error: 20_706 - .saturating_add(Weight::from_parts(336_620, 0).saturating_mul(r.into())) + // Minimum execution time: 14_549_000 picoseconds. + Weight::from_parts(15_310_600, 2626) + // Standard Error: 2_952 + .saturating_add(Weight::from_parts(142_391, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -203,12 +201,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `r` is `[1, 19]`. fn set_account_id (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `88 + r * (57 ±0)` + // Measured: `89 + r * (57 ±0)` // Estimated: `2626` - // Minimum execution time: 19_117_000 picoseconds. - Weight::from_parts(20_689_970, 2626) - // Standard Error: 18_307 - .saturating_add(Weight::from_parts(420_655, 0).saturating_mul(r.into())) + // Minimum execution time: 14_779_000 picoseconds. + Weight::from_parts(15_555_149, 2626) + // Standard Error: 3_115 + .saturating_add(Weight::from_parts(133_559, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -217,12 +215,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `r` is `[1, 19]`. fn set_fields (r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `88 + r * (57 ±0)` + // Measured: `89 + r * (57 ±0)` // Estimated: `2626` - // Minimum execution time: 18_914_000 picoseconds. - Weight::from_parts(20_051_136, 2626) - // Standard Error: 16_530 - .saturating_add(Weight::from_parts(400_692, 0).saturating_mul(r.into())) + // Minimum execution time: 14_950_000 picoseconds. + Weight::from_parts(15_454_648, 2626) + // Standard Error: 5_499 + .saturating_add(Weight::from_parts(143_851, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -234,14 +232,14 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `x` is `[0, 100]`. fn provide_judgement (r: u32, x: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `444 + r * (57 ±0) + x * (66 ±0)` - // Estimated: `13629` - // Minimum execution time: 61_446_000 picoseconds. - Weight::from_parts(59_775_124, 13629) - // Standard Error: 74_686 - .saturating_add(Weight::from_parts(537_571, 0).saturating_mul(r.into())) - // Standard Error: 13_488 - .saturating_add(Weight::from_parts(2_024_583, 0).saturating_mul(x.into())) + // Measured: `445 + r * (57 ±0) + x * (66 ±0)` + // Estimated: `11003` + // Minimum execution time: 43_538_000 picoseconds. + Weight::from_parts(42_981_123, 11003) + // Standard Error: 10_221 + .saturating_add(Weight::from_parts(122_856, 0).saturating_mul(r.into())) + // Standard Error: 1_846 + .saturating_add(Weight::from_parts(1_731_196, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -260,16 +258,16 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `x` is `[0, 100]`. fn kill_identity (r: u32, s: u32, x: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `879 + r * (13 ±0) + s * (32 ±0) + x * (66 ±0)` - // Estimated: `24806` - // Minimum execution time: 276_358_000 picoseconds. - Weight::from_parts(324_219_120, 24806) - // Standard Error: 363_435 - .saturating_add(Weight::from_parts(770_952, 0).saturating_mul(r.into())) - // Standard Error: 68_674 - .saturating_add(Weight::from_parts(3_084_393, 0).saturating_mul(s.into())) - // Standard Error: 68_674 - .saturating_add(Weight::from_parts(536_488, 0).saturating_mul(x.into())) + // Measured: `1133 + r * (8 ±0) + s * (32 ±0) + x * (66 ±0)` + // Estimated: `11003` + // Minimum execution time: 139_149_000 picoseconds. + Weight::from_parts(78_040_120, 11003) + // Standard Error: 90_340 + .saturating_add(Weight::from_parts(364_164, 0).saturating_mul(r.into())) + // Standard Error: 17_070 + .saturating_add(Weight::from_parts(2_466_284, 0).saturating_mul(s.into())) + // Standard Error: 17_070 + .saturating_add(Weight::from_parts(592_129, 0).saturating_mul(x.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) @@ -285,12 +283,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `s` is `[0, 99]`. fn add_sub (s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `793 + s * (36 ±0)` - // Estimated: `24885` - // Minimum execution time: 82_290_000 picoseconds. - Weight::from_parts(99_654_375, 24885) - // Standard Error: 16_641 - .saturating_add(Weight::from_parts(280_950, 0).saturating_mul(s.into())) + // Measured: `1011 + s * (36 ±0)` + // Estimated: `11003` + // Minimum execution time: 66_964_000 picoseconds. + Weight::from_parts(73_507_098, 11003) + // Standard Error: 2_409 + .saturating_add(Weight::from_parts(83_629, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -301,12 +299,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `s` is `[1, 100]`. fn rename_sub (s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `590 + s * (3 ±0)` - // Estimated: `14582` - // Minimum execution time: 30_792_000 picoseconds. - Weight::from_parts(37_031_865, 14582) - // Standard Error: 6_382 - .saturating_add(Weight::from_parts(107_280, 0).saturating_mul(s.into())) + // Measured: `591 + s * (3 ±0)` + // Estimated: `11003` + // Minimum execution time: 23_928_000 picoseconds. + Weight::from_parts(26_136_297, 11003) + // Standard Error: 932 + .saturating_add(Weight::from_parts(17_948, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -321,12 +319,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `s` is `[1, 100]`. fn remove_sub (s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `956 + s * (35 ±0)` - // Estimated: `24885` - // Minimum execution time: 83_312_000 picoseconds. - Weight::from_parts(92_869_808, 24885) - // Standard Error: 12_562 - .saturating_add(Weight::from_parts(235_070, 0).saturating_mul(s.into())) + // Measured: `1174 + s * (35 ±0)` + // Estimated: `11003` + // Minimum execution time: 64_009_000 picoseconds. + Weight::from_parts(68_461_962, 11003) + // Standard Error: 2_247 + .saturating_add(Weight::from_parts(68_630, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -339,12 +337,12 @@ impl pallet_identity::WeightInfo for WeightInfo { /// The range of component `s` is `[0, 99]`. fn quit_sub (s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `882 + s * (37 ±0)` - // Estimated: `16472` - // Minimum execution time: 136_997_000 picoseconds. - Weight::from_parts(148_870_524, 16472) - // Standard Error: 19_849 - .saturating_add(Weight::from_parts(185_985, 0).saturating_mul(s.into())) + // Measured: `1100 + s * (37 ±0)` + // Estimated: `6723` + // Minimum execution time: 106_002_000 picoseconds. + Weight::from_parts(110_225_941, 6723) + // Standard Error: 2_866 + .saturating_add(Weight::from_parts(73_759, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } diff --git a/parachain/runtime/kintsugi/src/weights/pallet_membership.rs b/parachain/runtime/kintsugi/src/weights/pallet_membership.rs index c2a0d1daa3..26f19606c7 100644 --- a/parachain/runtime/kintsugi/src/weights/pallet_membership.rs +++ b/parachain/runtime/kintsugi/src/weights/pallet_membership.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_membership //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -52,14 +52,14 @@ impl pallet_membership::WeightInfo for WeightInfo { fn add_member (m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `135 + m * (64 ±0)` - // Estimated: `6574 + m * (192 ±0)` - // Minimum execution time: 39_085_000 picoseconds. - Weight::from_parts(41_405_258, 6574) - // Standard Error: 4_530 - .saturating_add(Weight::from_parts(61_425, 0).saturating_mul(m.into())) + // Estimated: `4687 + m * (64 ±0)` + // Minimum execution time: 28_968_000 picoseconds. + Weight::from_parts(30_406_093, 4687) + // Standard Error: 1_278 + .saturating_add(Weight::from_parts(49_047, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:1) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -75,14 +75,14 @@ impl pallet_membership::WeightInfo for WeightInfo { fn remove_member (m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `239 + m * (64 ±0)` - // Estimated: `8403 + m * (192 ±0)` - // Minimum execution time: 44_438_000 picoseconds. - Weight::from_parts(48_579_071, 8403) - // Standard Error: 6_870 - .saturating_add(Weight::from_parts(54_770, 0).saturating_mul(m.into())) + // Estimated: `4687 + m * (64 ±0)` + // Minimum execution time: 33_617_000 picoseconds. + Weight::from_parts(35_067_538, 4687) + // Standard Error: 993 + .saturating_add(Weight::from_parts(39_985, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:1) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -98,14 +98,14 @@ impl pallet_membership::WeightInfo for WeightInfo { fn swap_member (m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `239 + m * (64 ±0)` - // Estimated: `8403 + m * (192 ±0)` - // Minimum execution time: 45_097_000 picoseconds. - Weight::from_parts(47_597_110, 8403) - // Standard Error: 5_780 - .saturating_add(Weight::from_parts(109_005, 0).saturating_mul(m.into())) + // Estimated: `4687 + m * (64 ±0)` + // Minimum execution time: 33_948_000 picoseconds. + Weight::from_parts(35_532_376, 4687) + // Standard Error: 1_402 + .saturating_add(Weight::from_parts(59_658, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:1) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -121,14 +121,14 @@ impl pallet_membership::WeightInfo for WeightInfo { fn reset_member (m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `239 + m * (64 ±0)` - // Estimated: `8403 + m * (192 ±0)` - // Minimum execution time: 43_376_000 picoseconds. - Weight::from_parts(48_396_887, 8403) - // Standard Error: 7_577 - .saturating_add(Weight::from_parts(326_626, 0).saturating_mul(m.into())) + // Estimated: `4687 + m * (64 ±0)` + // Minimum execution time: 33_547_000 picoseconds. + Weight::from_parts(36_327_634, 4687) + // Standard Error: 2_341 + .saturating_add(Weight::from_parts(204_204, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:1) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -144,14 +144,14 @@ impl pallet_membership::WeightInfo for WeightInfo { fn change_key (m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `239 + m * (64 ±0)` - // Estimated: `8403 + m * (192 ±0)` - // Minimum execution time: 46_090_000 picoseconds. - Weight::from_parts(51_337_586, 8403) - // Standard Error: 7_433 - .saturating_add(Weight::from_parts(81_678, 0).saturating_mul(m.into())) + // Estimated: `4687 + m * (64 ±0)` + // Minimum execution time: 35_011_000 picoseconds. + Weight::from_parts(29_075_546, 4687) + // Standard Error: 51_828 + .saturating_add(Weight::from_parts(376_828, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) - .saturating_add(Weight::from_parts(0, 192).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) } /// Storage: TechnicalMembership Members (r:1 w:0) /// Proof: TechnicalMembership Members (max_values: Some(1), max_size: Some(3202), added: 3697, mode: MaxEncodedLen) @@ -163,11 +163,11 @@ impl pallet_membership::WeightInfo for WeightInfo { fn set_prime (m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `31 + m * (32 ±0)` - // Estimated: `4718 + m * (32 ±0)` - // Minimum execution time: 17_347_000 picoseconds. - Weight::from_parts(18_472_794, 4718) - // Standard Error: 1_957 - .saturating_add(Weight::from_parts(18_190, 0).saturating_mul(m.into())) + // Estimated: `4687 + m * (32 ±0)` + // Minimum execution time: 13_086_000 picoseconds. + Weight::from_parts(13_651_393, 4687) + // Standard Error: 319 + .saturating_add(Weight::from_parts(10_056, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into())) @@ -181,10 +181,10 @@ impl pallet_membership::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 8_361_000 picoseconds. - Weight::from_parts(9_043_690, 0) - // Standard Error: 2_026 - .saturating_add(Weight::from_parts(2_727, 0).saturating_mul(m.into())) + // Minimum execution time: 6_604_000 picoseconds. + Weight::from_parts(6_889_967, 0) + // Standard Error: 177 + .saturating_add(Weight::from_parts(140, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().writes(2_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/pallet_multisig.rs b/parachain/runtime/kintsugi/src/weights/pallet_multisig.rs index 3c3c097f08..ed467fcc23 100644 --- a/parachain/runtime/kintsugi/src/weights/pallet_multisig.rs +++ b/parachain/runtime/kintsugi/src/weights/pallet_multisig.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_multisig //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -45,10 +45,10 @@ impl pallet_multisig::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 39_641_000 picoseconds. - Weight::from_parts(46_443_344, 0) - // Standard Error: 68 - .saturating_add(Weight::from_parts(884, 0).saturating_mul(z.into())) + // Minimum execution time: 19_699_000 picoseconds. + Weight::from_parts(20_731_704, 0) + // Standard Error: 31 + .saturating_add(Weight::from_parts(849, 0).saturating_mul(z.into())) } /// Storage: Multisig Multisigs (r:1 w:1) /// Proof: Multisig Multisigs (max_values: None, max_size: Some(3346), added: 5821, mode: MaxEncodedLen) @@ -58,14 +58,14 @@ impl pallet_multisig::WeightInfo for WeightInfo { /// The range of component `z` is `[0, 10000]`. fn as_multi_create (s: u32, z: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `679 + s * (3 ±0)` - // Estimated: `10391` - // Minimum execution time: 100_464_000 picoseconds. - Weight::from_parts(83_410_474, 10391) - // Standard Error: 14_982 - .saturating_add(Weight::from_parts(499_673, 0).saturating_mul(s.into())) - // Standard Error: 146 - .saturating_add(Weight::from_parts(2_211, 0).saturating_mul(z.into())) + // Measured: `785 + s * (2 ±0)` + // Estimated: `6811` + // Minimum execution time: 75_772_000 picoseconds. + Weight::from_parts(64_296_985, 6811) + // Standard Error: 4_662 + .saturating_add(Weight::from_parts(128_896, 0).saturating_mul(s.into())) + // Standard Error: 45 + .saturating_add(Weight::from_parts(1_998, 0).saturating_mul(z.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -77,12 +77,12 @@ impl pallet_multisig::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `210` // Estimated: `6811` - // Minimum execution time: 67_939_000 picoseconds. - Weight::from_parts(57_002_710, 6811) - // Standard Error: 10_860 - .saturating_add(Weight::from_parts(329_023, 0).saturating_mul(s.into())) - // Standard Error: 106 - .saturating_add(Weight::from_parts(1_774, 0).saturating_mul(z.into())) + // Minimum execution time: 44_058_000 picoseconds. + Weight::from_parts(35_694_610, 6811) + // Standard Error: 8_198 + .saturating_add(Weight::from_parts(94_572, 0).saturating_mul(s.into())) + // Standard Error: 80 + .saturating_add(Weight::from_parts(2_060, 0).saturating_mul(z.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -94,14 +94,14 @@ impl pallet_multisig::WeightInfo for WeightInfo { /// The range of component `z` is `[0, 10000]`. fn as_multi_complete (s: u32, z: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `820 + s * (35 ±0)` - // Estimated: `10391` - // Minimum execution time: 101_575_000 picoseconds. - Weight::from_parts(81_885_681, 10391) - // Standard Error: 18_975 - .saturating_add(Weight::from_parts(601_187, 0).saturating_mul(s.into())) - // Standard Error: 185 - .saturating_add(Weight::from_parts(3_377, 0).saturating_mul(z.into())) + // Measured: `927 + s * (34 ±0)` + // Estimated: `6811` + // Minimum execution time: 76_092_000 picoseconds. + Weight::from_parts(65_547_375, 6811) + // Standard Error: 7_511 + .saturating_add(Weight::from_parts(130_275, 0).saturating_mul(s.into())) + // Standard Error: 73 + .saturating_add(Weight::from_parts(1_958, 0).saturating_mul(z.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -112,12 +112,12 @@ impl pallet_multisig::WeightInfo for WeightInfo { /// The range of component `s` is `[2, 100]`. fn approve_as_multi_create (s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `681 + s * (3 ±0)` - // Estimated: `10391` - // Minimum execution time: 76_682_000 picoseconds. - Weight::from_parts(84_569_982, 10391) - // Standard Error: 14_936 - .saturating_add(Weight::from_parts(424_166, 0).saturating_mul(s.into())) + // Measured: `785 + s * (2 ±0)` + // Estimated: `6811` + // Minimum execution time: 60_962_000 picoseconds. + Weight::from_parts(64_772_974, 6811) + // Standard Error: 5_069 + .saturating_add(Weight::from_parts(139_789, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -128,10 +128,10 @@ impl pallet_multisig::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `210` // Estimated: `6811` - // Minimum execution time: 43_869_000 picoseconds. - Weight::from_parts(47_979_585, 6811) - // Standard Error: 10_160 - .saturating_add(Weight::from_parts(366_385, 0).saturating_mul(s.into())) + // Minimum execution time: 33_758_000 picoseconds. + Weight::from_parts(35_053_040, 6811) + // Standard Error: 2_247 + .saturating_add(Weight::from_parts(84_131, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -142,12 +142,12 @@ impl pallet_multisig::WeightInfo for WeightInfo { /// The range of component `s` is `[2, 100]`. fn cancel_as_multi (s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `887 + s * (3 ±0)` - // Estimated: `10391` - // Minimum execution time: 70_160_000 picoseconds. - Weight::from_parts(78_936_731, 10391) - // Standard Error: 14_286 - .saturating_add(Weight::from_parts(430_817, 0).saturating_mul(s.into())) + // Measured: `991 + s * (2 ±0)` + // Estimated: `6811` + // Minimum execution time: 57_826_000 picoseconds. + Weight::from_parts(59_602_564, 6811) + // Standard Error: 1_749 + .saturating_add(Weight::from_parts(85_294, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } diff --git a/parachain/runtime/kintsugi/src/weights/pallet_preimage.rs b/parachain/runtime/kintsugi/src/weights/pallet_preimage.rs index 1a71bcdb11..de92679776 100644 --- a/parachain/runtime/kintsugi/src/weights/pallet_preimage.rs +++ b/parachain/runtime/kintsugi/src/weights/pallet_preimage.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_preimage //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -49,12 +49,12 @@ impl pallet_preimage::WeightInfo for WeightInfo { /// The range of component `s` is `[0, 4194304]`. fn note_preimage (s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `361` - // Estimated: `7136` - // Minimum execution time: 72_936_000 picoseconds. - Weight::from_parts(74_008_000, 7136) - // Standard Error: 18 - .saturating_add(Weight::from_parts(4_520, 0).saturating_mul(s.into())) + // Measured: `578` + // Estimated: `3580` + // Minimum execution time: 56_944_000 picoseconds. + Weight::from_parts(57_275_000, 3580) + // Standard Error: 9 + .saturating_add(Weight::from_parts(2_434, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -67,10 +67,10 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `106` // Estimated: `3556` - // Minimum execution time: 40_666_000 picoseconds. - Weight::from_parts(41_275_000, 3556) - // Standard Error: 18 - .saturating_add(Weight::from_parts(4_447, 0).saturating_mul(s.into())) + // Minimum execution time: 30_802_000 picoseconds. + Weight::from_parts(31_073_000, 3556) + // Standard Error: 9 + .saturating_add(Weight::from_parts(2_454, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -83,10 +83,10 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `106` // Estimated: `3556` - // Minimum execution time: 38_449_000 picoseconds. - Weight::from_parts(39_199_000, 3556) - // Standard Error: 18 - .saturating_add(Weight::from_parts(4_438, 0).saturating_mul(s.into())) + // Minimum execution time: 29_569_000 picoseconds. + Weight::from_parts(29_820_000, 3556) + // Standard Error: 9 + .saturating_add(Weight::from_parts(2_407, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -98,10 +98,10 @@ impl pallet_preimage::WeightInfo for WeightInfo { /// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen) fn unnote_preimage () -> Weight { // Proof Size summary in bytes: - // Measured: `507` - // Estimated: `7136` - // Minimum execution time: 114_713_000 picoseconds. - Weight::from_parts(124_116_000, 7136) + // Measured: `724` + // Estimated: `3580` + // Minimum execution time: 80_381_000 picoseconds. + Weight::from_parts(82_065_000, 3580) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -113,8 +113,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `144` // Estimated: `3556` - // Minimum execution time: 80_966_000 picoseconds. - Weight::from_parts(84_573_000, 3556) + // Minimum execution time: 50_932_000 picoseconds. + Weight::from_parts(51_904_000, 3556) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -124,8 +124,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `188` // Estimated: `3556` - // Minimum execution time: 74_080_000 picoseconds. - Weight::from_parts(77_561_000, 3556) + // Minimum execution time: 42_375_000 picoseconds. + Weight::from_parts(45_581_000, 3556) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -135,8 +135,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `144` // Estimated: `3556` - // Minimum execution time: 50_561_000 picoseconds. - Weight::from_parts(53_043_000, 3556) + // Minimum execution time: 26_243_000 picoseconds. + Weight::from_parts(27_585_000, 3556) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -146,8 +146,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `42` // Estimated: `3556` - // Minimum execution time: 56_504_000 picoseconds. - Weight::from_parts(59_736_000, 3556) + // Minimum execution time: 24_670_000 picoseconds. + Weight::from_parts(25_682_000, 3556) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -157,8 +157,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `106` // Estimated: `3556` - // Minimum execution time: 25_948_000 picoseconds. - Weight::from_parts(27_809_000, 3556) + // Minimum execution time: 15_211_000 picoseconds. + Weight::from_parts(15_431_000, 3556) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -170,8 +170,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `144` // Estimated: `3556` - // Minimum execution time: 76_610_000 picoseconds. - Weight::from_parts(82_031_000, 3556) + // Minimum execution time: 46_233_000 picoseconds. + Weight::from_parts(46_873_000, 3556) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -181,8 +181,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `106` // Estimated: `3556` - // Minimum execution time: 25_434_000 picoseconds. - Weight::from_parts(26_929_000, 3556) + // Minimum execution time: 15_160_000 picoseconds. + Weight::from_parts(15_912_000, 3556) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -192,8 +192,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `106` // Estimated: `3556` - // Minimum execution time: 25_614_000 picoseconds. - Weight::from_parts(27_250_000, 3556) + // Minimum execution time: 15_311_000 picoseconds. + Weight::from_parts(15_792_000, 3556) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/parachain/runtime/kintsugi/src/weights/pallet_proxy.rs b/parachain/runtime/kintsugi/src/weights/pallet_proxy.rs index cbff9543b7..14afb2498c 100644 --- a/parachain/runtime/kintsugi/src/weights/pallet_proxy.rs +++ b/parachain/runtime/kintsugi/src/weights/pallet_proxy.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_proxy //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -45,12 +45,12 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// The range of component `p` is `[1, 31]`. fn proxy (p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `199 + p * (37 ±0)` + // Measured: `251 + p * (37 ±0)` // Estimated: `4706` - // Minimum execution time: 40_072_000 picoseconds. - Weight::from_parts(42_586_510, 4706) - // Standard Error: 17_676 - .saturating_add(Weight::from_parts(148_242, 0).saturating_mul(p.into())) + // Minimum execution time: 31_042_000 picoseconds. + Weight::from_parts(31_696_042, 4706) + // Standard Error: 1_810 + .saturating_add(Weight::from_parts(29_815, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: Proxy Proxies (r:1 w:0) @@ -63,14 +63,14 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// The range of component `p` is `[1, 31]`. fn proxy_announced (a: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `771 + a * (68 ±0) + p * (37 ±0)` - // Estimated: `13984` - // Minimum execution time: 89_488_000 picoseconds. - Weight::from_parts(89_482_872, 13984) - // Standard Error: 32_345 - .saturating_add(Weight::from_parts(691_852, 0).saturating_mul(a.into())) - // Standard Error: 33_465 - .saturating_add(Weight::from_parts(223_874, 0).saturating_mul(p.into())) + // Measured: `1011 + a * (68 ±0) + p * (37 ±0)` + // Estimated: `5698` + // Minimum execution time: 68_858_000 picoseconds. + Weight::from_parts(71_304_525, 5698) + // Standard Error: 4_860 + .saturating_add(Weight::from_parts(292_426, 0).saturating_mul(a.into())) + // Standard Error: 5_028 + .saturating_add(Weight::from_parts(20_095, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -82,12 +82,12 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// The range of component `p` is `[1, 31]`. fn remove_announcement (a: u32, _p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `686 + a * (68 ±0)` - // Estimated: `9278` - // Minimum execution time: 56_423_000 picoseconds. - Weight::from_parts(66_546_340, 9278) - // Standard Error: 26_492 - .saturating_add(Weight::from_parts(428_552, 0).saturating_mul(a.into())) + // Measured: `926 + a * (68 ±0)` + // Estimated: `5698` + // Minimum execution time: 45_691_000 picoseconds. + Weight::from_parts(46_976_313, 5698) + // Standard Error: 37_400 + .saturating_add(Weight::from_parts(429_525, 0).saturating_mul(a.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -99,14 +99,14 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// The range of component `p` is `[1, 31]`. fn reject_announcement (a: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `686 + a * (68 ±0)` - // Estimated: `9278` - // Minimum execution time: 57_532_000 picoseconds. - Weight::from_parts(56_676_168, 9278) - // Standard Error: 54_986 - .saturating_add(Weight::from_parts(554_940, 0).saturating_mul(a.into())) - // Standard Error: 56_889 - .saturating_add(Weight::from_parts(249_802, 0).saturating_mul(p.into())) + // Measured: `926 + a * (68 ±0)` + // Estimated: `5698` + // Minimum execution time: 45_441_000 picoseconds. + Weight::from_parts(47_659_912, 5698) + // Standard Error: 3_967 + .saturating_add(Weight::from_parts(304_018, 0).saturating_mul(a.into())) + // Standard Error: 4_105 + .saturating_add(Weight::from_parts(5_528, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -120,14 +120,14 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// The range of component `p` is `[1, 31]`. fn announce (a: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `703 + a * (68 ±0) + p * (37 ±0)` - // Estimated: `13984` - // Minimum execution time: 84_868_000 picoseconds. - Weight::from_parts(87_897_680, 13984) - // Standard Error: 37_442 - .saturating_add(Weight::from_parts(547_338, 0).saturating_mul(a.into())) - // Standard Error: 38_737 - .saturating_add(Weight::from_parts(209_492, 0).saturating_mul(p.into())) + // Measured: `943 + a * (68 ±0) + p * (37 ±0)` + // Estimated: `5698` + // Minimum execution time: 69_500_000 picoseconds. + Weight::from_parts(71_450_204, 5698) + // Standard Error: 3_637 + .saturating_add(Weight::from_parts(294_087, 0).saturating_mul(a.into())) + // Standard Error: 3_763 + .saturating_add(Weight::from_parts(33_253, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -138,12 +138,12 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// The range of component `p` is `[1, 31]`. fn add_proxy (p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `518 + p * (37 ±0)` - // Estimated: `8286` - // Minimum execution time: 73_867_000 picoseconds. - Weight::from_parts(78_075_648, 8286) - // Standard Error: 24_031 - .saturating_add(Weight::from_parts(225_503, 0).saturating_mul(p.into())) + // Measured: `787 + p * (37 ±0)` + // Estimated: `4706` + // Minimum execution time: 60_491_000 picoseconds. + Weight::from_parts(61_796_024, 4706) + // Standard Error: 5_264 + .saturating_add(Weight::from_parts(83_677, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -154,12 +154,12 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// The range of component `p` is `[1, 31]`. fn remove_proxy (p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `518 + p * (37 ±0)` - // Estimated: `8286` - // Minimum execution time: 64_216_000 picoseconds. - Weight::from_parts(71_319_965, 8286) - // Standard Error: 26_952 - .saturating_add(Weight::from_parts(159_834, 0).saturating_mul(p.into())) + // Measured: `787 + p * (37 ±0)` + // Estimated: `4706` + // Minimum execution time: 52_626_000 picoseconds. + Weight::from_parts(54_526_510, 4706) + // Standard Error: 4_342 + .saturating_add(Weight::from_parts(94_311, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -170,12 +170,12 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// The range of component `p` is `[1, 31]`. fn remove_proxies (p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `518 + p * (37 ±0)` - // Estimated: `8286` - // Minimum execution time: 53_263_000 picoseconds. - Weight::from_parts(57_811_011, 8286) - // Standard Error: 35_717 - .saturating_add(Weight::from_parts(111_718, 0).saturating_mul(p.into())) + // Measured: `787 + p * (37 ±0)` + // Estimated: `4706` + // Minimum execution time: 43_587_000 picoseconds. + Weight::from_parts(44_521_020, 4706) + // Standard Error: 2_924 + .saturating_add(Weight::from_parts(22_119, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -186,12 +186,12 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// The range of component `p` is `[1, 31]`. fn create_pure (p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `530` - // Estimated: `8286` - // Minimum execution time: 79_640_000 picoseconds. - Weight::from_parts(85_976_909, 8286) - // Standard Error: 30_283 - .saturating_add(Weight::from_parts(43_869, 0).saturating_mul(p.into())) + // Measured: `799` + // Estimated: `4706` + // Minimum execution time: 64_509_000 picoseconds. + Weight::from_parts(65_543_540, 4706) + // Standard Error: 77_269 + .saturating_add(Weight::from_parts(318_410, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -200,14 +200,12 @@ impl pallet_proxy::WeightInfo for WeightInfo { /// Storage: Tokens Accounts (r:1 w:1) /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) /// The range of component `p` is `[0, 30]`. - fn kill_pure (p: u32, ) -> Weight { + fn kill_pure (_p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `588 + p * (37 ±0)` - // Estimated: `8286` - // Minimum execution time: 56_441_000 picoseconds. - Weight::from_parts(60_343_237, 8286) - // Standard Error: 27_938 - .saturating_add(Weight::from_parts(139_626, 0).saturating_mul(p.into())) + // Measured: `857 + p * (37 ±0)` + // Estimated: `4706` + // Minimum execution time: 45_491_000 picoseconds. + Weight::from_parts(49_718_434, 4706) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } diff --git a/parachain/runtime/kintsugi/src/weights/pallet_scheduler.rs b/parachain/runtime/kintsugi/src/weights/pallet_scheduler.rs index ffb4901028..44b6ba58ff 100644 --- a/parachain/runtime/kintsugi/src/weights/pallet_scheduler.rs +++ b/parachain/runtime/kintsugi/src/weights/pallet_scheduler.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_scheduler //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -46,8 +46,8 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `31` // Estimated: `1489` - // Minimum execution time: 8_541_000 picoseconds. - Weight::from_parts(8_927_000, 1489) + // Minimum execution time: 6_894_000 picoseconds. + Weight::from_parts(6_984_000, 1489) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -58,10 +58,10 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `78 + s * (177 ±0)` // Estimated: `26848` - // Minimum execution time: 8_310_000 picoseconds. - Weight::from_parts(14_633_812, 26848) - // Standard Error: 16_105 - .saturating_add(Weight::from_parts(1_841_470, 0).saturating_mul(s.into())) + // Minimum execution time: 6_663_000 picoseconds. + Weight::from_parts(11_579_469, 26848) + // Standard Error: 7_998 + .saturating_add(Weight::from_parts(1_246_104, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -69,8 +69,8 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 14_924_000 picoseconds. - Weight::from_parts(15_279_000, 0) + // Minimum execution time: 11_183_000 picoseconds. + Weight::from_parts(11_724_000, 0) } /// Storage: Preimage PreimageFor (r:1 w:1) /// Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: Measured) @@ -80,11 +80,11 @@ impl pallet_scheduler::WeightInfo for WeightInfo { fn service_task_fetched (s: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `179 + s * (1 ±0)` - // Estimated: `7200 + s * (1 ±0)` - // Minimum execution time: 49_555_000 picoseconds. - Weight::from_parts(51_008_000, 7200) - // Standard Error: 46 - .saturating_add(Weight::from_parts(2_955, 0).saturating_mul(s.into())) + // Estimated: `3644 + s * (1 ±0)` + // Minimum execution time: 37_595_000 picoseconds. + Weight::from_parts(37_886_000, 3644) + // Standard Error: 22 + .saturating_add(Weight::from_parts(1_735, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(Weight::from_parts(0, 1).saturating_mul(s.into())) @@ -95,30 +95,30 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 19_039_000 picoseconds. - Weight::from_parts(20_529_000, 0) + // Minimum execution time: 14_689_000 picoseconds. + Weight::from_parts(14_970_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } fn service_task_periodic () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 14_412_000 picoseconds. - Weight::from_parts(15_086_000, 0) + // Minimum execution time: 11_463_000 picoseconds. + Weight::from_parts(11_683_000, 0) } fn execute_dispatch_signed () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 7_791_000 picoseconds. - Weight::from_parts(8_118_000, 0) + // Minimum execution time: 5_771_000 picoseconds. + Weight::from_parts(5_992_000, 0) } fn execute_dispatch_unsigned () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 7_642_000 picoseconds. - Weight::from_parts(7_739_000, 0) + // Minimum execution time: 5_961_000 picoseconds. + Weight::from_parts(6_042_000, 0) } /// Storage: Scheduler Agenda (r:1 w:1) /// Proof: Scheduler Agenda (max_values: None, max_size: Some(23383), added: 25858, mode: MaxEncodedLen) @@ -127,10 +127,10 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `78 + s * (177 ±0)` // Estimated: `26848` - // Minimum execution time: 32_937_000 picoseconds. - Weight::from_parts(40_348_469, 26848) - // Standard Error: 29_638 - .saturating_add(Weight::from_parts(2_085_210, 0).saturating_mul(s.into())) + // Minimum execution time: 26_003_000 picoseconds. + Weight::from_parts(30_478_209, 26848) + // Standard Error: 8_002 + .saturating_add(Weight::from_parts(1_211_223, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -143,10 +143,10 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `78 + s * (177 ±0)` // Estimated: `26848` - // Minimum execution time: 42_431_000 picoseconds. - Weight::from_parts(42_330_018, 26848) - // Standard Error: 35_409 - .saturating_add(Weight::from_parts(3_440_153, 0).saturating_mul(s.into())) + // Minimum execution time: 32_545_000 picoseconds. + Weight::from_parts(31_295_302, 26848) + // Standard Error: 8_871 + .saturating_add(Weight::from_parts(2_180_262, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -158,11 +158,11 @@ impl pallet_scheduler::WeightInfo for WeightInfo { fn schedule_named (s: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `186 + s * (189 ±0)` - // Estimated: `30361` - // Minimum execution time: 42_127_000 picoseconds. - Weight::from_parts(48_984_466, 30361) - // Standard Error: 43_916 - .saturating_add(Weight::from_parts(2_231_913, 0).saturating_mul(s.into())) + // Estimated: `26848` + // Minimum execution time: 32_144_000 picoseconds. + Weight::from_parts(37_517_490, 26848) + // Standard Error: 13_180 + .saturating_add(Weight::from_parts(1_293_394, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -174,11 +174,11 @@ impl pallet_scheduler::WeightInfo for WeightInfo { fn cancel_named (s: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `217 + s * (188 ±0)` - // Estimated: `30361` - // Minimum execution time: 45_262_000 picoseconds. - Weight::from_parts(44_229_671, 30361) - // Standard Error: 34_685 - .saturating_add(Weight::from_parts(3_525_498, 0).saturating_mul(s.into())) + // Estimated: `26848` + // Minimum execution time: 35_391_000 picoseconds. + Weight::from_parts(35_199_015, 26848) + // Standard Error: 9_723 + .saturating_add(Weight::from_parts(2_176_761, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } diff --git a/parachain/runtime/kintsugi/src/weights/pallet_timestamp.rs b/parachain/runtime/kintsugi/src/weights/pallet_timestamp.rs index 6931ab7c27..019b5e9462 100644 --- a/parachain/runtime/kintsugi/src/weights/pallet_timestamp.rs +++ b/parachain/runtime/kintsugi/src/weights/pallet_timestamp.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_timestamp //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -42,14 +42,14 @@ impl pallet_timestamp::WeightInfo for WeightInfo { /// Storage: Timestamp Now (r:1 w:1) /// Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) - /// Storage: Aura CurrentSlot (r:1 w:0) - /// Proof: Aura CurrentSlot (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen) + /// Storage: unknown `0x13fe8e6572d0617ab8b9721f4e28cb46` (r:1 w:0) + /// Proof Skipped: unknown `0x13fe8e6572d0617ab8b9721f4e28cb46` (r:1 w:0) fn set () -> Weight { // Proof Size summary in bytes: - // Measured: `194` - // Estimated: `2986` - // Minimum execution time: 22_496_000 picoseconds. - Weight::from_parts(24_059_000, 2986) + // Measured: `166` + // Estimated: `3631` + // Minimum execution time: 16_172_000 picoseconds. + Weight::from_parts(16_593_000, 3631) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -57,7 +57,7 @@ impl pallet_timestamp::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `94` // Estimated: `0` - // Minimum execution time: 8_958_000 picoseconds. - Weight::from_parts(9_191_000, 0) + // Minimum execution time: 6_914_000 picoseconds. + Weight::from_parts(7_194_000, 0) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/pallet_utility.rs b/parachain/runtime/kintsugi/src/weights/pallet_utility.rs index 01123199c0..d362bba118 100644 --- a/parachain/runtime/kintsugi/src/weights/pallet_utility.rs +++ b/parachain/runtime/kintsugi/src/weights/pallet_utility.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_utility //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -45,43 +45,43 @@ impl pallet_utility::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 18_126_000 picoseconds. - Weight::from_parts(18_400_000, 0) - // Standard Error: 12_779 - .saturating_add(Weight::from_parts(14_066_216, 0).saturating_mul(c.into())) + // Minimum execution time: 14_058_000 picoseconds. + Weight::from_parts(14_189_000, 0) + // Standard Error: 4_520 + .saturating_add(Weight::from_parts(10_937_825, 0).saturating_mul(c.into())) } fn as_derivative () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 14_487_000 picoseconds. - Weight::from_parts(15_128_000, 0) + // Minimum execution time: 11_062_000 picoseconds. + Weight::from_parts(11_383_000, 0) } /// The range of component `c` is `[0, 1000]`. fn batch_all (c: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 18_235_000 picoseconds. - Weight::from_parts(18_356_000, 0) - // Standard Error: 15_030 - .saturating_add(Weight::from_parts(14_801_634, 0).saturating_mul(c.into())) + // Minimum execution time: 14_068_000 picoseconds. + Weight::from_parts(20_266_041, 0) + // Standard Error: 6_485 + .saturating_add(Weight::from_parts(11_505_085, 0).saturating_mul(c.into())) } fn dispatch_as () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 24_836_000 picoseconds. - Weight::from_parts(25_824_000, 0) + // Minimum execution time: 19_228_000 picoseconds. + Weight::from_parts(20_481_000, 0) } /// The range of component `c` is `[0, 1000]`. fn force_batch (c: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 18_494_000 picoseconds. - Weight::from_parts(1_478_718, 0) - // Standard Error: 28_923 - .saturating_add(Weight::from_parts(14_190_278, 0).saturating_mul(c.into())) + // Minimum execution time: 14_228_000 picoseconds. + Weight::from_parts(6_535_190, 0) + // Standard Error: 79_731 + .saturating_add(Weight::from_parts(11_047_964, 0).saturating_mul(c.into())) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/pallet_xcm.rs b/parachain/runtime/kintsugi/src/weights/pallet_xcm.rs index 8155de06ec..e432f895ad 100644 --- a/parachain/runtime/kintsugi/src/weights/pallet_xcm.rs +++ b/parachain/runtime/kintsugi/src/weights/pallet_xcm.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_xcm //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -53,9 +53,9 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn send () -> Weight { // Proof Size summary in bytes: // Measured: `107` - // Estimated: `9940` - // Minimum execution time: 66_537_000 picoseconds. - Weight::from_parts(74_628_000, 9940) + // Estimated: `3572` + // Minimum execution time: 51_082_000 picoseconds. + Weight::from_parts(52_054_000, 3572) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -65,20 +65,20 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: UnknownTokens ConcreteFungibleBalances (max_values: None, max_size: None, mode: Measured) fn teleport_assets () -> Weight { // Proof Size summary in bytes: - // Measured: `245` - // Estimated: `5199` - // Minimum execution time: 69_869_000 picoseconds. - Weight::from_parts(79_130_000, 5199) + // Measured: `282` + // Estimated: `3747` + // Minimum execution time: 56_533_000 picoseconds. + Weight::from_parts(58_086_000, 3747) .saturating_add(T::DbWeight::get().reads(2_u64)) } /// Storage: ParachainInfo ParachainId (r:1 w:0) /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) fn reserve_transfer_assets () -> Weight { // Proof Size summary in bytes: - // Measured: `32` + // Measured: `69` // Estimated: `1489` - // Minimum execution time: 50_860_000 picoseconds. - Weight::from_parts(59_327_000, 1489) + // Minimum execution time: 40_611_000 picoseconds. + Weight::from_parts(42_425_000, 1489) .saturating_add(T::DbWeight::get().reads(1_u64)) } /// Storage: Benchmark Override (r:0 w:0) @@ -96,8 +96,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 25_304_000 picoseconds. - Weight::from_parts(26_576_000, 0) + // Minimum execution time: 19_199_000 picoseconds. + Weight::from_parts(19_539_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: PolkadotXcm SafeXcmVersion (r:0 w:1) @@ -106,8 +106,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 8_211_000 picoseconds. - Weight::from_parts(8_870_000, 0) + // Minimum execution time: 6_563_000 picoseconds. + Weight::from_parts(6_774_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: PolkadotXcm VersionNotifiers (r:1 w:1) @@ -129,9 +129,9 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn force_subscribe_version_notify () -> Weight { // Proof Size summary in bytes: // Measured: `107` - // Estimated: `15211` - // Minimum execution time: 78_883_000 picoseconds. - Weight::from_parts(79_870_000, 15211) + // Estimated: `3572` + // Minimum execution time: 59_699_000 picoseconds. + Weight::from_parts(60_862_000, 3572) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -152,20 +152,30 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn force_unsubscribe_version_notify () -> Weight { // Proof Size summary in bytes: // Measured: `290` - // Estimated: `14900` - // Minimum execution time: 80_745_000 picoseconds. - Weight::from_parts(91_782_000, 14900) + // Estimated: `3755` + // Minimum execution time: 59_269_000 picoseconds. + Weight::from_parts(60_111_000, 3755) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } + /// Storage: PolkadotXcm XcmExecutionSuspended (r:0 w:1) + /// Proof Skipped: PolkadotXcm XcmExecutionSuspended (max_values: Some(1), max_size: None, mode: Measured) + fn force_suspension () -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 6_423_000 picoseconds. + Weight::from_parts(6_623_000, 0) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } /// Storage: PolkadotXcm SupportedVersion (r:4 w:2) /// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured) fn migrate_supported_version () -> Weight { // Proof Size summary in bytes: // Measured: `162` // Estimated: `11052` - // Minimum execution time: 39_508_000 picoseconds. - Weight::from_parts(40_092_000, 11052) + // Minimum execution time: 32_595_000 picoseconds. + Weight::from_parts(33_016_000, 11052) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -175,8 +185,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `166` // Estimated: `11056` - // Minimum execution time: 37_997_000 picoseconds. - Weight::from_parts(39_630_000, 11056) + // Minimum execution time: 32_074_000 picoseconds. + Weight::from_parts(32_405_000, 11056) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -186,8 +196,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `173` // Estimated: `13538` - // Minimum execution time: 40_462_000 picoseconds. - Weight::from_parts(43_235_000, 13538) + // Minimum execution time: 33_587_000 picoseconds. + Weight::from_parts(34_449_000, 13538) .saturating_add(T::DbWeight::get().reads(5_u64)) } /// Storage: PolkadotXcm VersionNotifyTargets (r:2 w:1) @@ -205,9 +215,9 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn notify_current_targets () -> Weight { // Proof Size summary in bytes: // Measured: `174` - // Estimated: `16389` - // Minimum execution time: 71_805_000 picoseconds. - Weight::from_parts(76_253_000, 16389) + // Estimated: `6114` + // Minimum execution time: 55_441_000 picoseconds. + Weight::from_parts(56_223_000, 6114) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -217,8 +227,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `206` // Estimated: `8621` - // Minimum execution time: 22_383_000 picoseconds. - Weight::from_parts(23_043_000, 8621) + // Minimum execution time: 18_367_000 picoseconds. + Weight::from_parts(18_698_000, 8621) .saturating_add(T::DbWeight::get().reads(3_u64)) } /// Storage: PolkadotXcm VersionNotifyTargets (r:4 w:2) @@ -227,8 +237,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `173` // Estimated: `11063` - // Minimum execution time: 40_122_000 picoseconds. - Weight::from_parts(41_402_000, 11063) + // Minimum execution time: 31_713_000 picoseconds. + Weight::from_parts(32_324_000, 11063) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -247,16 +257,9 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn migrate_and_notify_old_targets () -> Weight { // Proof Size summary in bytes: // Measured: `177` - // Estimated: `21357` - // Minimum execution time: 88_488_000 picoseconds. - Weight::from_parts(97_923_000, 21357) - .saturating_add(T::DbWeight::get().reads(9_u64)) - .saturating_add(T::DbWeight::get().writes(4_u64)) - } - - fn force_suspension() -> Weight { - // todo: write and run benchmark - Weight::from_parts(97_021_000, 21357) + // Estimated: `11067` + // Minimum execution time: 68_216_000 picoseconds. + Weight::from_parts(68_848_000, 11067) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } diff --git a/parachain/runtime/kintsugi/src/weights/pallet_xcm_benchmarks_fungible.rs b/parachain/runtime/kintsugi/src/weights/pallet_xcm_benchmarks_fungible.rs index 046d71cadd..fe7d553d49 100644 --- a/parachain/runtime/kintsugi/src/weights/pallet_xcm_benchmarks_fungible.rs +++ b/parachain/runtime/kintsugi/src/weights/pallet_xcm_benchmarks_fungible.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_xcm_benchmarks::fungible //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -48,10 +48,10 @@ impl WeightInfo { /// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(35), added: 2510, mode: MaxEncodedLen) pub fn withdraw_asset () -> Weight { // Proof Size summary in bytes: - // Measured: `544` - // Estimated: `11089` - // Minimum execution time: 64_173_000 picoseconds. - Weight::from_parts(66_120_000, 11089) + // Measured: `761` + // Estimated: `4226` + // Minimum execution time: 54_249_000 picoseconds. + Weight::from_parts(55_932_000, 4226) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -61,10 +61,10 @@ impl WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) pub fn transfer_asset () -> Weight { // Proof Size summary in bytes: - // Measured: `370` - // Estimated: `12366` - // Minimum execution time: 81_841_000 picoseconds. - Weight::from_parts(83_747_000, 12366) + // Measured: `715` + // Estimated: `6196` + // Minimum execution time: 72_435_000 picoseconds. + Weight::from_parts(73_036_000, 6196) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -86,10 +86,10 @@ impl WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) pub fn transfer_reserve_asset () -> Weight { // Proof Size summary in bytes: - // Measured: `509` - // Estimated: `25805` - // Minimum execution time: 140_692_000 picoseconds. - Weight::from_parts(160_704_000, 25805) + // Measured: `891` + // Estimated: `6196` + // Minimum execution time: 112_976_000 picoseconds. + Weight::from_parts(114_389_000, 6196) .saturating_add(T::DbWeight::get().reads(10_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -101,10 +101,10 @@ impl WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) pub fn deposit_asset () -> Weight { // Proof Size summary in bytes: - // Measured: `218` - // Estimated: `10673` - // Minimum execution time: 71_386_000 picoseconds. - Weight::from_parts(73_084_000, 10673) + // Measured: `513` + // Estimated: `3593` + // Minimum execution time: 58_737_000 picoseconds. + Weight::from_parts(60_220_000, 3593) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -128,10 +128,10 @@ impl WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) pub fn deposit_reserve_asset () -> Weight { // Proof Size summary in bytes: - // Measured: `357` - // Estimated: `23352` - // Minimum execution time: 128_099_000 picoseconds. - Weight::from_parts(131_486_000, 23352) + // Measured: `689` + // Estimated: `4154` + // Minimum execution time: 105_722_000 picoseconds. + Weight::from_parts(107_395_000, 4154) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -149,10 +149,10 @@ impl WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) pub fn initiate_teleport () -> Weight { // Proof Size summary in bytes: - // Measured: `139` - // Estimated: `11589` - // Minimum execution time: 67_096_000 picoseconds. - Weight::from_parts(72_255_000, 11589) + // Measured: `176` + // Estimated: `3641` + // Minimum execution time: 50_992_000 picoseconds. + Weight::from_parts(52_284_000, 3641) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } diff --git a/parachain/runtime/kintsugi/src/weights/pallet_xcm_benchmarks_generic.rs b/parachain/runtime/kintsugi/src/weights/pallet_xcm_benchmarks_generic.rs index 656ab94675..397efb636a 100644 --- a/parachain/runtime/kintsugi/src/weights/pallet_xcm_benchmarks_generic.rs +++ b/parachain/runtime/kintsugi/src/weights/pallet_xcm_benchmarks_generic.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for pallet_xcm_benchmarks::generic //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -54,10 +54,10 @@ impl WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) pub fn report_holding () -> Weight { // Proof Size summary in bytes: - // Measured: `139` - // Estimated: `11589` - // Minimum execution time: 156_300_000 picoseconds. - Weight::from_parts(160_113_000, 11589) + // Measured: `176` + // Estimated: `3641` + // Minimum execution time: 107_866_000 picoseconds. + Weight::from_parts(109_589_000, 3641) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -65,8 +65,8 @@ impl WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_353_000 picoseconds. - Weight::from_parts(4_685_000, 0) + // Minimum execution time: 3_166_000 picoseconds. + Weight::from_parts(3_868_000, 0) } /// Storage: PolkadotXcm Queries (r:1 w:0) /// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured) @@ -74,61 +74,61 @@ impl WeightInfo { // Proof Size summary in bytes: // Measured: `103` // Estimated: `3568` - // Minimum execution time: 25_335_000 picoseconds. - Weight::from_parts(26_810_000, 3568) + // Minimum execution time: 19_479_000 picoseconds. + Weight::from_parts(20_210_000, 3568) .saturating_add(T::DbWeight::get().reads(1_u64)) } pub fn transact () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 16_471_000 picoseconds. - Weight::from_parts(19_132_000, 0) + // Minimum execution time: 11_463_000 picoseconds. + Weight::from_parts(12_274_000, 0) } /// Storage: ParachainInfo ParachainId (r:1 w:0) /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) pub fn refund_surplus () -> Weight { // Proof Size summary in bytes: - // Measured: `32` + // Measured: `69` // Estimated: `1489` - // Minimum execution time: 14_485_000 picoseconds. - Weight::from_parts(15_439_000, 1489) + // Minimum execution time: 12_525_000 picoseconds. + Weight::from_parts(13_066_000, 1489) .saturating_add(T::DbWeight::get().reads(1_u64)) } pub fn set_error_handler () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_213_000 picoseconds. - Weight::from_parts(5_462_000, 0) + // Minimum execution time: 3_507_000 picoseconds. + Weight::from_parts(3_607_000, 0) } pub fn set_appendix () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_252_000 picoseconds. - Weight::from_parts(4_679_000, 0) + // Minimum execution time: 2_796_000 picoseconds. + Weight::from_parts(3_637_000, 0) } pub fn clear_error () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_155_000 picoseconds. - Weight::from_parts(4_524_000, 0) + // Minimum execution time: 2_755_000 picoseconds. + Weight::from_parts(3_527_000, 0) } pub fn descend_origin () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 5_300_000 picoseconds. - Weight::from_parts(5_600_000, 0) + // Minimum execution time: 3_587_000 picoseconds. + Weight::from_parts(4_399_000, 0) } pub fn clear_origin () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_157_000 picoseconds. - Weight::from_parts(4_453_000, 0) + // Minimum execution time: 2_716_000 picoseconds. + Weight::from_parts(3_497_000, 0) } /// Storage: ParachainInfo ParachainId (r:1 w:0) /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -144,10 +144,10 @@ impl WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) pub fn report_error () -> Weight { // Proof Size summary in bytes: - // Measured: `139` - // Estimated: `11589` - // Minimum execution time: 58_588_000 picoseconds. - Weight::from_parts(63_887_000, 11589) + // Measured: `176` + // Estimated: `3641` + // Minimum execution time: 44_138_000 picoseconds. + Weight::from_parts(44_930_000, 3641) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -157,8 +157,8 @@ impl WeightInfo { // Proof Size summary in bytes: // Measured: `160` // Estimated: `3625` - // Minimum execution time: 34_655_000 picoseconds. - Weight::from_parts(38_112_000, 3625) + // Minimum execution time: 26_774_000 picoseconds. + Weight::from_parts(27_084_000, 3625) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -166,8 +166,8 @@ impl WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_282_000 picoseconds. - Weight::from_parts(5_323_000, 0) + // Minimum execution time: 2_905_000 picoseconds. + Weight::from_parts(3_507_000, 0) } /// Storage: PolkadotXcm VersionNotifyTargets (r:1 w:1) /// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured) @@ -184,9 +184,9 @@ impl WeightInfo { pub fn subscribe_version () -> Weight { // Proof Size summary in bytes: // Measured: `107` - // Estimated: `13512` - // Minimum execution time: 65_611_000 picoseconds. - Weight::from_parts(69_807_000, 13512) + // Estimated: `3572` + // Minimum execution time: 50_241_000 picoseconds. + Weight::from_parts(51_043_000, 3572) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -196,8 +196,8 @@ impl WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 9_506_000 picoseconds. - Weight::from_parts(10_399_000, 0) + // Minimum execution time: 7_625_000 picoseconds. + Weight::from_parts(7_806_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: ParachainInfo ParachainId (r:1 w:0) @@ -214,10 +214,10 @@ impl WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) pub fn initiate_reserve_withdraw () -> Weight { // Proof Size summary in bytes: - // Measured: `139` - // Estimated: `11589` - // Minimum execution time: 151_961_000 picoseconds. - Weight::from_parts(161_253_000, 11589) + // Measured: `176` + // Estimated: `3641` + // Minimum execution time: 104_399_000 picoseconds. + Weight::from_parts(106_212_000, 3641) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -225,36 +225,36 @@ impl WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 29_487_000 picoseconds. - Weight::from_parts(30_374_000, 0) + // Minimum execution time: 19_429_000 picoseconds. + Weight::from_parts(20_181_000, 0) } pub fn expect_asset () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 5_760_000 picoseconds. - Weight::from_parts(6_040_000, 0) + // Minimum execution time: 4_649_000 picoseconds. + Weight::from_parts(4_750_000, 0) } pub fn expect_origin () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_327_000 picoseconds. - Weight::from_parts(4_653_000, 0) + // Minimum execution time: 3_608_000 picoseconds. + Weight::from_parts(3_707_000, 0) } pub fn expect_error () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_229_000 picoseconds. - Weight::from_parts(4_342_000, 0) + // Minimum execution time: 2_716_000 picoseconds. + Weight::from_parts(3_477_000, 0) } pub fn expect_transact_status () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_686_000 picoseconds. - Weight::from_parts(6_677_000, 0) + // Minimum execution time: 3_798_000 picoseconds. + Weight::from_parts(3_858_000, 0) } /// Storage: ParachainInfo ParachainId (r:1 w:0) /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -270,10 +270,10 @@ impl WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) pub fn query_pallet () -> Weight { // Proof Size summary in bytes: - // Measured: `139` - // Estimated: `11589` - // Minimum execution time: 85_092_000 picoseconds. - Weight::from_parts(96_210_000, 11589) + // Measured: `176` + // Estimated: `3641` + // Minimum execution time: 67_836_000 picoseconds. + Weight::from_parts(69_259_000, 3641) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -281,8 +281,8 @@ impl WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 25_774_000 picoseconds. - Weight::from_parts(26_317_000, 0) + // Minimum execution time: 23_076_000 picoseconds. + Weight::from_parts(23_518_000, 0) } /// Storage: ParachainInfo ParachainId (r:1 w:0) /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) @@ -298,10 +298,10 @@ impl WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) pub fn report_transact_status () -> Weight { // Proof Size summary in bytes: - // Measured: `139` - // Estimated: `11589` - // Minimum execution time: 57_377_000 picoseconds. - Weight::from_parts(61_363_000, 11589) + // Measured: `176` + // Estimated: `3641` + // Minimum execution time: 44_268_000 picoseconds. + Weight::from_parts(45_131_000, 3641) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -309,35 +309,35 @@ impl WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_255_000 picoseconds. - Weight::from_parts(4_485_000, 0) + // Minimum execution time: 2_746_000 picoseconds. + Weight::from_parts(3_547_000, 0) } pub fn set_topic () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_172_000 picoseconds. - Weight::from_parts(4_614_000, 0) + // Minimum execution time: 2_665_000 picoseconds. + Weight::from_parts(3_467_000, 0) } pub fn clear_topic () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_104_000 picoseconds. - Weight::from_parts(4_561_000, 0) + // Minimum execution time: 3_266_000 picoseconds. + Weight::from_parts(3_467_000, 0) } pub fn set_fees_mode () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_145_000 picoseconds. - Weight::from_parts(4_417_000, 0) + // Minimum execution time: 2_786_000 picoseconds. + Weight::from_parts(3_447_000, 0) } pub fn unpaid_execution () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_399_000 picoseconds. - Weight::from_parts(4_617_000, 0) + // Minimum execution time: 3_537_000 picoseconds. + Weight::from_parts(3_657_000, 0) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/redeem.rs b/parachain/runtime/kintsugi/src/weights/redeem.rs index a5e98e185d..ca3aee803b 100644 --- a/parachain/runtime/kintsugi/src/weights/redeem.rs +++ b/parachain/runtime/kintsugi/src/weights/redeem.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for redeem //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -40,8 +40,6 @@ pub struct WeightInfo(PhantomData); impl redeem::WeightInfo for WeightInfo { - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Tokens Accounts (r:2 w:1) /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) /// Storage: Fee RedeemFee (r:1 w:0) @@ -96,11 +94,11 @@ impl redeem::WeightInfo for WeightInfo { /// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(245), added: 2720, mode: MaxEncodedLen) fn request_redeem () -> Weight { // Proof Size summary in bytes: - // Measured: `2962` - // Estimated: `73398` - // Minimum execution time: 424_725_000 picoseconds. - Weight::from_parts(436_272_000, 73398) - .saturating_add(T::DbWeight::get().reads(29_u64)) + // Measured: `3189` + // Estimated: `6260` + // Minimum execution time: 311_614_000 picoseconds. + Weight::from_parts(319_349_000, 6260) + .saturating_add(T::DbWeight::get().reads(28_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } /// Storage: Tokens Accounts (r:3 w:3) @@ -129,10 +127,10 @@ impl redeem::WeightInfo for WeightInfo { /// Proof: Loans AccountDeposits (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen) fn liquidation_redeem () -> Weight { // Proof Size summary in bytes: - // Measured: `1918` - // Estimated: `52855` - // Minimum execution time: 381_943_000 picoseconds. - Weight::from_parts(397_011_000, 52855) + // Measured: `2173` + // Estimated: `8760` + // Minimum execution time: 287_687_000 picoseconds. + Weight::from_parts(292_145_000, 8760) .saturating_add(T::DbWeight::get().reads(16_u64)) .saturating_add(T::DbWeight::get().writes(11_u64)) } @@ -162,23 +160,23 @@ impl redeem::WeightInfo for WeightInfo { /// The range of component `i` is `[1, 10]`. /// The range of component `o` is `[2, 3]`. /// The range of component `b` is `[541, 2048]`. - fn execute_redeem (h: u32, i: u32, _o: u32, b: u32, ) -> Weight { + fn execute_redeem (h: u32, i: u32, o: u32, b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `2122` - // Estimated: `29111` - // Minimum execution time: 240_578_000 picoseconds. - Weight::from_parts(218_934_992, 29111) - // Standard Error: 139_944 - .saturating_add(Weight::from_parts(8_639_545, 0).saturating_mul(h.into())) - // Standard Error: 126_161 - .saturating_add(Weight::from_parts(856_176, 0).saturating_mul(i.into())) - // Standard Error: 770 - .saturating_add(Weight::from_parts(4_629, 0).saturating_mul(b.into())) + // Measured: `2295 + o * (1 ±0)` + // Estimated: `3725` + // Minimum execution time: 184_800_000 picoseconds. + Weight::from_parts(149_034_719, 3725) + // Standard Error: 137_585 + .saturating_add(Weight::from_parts(3_833_551, 0).saturating_mul(h.into())) + // Standard Error: 124_035 + .saturating_add(Weight::from_parts(1_176_171, 0).saturating_mul(i.into())) + // Standard Error: 751_913 + .saturating_add(Weight::from_parts(1_964_806, 0).saturating_mul(o.into())) + // Standard Error: 757 + .saturating_add(Weight::from_parts(5_490, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Redeem RedeemRequests (r:1 w:1) /// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(245), added: 2720, mode: MaxEncodedLen) /// Storage: Redeem RedeemPeriod (r:1 w:0) @@ -250,11 +248,11 @@ impl redeem::WeightInfo for WeightInfo { /// Storage: VaultRewards TotalStake (r:1 w:1) /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultRewards RewardCurrencies (r:1 w:0) - /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) + /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(50), added: 2525, mode: MaxEncodedLen) /// Storage: VaultCapacity TotalStake (r:1 w:1) /// Proof: VaultCapacity TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: VaultCapacity RewardCurrencies (r:1 w:0) - /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(39), added: 2514, mode: MaxEncodedLen) /// Storage: Loans RewardSupplyState (r:1 w:1) /// Proof: Loans RewardSupplyState (max_values: None, max_size: Some(47), added: 2522, mode: MaxEncodedLen) /// Storage: Loans RewardSupplySpeed (r:1 w:0) @@ -269,15 +267,13 @@ impl redeem::WeightInfo for WeightInfo { /// Proof: VaultRegistry PunishmentDelay (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) fn cancel_redeem_reimburse () -> Weight { // Proof Size summary in bytes: - // Measured: `5125` - // Estimated: `179726` - // Minimum execution time: 1_201_453_000 picoseconds. - Weight::from_parts(1_239_154_000, 179726) - .saturating_add(T::DbWeight::get().reads(60_u64)) + // Measured: `5430` + // Estimated: `11350` + // Minimum execution time: 850_042_000 picoseconds. + Weight::from_parts(865_223_000, 11350) + .saturating_add(T::DbWeight::get().reads(59_u64)) .saturating_add(T::DbWeight::get().writes(29_u64)) } - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Redeem RedeemRequests (r:1 w:1) /// Proof: Redeem RedeemRequests (max_values: None, max_size: Some(245), added: 2720, mode: MaxEncodedLen) /// Storage: Redeem RedeemPeriod (r:1 w:0) @@ -349,11 +345,11 @@ impl redeem::WeightInfo for WeightInfo { /// Storage: VaultRewards TotalStake (r:1 w:1) /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultRewards RewardCurrencies (r:1 w:0) - /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) + /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(50), added: 2525, mode: MaxEncodedLen) /// Storage: VaultCapacity TotalStake (r:1 w:1) /// Proof: VaultCapacity TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: VaultCapacity RewardCurrencies (r:1 w:0) - /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(39), added: 2514, mode: MaxEncodedLen) /// Storage: Loans RewardSupplyState (r:1 w:1) /// Proof: Loans RewardSupplyState (max_values: None, max_size: Some(47), added: 2522, mode: MaxEncodedLen) /// Storage: Loans RewardSupplySpeed (r:1 w:0) @@ -368,11 +364,11 @@ impl redeem::WeightInfo for WeightInfo { /// Proof: VaultRegistry PunishmentDelay (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) fn cancel_redeem_retry () -> Weight { // Proof Size summary in bytes: - // Measured: `5125` - // Estimated: `177216` - // Minimum execution time: 1_130_199_000 picoseconds. - Weight::from_parts(1_160_823_000, 177216) - .saturating_add(T::DbWeight::get().reads(59_u64)) + // Measured: `5430` + // Estimated: `11350` + // Minimum execution time: 773_779_000 picoseconds. + Weight::from_parts(789_120_000, 11350) + .saturating_add(T::DbWeight::get().reads(58_u64)) .saturating_add(T::DbWeight::get().writes(28_u64)) } /// Storage: Redeem RedeemPeriod (r:0 w:1) @@ -381,8 +377,8 @@ impl redeem::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 23_819_000 picoseconds. - Weight::from_parts(25_640_000, 0) + // Minimum execution time: 18_106_000 picoseconds. + Weight::from_parts(18_667_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: VaultRegistry Vaults (r:1 w:1) @@ -393,10 +389,10 @@ impl redeem::WeightInfo for WeightInfo { /// Proof: Tokens TotalIssuance (max_values: None, max_size: Some(35), added: 2510, mode: MaxEncodedLen) fn self_redeem () -> Weight { // Proof Size summary in bytes: - // Measured: `1171` - // Estimated: `10805` - // Minimum execution time: 197_605_000 picoseconds. - Weight::from_parts(204_517_000, 10805) + // Measured: `1427` + // Estimated: `3725` + // Minimum execution time: 150_121_000 picoseconds. + Weight::from_parts(151_013_000, 3725) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } diff --git a/parachain/runtime/kintsugi/src/weights/replace.rs b/parachain/runtime/kintsugi/src/weights/replace.rs index 1c3a20f9fd..f7e561380e 100644 --- a/parachain/runtime/kintsugi/src/weights/replace.rs +++ b/parachain/runtime/kintsugi/src/weights/replace.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for replace //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -46,8 +46,6 @@ impl replace::WeightInfo for WeightInfo { /// Proof: Nomination Vaults (max_values: None, max_size: Some(71), added: 2546, mode: MaxEncodedLen) /// Storage: Replace ReplaceBtcDustValue (r:1 w:0) /// Proof: Replace ReplaceBtcDustValue (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: Fee ReplaceGriefingCollateral (r:1 w:0) @@ -56,11 +54,11 @@ impl replace::WeightInfo for WeightInfo { /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) fn request_replace () -> Weight { // Proof Size summary in bytes: - // Measured: `1777` - // Estimated: `18838` - // Minimum execution time: 183_813_000 picoseconds. - Weight::from_parts(190_921_000, 18838) - .saturating_add(T::DbWeight::get().reads(7_u64)) + // Measured: `2035` + // Estimated: `3725` + // Minimum execution time: 129_860_000 picoseconds. + Weight::from_parts(130_421_000, 3725) + .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } /// Storage: VaultRegistry Vaults (r:1 w:1) @@ -69,8 +67,8 @@ impl replace::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `701` // Estimated: `3725` - // Minimum execution time: 84_337_000 picoseconds. - Weight::from_parts(88_867_000, 3725) + // Minimum execution time: 56_633_000 picoseconds. + Weight::from_parts(57_295_000, 3725) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -117,15 +115,13 @@ impl replace::WeightInfo for WeightInfo { /// Storage: VaultRewards TotalStake (r:1 w:1) /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultRewards RewardCurrencies (r:1 w:0) - /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) + /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(50), added: 2525, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: VaultCapacity TotalStake (r:1 w:1) /// Proof: VaultCapacity TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) /// Storage: VaultCapacity RewardCurrencies (r:1 w:0) - /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) + /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(39), added: 2514, mode: MaxEncodedLen) /// Storage: Tokens Accounts (r:1 w:1) /// Proof: Tokens Accounts (max_values: None, max_size: Some(115), added: 2590, mode: MaxEncodedLen) /// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1) @@ -146,11 +142,11 @@ impl replace::WeightInfo for WeightInfo { /// Proof: Replace ReplaceRequests (max_values: None, max_size: Some(250), added: 2725, mode: MaxEncodedLen) fn accept_replace () -> Weight { // Proof Size summary in bytes: - // Measured: `4188` - // Estimated: `129743` - // Minimum execution time: 829_872_000 picoseconds. - Weight::from_parts(849_278_000, 129743) - .saturating_add(T::DbWeight::get().reads(43_u64)) + // Measured: `4380` + // Estimated: `6460` + // Minimum execution time: 617_937_000 picoseconds. + Weight::from_parts(628_408_000, 6460) + .saturating_add(T::DbWeight::get().reads(42_u64)) .saturating_add(T::DbWeight::get().writes(26_u64)) } /// Storage: Replace ReplaceRequests (r:1 w:1) @@ -179,18 +175,18 @@ impl replace::WeightInfo for WeightInfo { /// The range of component `b` is `[541, 2048]`. fn execute_pending_replace (h: u32, i: u32, o: u32, b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `3700` - // Estimated: `28351` - // Minimum execution time: 324_333_000 picoseconds. - Weight::from_parts(299_064_148, 28351) - // Standard Error: 123_808 - .saturating_add(Weight::from_parts(2_843_688, 0).saturating_mul(h.into())) - // Standard Error: 111_614 - .saturating_add(Weight::from_parts(1_702_946, 0).saturating_mul(i.into())) - // Standard Error: 676_619 - .saturating_add(Weight::from_parts(1_855_038, 0).saturating_mul(o.into())) - // Standard Error: 681 - .saturating_add(Weight::from_parts(8_534, 0).saturating_mul(b.into())) + // Measured: `3962` + // Estimated: `6460` + // Minimum execution time: 202_806_000 picoseconds. + Weight::from_parts(166_981_824, 6460) + // Standard Error: 107_822 + .saturating_add(Weight::from_parts(3_763_037, 0).saturating_mul(h.into())) + // Standard Error: 97_203 + .saturating_add(Weight::from_parts(1_018_940, 0).saturating_mul(i.into())) + // Standard Error: 589_259 + .saturating_add(Weight::from_parts(3_102_944, 0).saturating_mul(o.into())) + // Standard Error: 593 + .saturating_add(Weight::from_parts(6_156, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -214,8 +210,6 @@ impl replace::WeightInfo for WeightInfo { /// Proof: VaultRegistry Vaults (max_values: None, max_size: Some(260), added: 2735, mode: MaxEncodedLen) /// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0) /// Proof: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: VaultStaking Nonce (r:1 w:0) @@ -228,19 +222,19 @@ impl replace::WeightInfo for WeightInfo { /// The range of component `b` is `[541, 2048]`. fn execute_cancelled_replace (h: u32, i: u32, o: u32, b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `4043` - // Estimated: `40395` - // Minimum execution time: 395_129_000 picoseconds. - Weight::from_parts(381_847_541, 40395) - // Standard Error: 132_878 - .saturating_add(Weight::from_parts(2_710_540, 0).saturating_mul(h.into())) - // Standard Error: 119_791 - .saturating_add(Weight::from_parts(1_346_976, 0).saturating_mul(i.into())) - // Standard Error: 726_188 - .saturating_add(Weight::from_parts(2_525_594, 0).saturating_mul(o.into())) - // Standard Error: 731 - .saturating_add(Weight::from_parts(4_989, 0).saturating_mul(b.into())) - .saturating_add(T::DbWeight::get().reads(15_u64)) + // Measured: `4121` + // Estimated: `6460` + // Minimum execution time: 248_939_000 picoseconds. + Weight::from_parts(198_920_588, 6460) + // Standard Error: 137_449 + .saturating_add(Weight::from_parts(4_042_981, 0).saturating_mul(h.into())) + // Standard Error: 123_913 + .saturating_add(Weight::from_parts(1_585_107, 0).saturating_mul(i.into())) + // Standard Error: 751_172 + .saturating_add(Weight::from_parts(5_026_953, 0).saturating_mul(o.into())) + // Standard Error: 756 + .saturating_add(Weight::from_parts(6_827, 0).saturating_mul(b.into())) + .saturating_add(T::DbWeight::get().reads(14_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } /// Storage: Replace ReplaceRequests (r:1 w:1) @@ -265,8 +259,6 @@ impl replace::WeightInfo for WeightInfo { /// Proof: VaultRegistry MinimumCollateralVault (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0) /// Proof: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1) @@ -303,11 +295,11 @@ impl replace::WeightInfo for WeightInfo { /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) fn cancel_replace () -> Weight { // Proof Size summary in bytes: - // Measured: `4480` - // Estimated: `118165` - // Minimum execution time: 754_304_000 picoseconds. - Weight::from_parts(769_377_000, 118165) - .saturating_add(T::DbWeight::get().reads(38_u64)) + // Measured: `4818` + // Estimated: `6460` + // Minimum execution time: 504_550_000 picoseconds. + Weight::from_parts(506_845_000, 6460) + .saturating_add(T::DbWeight::get().reads(37_u64)) .saturating_add(T::DbWeight::get().writes(19_u64)) } /// Storage: Replace ReplacePeriod (r:0 w:1) @@ -316,8 +308,8 @@ impl replace::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 23_951_000 picoseconds. - Weight::from_parts(24_723_000, 0) + // Minimum execution time: 18_356_000 picoseconds. + Weight::from_parts(18_557_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/security.rs b/parachain/runtime/kintsugi/src/weights/security.rs index 24a4504223..4731d80a1c 100644 --- a/parachain/runtime/kintsugi/src/weights/security.rs +++ b/parachain/runtime/kintsugi/src/weights/security.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for security //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -40,27 +40,27 @@ pub struct WeightInfo(PhantomData); impl security::WeightInfo for WeightInfo { - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) + /// Storage: Security IsDeactivated (r:1 w:0) + /// Proof: Security IsDeactivated (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Security ActiveBlockCount (r:1 w:1) /// Proof: Security ActiveBlockCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) fn on_initialize () -> Weight { // Proof Size summary in bytes: - // Measured: `126` - // Estimated: `2975` - // Minimum execution time: 24_245_000 picoseconds. - Weight::from_parts(25_061_000, 2975) + // Measured: `99` + // Estimated: `1489` + // Minimum execution time: 17_645_000 picoseconds. + Weight::from_parts(18_257_000, 1489) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } - /// Storage: Security ParachainStatus (r:0 w:1) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) + /// Storage: Security IsDeactivated (r:0 w:1) + /// Proof: Security IsDeactivated (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) fn activate_counter () -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 11_345_000 picoseconds. - Weight::from_parts(11_730_000, 0) + // Minimum execution time: 14_820_000 picoseconds. + Weight::from_parts(15_040_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/supply.rs b/parachain/runtime/kintsugi/src/weights/supply.rs index 577ccbca59..45fdddbfd4 100644 --- a/parachain/runtime/kintsugi/src/weights/supply.rs +++ b/parachain/runtime/kintsugi/src/weights/supply.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for supply //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -52,10 +52,10 @@ impl supply::WeightInfo for WeightInfo { /// Proof: Supply LastEmission (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) fn on_initialize () -> Weight { // Proof Size summary in bytes: - // Measured: `299` - // Estimated: `22547` - // Minimum execution time: 239_051_000 picoseconds. - Weight::from_parts(246_001_000, 22547) + // Measured: `606` + // Estimated: `11350` + // Minimum execution time: 199_900_000 picoseconds. + Weight::from_parts(201_875_000, 11350) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -65,8 +65,8 @@ impl supply::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 11_510_000 picoseconds. - Weight::from_parts(12_029_000, 0) + // Minimum execution time: 9_619_000 picoseconds. + Weight::from_parts(9_890_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } } \ No newline at end of file diff --git a/parachain/runtime/kintsugi/src/weights/tx_pause.rs b/parachain/runtime/kintsugi/src/weights/tx_pause.rs index a1e19d2982..23428dd485 100644 --- a/parachain/runtime/kintsugi/src/weights/tx_pause.rs +++ b/parachain/runtime/kintsugi/src/weights/tx_pause.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for tx_pause //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -46,8 +46,8 @@ impl tx_pause::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `3` // Estimated: `6494` - // Minimum execution time: 44_087_000 picoseconds. - Weight::from_parts(67_410_000, 6494) + // Minimum execution time: 32_134_000 picoseconds. + Weight::from_parts(32_656_000, 6494) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -57,8 +57,8 @@ impl tx_pause::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `308` // Estimated: `6494` - // Minimum execution time: 49_633_000 picoseconds. - Weight::from_parts(54_657_000, 6494) + // Minimum execution time: 36_964_000 picoseconds. + Weight::from_parts(37_264_000, 6494) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/parachain/runtime/kintsugi/src/weights/vault_registry.rs b/parachain/runtime/kintsugi/src/weights/vault_registry.rs index e7312b1ac3..2a8fa6c922 100644 --- a/parachain/runtime/kintsugi/src/weights/vault_registry.rs +++ b/parachain/runtime/kintsugi/src/weights/vault_registry.rs @@ -2,9 +2,9 @@ //! Autogenerated weights for vault_registry //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-06-05, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-08-07, STEPS: `50`, REPEAT: `10`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `dev-benchmark`, CPU: `Intel(R) Xeon(R) CPU @ 2.20GHz` +//! HOSTNAME: `interlay-rust-runner-2mz2v-kcxvd`, CPU: `AMD EPYC 7502P 32-Core Processor` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kintsugi-dev"), DB CACHE: 1024 // Executed Command: @@ -24,7 +24,7 @@ // --repeat // 10 // --output -// ../tmp-weight/ +// parachain/runtime/kintsugi/src/weights/ // --template // .deploy/runtime-weight-template.hbs @@ -112,19 +112,17 @@ impl vault_registry::WeightInfo for WeightInfo { /// Proof: Loans MinExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) /// Storage: Loans MaxExchangeRate (r:1 w:0) /// Proof: Loans MaxExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1) /// Proof: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) fn register_vault () -> Weight { // Proof Size summary in bytes: - // Measured: `2670` - // Estimated: `153273` - // Minimum execution time: 616_091_000 picoseconds. - Weight::from_parts(645_003_000, 153273) - .saturating_add(T::DbWeight::get().reads(48_u64)) + // Measured: `2893` + // Estimated: `6260` + // Minimum execution time: 471_203_000 picoseconds. + Weight::from_parts(474_851_000, 6260) + .saturating_add(T::DbWeight::get().reads(47_u64)) .saturating_add(T::DbWeight::get().writes(17_u64)) } /// Storage: VaultRegistry VaultBitcoinPublicKey (r:1 w:1) @@ -133,8 +131,8 @@ impl vault_registry::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `365` // Estimated: `3546` - // Minimum execution time: 43_020_000 picoseconds. - Weight::from_parts(44_952_000, 3546) + // Minimum execution time: 30_832_000 picoseconds. + Weight::from_parts(31_053_000, 3546) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -190,17 +188,15 @@ impl vault_registry::WeightInfo for WeightInfo { /// Proof: Loans MinExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) /// Storage: Loans MaxExchangeRate (r:1 w:0) /// Proof: Loans MaxExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) fn accept_new_issues () -> Weight { // Proof Size summary in bytes: - // Measured: `3476` - // Estimated: `111557` - // Minimum execution time: 504_658_000 picoseconds. - Weight::from_parts(532_058_000, 111557) - .saturating_add(T::DbWeight::get().reads(36_u64)) + // Measured: `3699` + // Estimated: `6260` + // Minimum execution time: 373_849_000 picoseconds. + Weight::from_parts(377_957_000, 6260) + .saturating_add(T::DbWeight::get().reads(35_u64)) .saturating_add(T::DbWeight::get().writes(12_u64)) } /// Storage: VaultRegistry SecureCollateralThreshold (r:1 w:0) @@ -255,17 +251,15 @@ impl vault_registry::WeightInfo for WeightInfo { /// Proof: Loans MinExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) /// Storage: Loans MaxExchangeRate (r:1 w:0) /// Proof: Loans MaxExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) fn set_custom_secure_threshold () -> Weight { // Proof Size summary in bytes: - // Measured: `3476` - // Estimated: `111557` - // Minimum execution time: 506_597_000 picoseconds. - Weight::from_parts(530_459_000, 111557) - .saturating_add(T::DbWeight::get().reads(36_u64)) + // Measured: `3699` + // Estimated: `6260` + // Minimum execution time: 377_576_000 picoseconds. + Weight::from_parts(378_928_000, 6260) + .saturating_add(T::DbWeight::get().reads(35_u64)) .saturating_add(T::DbWeight::get().writes(12_u64)) } /// Storage: VaultRegistry MinimumCollateralVault (r:0 w:1) @@ -274,8 +268,8 @@ impl vault_registry::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 12_931_000 picoseconds. - Weight::from_parts(13_682_000, 0) + // Minimum execution time: 10_461_000 picoseconds. + Weight::from_parts(10_722_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: VaultRegistry SystemCollateralCeiling (r:0 w:1) @@ -284,8 +278,8 @@ impl vault_registry::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 13_757_000 picoseconds. - Weight::from_parts(14_215_000, 0) + // Minimum execution time: 10_341_000 picoseconds. + Weight::from_parts(10_671_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: VaultRegistry SecureCollateralThreshold (r:0 w:1) @@ -294,8 +288,8 @@ impl vault_registry::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 27_005_000 picoseconds. - Weight::from_parts(27_844_000, 0) + // Minimum execution time: 20_762_000 picoseconds. + Weight::from_parts(21_152_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: VaultRegistry PremiumRedeemThreshold (r:0 w:1) @@ -304,8 +298,8 @@ impl vault_registry::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 27_292_000 picoseconds. - Weight::from_parts(28_795_000, 0) + // Minimum execution time: 20_591_000 picoseconds. + Weight::from_parts(20_962_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: VaultRegistry LiquidationCollateralThreshold (r:0 w:1) @@ -314,8 +308,8 @@ impl vault_registry::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 27_149_000 picoseconds. - Weight::from_parts(28_884_000, 0) + // Minimum execution time: 20_831_000 picoseconds. + Weight::from_parts(21_163_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: VaultRegistry Vaults (r:1 w:1) @@ -348,8 +342,6 @@ impl vault_registry::WeightInfo for WeightInfo { /// Proof: Loans MinExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) /// Storage: Loans MaxExchangeRate (r:1 w:0) /// Proof: Loans MaxExchangeRate (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - /// Storage: Security ParachainStatus (r:1 w:0) - /// Proof: Security ParachainStatus (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) /// Storage: Oracle Aggregate (r:1 w:0) /// Proof: Oracle Aggregate (max_values: None, max_size: Some(44), added: 2519, mode: MaxEncodedLen) /// Storage: VaultStaking Stake (r:1 w:1) @@ -358,7 +350,7 @@ impl vault_registry::WeightInfo for WeightInfo { /// Proof: VaultStaking SlashPerToken (max_values: None, max_size: Some(106), added: 2581, mode: MaxEncodedLen) /// Storage: VaultStaking SlashTally (r:1 w:1) /// Proof: VaultStaking SlashTally (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) - /// Storage: VaultCapacity Stake (r:1 w:1) + /// Storage: VaultCapacity Stake (r:1 w:0) /// Proof: VaultCapacity Stake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) /// Storage: VaultCapacity RewardPerToken (r:2 w:0) /// Proof: VaultCapacity RewardPerToken (max_values: None, max_size: Some(59), added: 2534, mode: MaxEncodedLen) @@ -384,14 +376,10 @@ impl vault_registry::WeightInfo for WeightInfo { /// Proof: VaultRegistry SecureCollateralThreshold (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) /// Storage: VaultRewards TotalStake (r:1 w:1) /// Proof: VaultRewards TotalStake (max_values: None, max_size: Some(43), added: 2518, mode: MaxEncodedLen) - /// Storage: VaultCapacity TotalStake (r:1 w:1) - /// Proof: VaultCapacity TotalStake (max_values: None, max_size: Some(32), added: 2507, mode: MaxEncodedLen) - /// Storage: VaultCapacity RewardCurrencies (r:1 w:0) - /// Proof: VaultCapacity RewardCurrencies (max_values: None, max_size: Some(127), added: 2602, mode: MaxEncodedLen) /// Storage: VaultStaking RewardTally (r:2 w:2) /// Proof: VaultStaking RewardTally (max_values: None, max_size: Some(149), added: 2624, mode: MaxEncodedLen) /// Storage: VaultRewards RewardCurrencies (r:1 w:0) - /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(138), added: 2613, mode: MaxEncodedLen) + /// Proof: VaultRewards RewardCurrencies (max_values: None, max_size: Some(50), added: 2525, mode: MaxEncodedLen) /// Storage: VaultRegistry TotalUserVaultCollateral (r:1 w:1) /// Proof: VaultRegistry TotalUserVaultCollateral (max_values: None, max_size: Some(54), added: 2529, mode: MaxEncodedLen) /// Storage: Loans RewardSupplyState (r:1 w:1) @@ -410,12 +398,12 @@ impl vault_registry::WeightInfo for WeightInfo { /// Proof: VaultRegistry LiquidationVault (max_values: None, max_size: Some(124), added: 2599, mode: MaxEncodedLen) fn report_undercollateralized_vault () -> Weight { // Proof Size summary in bytes: - // Measured: `4772` - // Estimated: `190133` - // Minimum execution time: 1_872_129_000 picoseconds. - Weight::from_parts(1_909_898_000, 190133) - .saturating_add(T::DbWeight::get().reads(60_u64)) - .saturating_add(T::DbWeight::get().writes(32_u64)) + // Measured: `5028` + // Estimated: `8799` + // Minimum execution time: 1_409_222_000 picoseconds. + Weight::from_parts(1_423_390_000, 8799) + .saturating_add(T::DbWeight::get().reads(57_u64)) + .saturating_add(T::DbWeight::get().writes(30_u64)) } /// Storage: VaultRegistry Vaults (r:1 w:1) /// Proof: VaultRegistry Vaults (max_values: None, max_size: Some(260), added: 2735, mode: MaxEncodedLen) @@ -423,8 +411,8 @@ impl vault_registry::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `669` // Estimated: `3725` - // Minimum execution time: 47_453_000 picoseconds. - Weight::from_parts(51_709_000, 3725) + // Minimum execution time: 30_602_000 picoseconds. + Weight::from_parts(30_982_000, 3725) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/parachain/runtime/kintsugi/src/xcm_config.rs b/parachain/runtime/kintsugi/src/xcm_config.rs index b625e7c8e6..5a3c0a2398 100644 --- a/parachain/runtime/kintsugi/src/xcm_config.rs +++ b/parachain/runtime/kintsugi/src/xcm_config.rs @@ -30,7 +30,7 @@ parameter_types! { } /// Means for transacting assets on this chain. -type LocationToAccountId = ( +pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. @@ -211,6 +211,7 @@ impl xcm_executor::Config for XcmConfig { type SafeCallFilter = SafeCallFilter; type CallDispatcher = WithOriginFilter; type UniversalLocation = UniversalLocation; + type Aliasers = Nothing; } /// No local origins on this chain are allowed to dispatch XCM sends/executions. @@ -255,6 +256,8 @@ impl pallet_xcm::Config for Runtime { #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; type AdminOrigin = EnsureRoot; + type MaxRemoteLockConsumers = ConstU32<0>; + type RemoteLockConsumerIdentifier = (); } impl cumulus_pallet_xcm::Config for Runtime { @@ -581,6 +584,11 @@ mod benchmark_impls { // We don't support exporting messages Err(BenchmarkError::Skip) } + + fn alias_origin() -> Result<(MultiLocation, MultiLocation), BenchmarkError> { + // The XCM executor of Polkadot doesn't have a configured `Aliasers` + Err(BenchmarkError::Skip) + } } } diff --git a/parachain/runtime/runtime-tests/Cargo.toml b/parachain/runtime/runtime-tests/Cargo.toml index c03780f265..0131c1c797 100644 --- a/parachain/runtime/runtime-tests/Cargo.toml +++ b/parachain/runtime/runtime-tests/Cargo.toml @@ -10,7 +10,7 @@ targets = ['x86_64-unknown-linux-gnu'] [dependencies] env_logger = { version = "0.9.1" } log = { version = "0.4.14" } -serde = { version = "1.0.130", features = ["derive"] } +serde = { version = "1.0.130", features = ["derive"], default-features = false } codec = { package = "parity-scale-codec", version = "3.1.5", features = ["derive", "max-encoded-len"] } hex-literal = { version = "0.3.1" } scale-info = { version = "2.2.0", features = ["derive"] } @@ -21,75 +21,76 @@ flate2 = "1.0" rand = "0.8.5" # Substrate dependencies -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } - -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", optional = true } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", optional = true } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-contracts = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false } -pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31", default-features = false } - -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } + +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", optional = true } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +pallet-contracts = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } ## Governance -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-society = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +pallet-society = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } # Aura dependencies -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" } # Cumulus dependencies -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.31" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } +xcm-emulator = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v1.0.0" } # Polkadot dependencies -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" } -kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" } -polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.31" } -xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", rev = "d011e5ca62b93e8f688c2042c1f92cdbafc5d1d0" } +polkadot-parachain = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +kusama-runtime = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-runtime = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +xcm = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +xcm-builder = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +xcm-executor = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +xcm-simulator = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +pallet-xcm = { git = "https://github.com/paritytech//polkadot", branch = "release-v1.0.0" } +polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v1.0.0" } # Parachain dependencies runtime-common = { path = "../common" } @@ -185,5 +186,6 @@ runtime-benchmarks = [ "kusama-runtime/runtime-benchmarks", "polkadot-runtime/runtime-benchmarks", + "polkadot-test-runtime/runtime-benchmarks", ] with-interlay-runtime = [] diff --git a/parachain/runtime/runtime-tests/src/lib.rs b/parachain/runtime/runtime-tests/src/lib.rs index bfed5e8af5..99f6eb6d88 100644 --- a/parachain/runtime/runtime-tests/src/lib.rs +++ b/parachain/runtime/runtime-tests/src/lib.rs @@ -4,6 +4,5 @@ mod bitcoin_data; mod parachain; -mod relaychain; mod setup; mod utils; diff --git a/parachain/runtime/runtime-tests/src/parachain/contracts.rs b/parachain/runtime/runtime-tests/src/parachain/contracts.rs index 7c4dff3976..bcf8bddcc6 100644 --- a/parachain/runtime/runtime-tests/src/parachain/contracts.rs +++ b/parachain/runtime/runtime-tests/src/parachain/contracts.rs @@ -1,5 +1,5 @@ use crate::setup::{assert_eq, *}; -use pallet_contracts::Determinism; +use pallet_contracts::{CollectEvents, DebugInfo, Determinism}; use pallet_contracts_primitives::Code; use sp_runtime::traits::Hash; @@ -30,6 +30,9 @@ mod relay { fn test_basic_contract() { // not sure this case would ever be used, best we have a test for it anyway.. ExtBuilder::build().execute_with(|| { + let key = kintsugi_runtime_parachain::contracts::EnableContracts::key(); + let hex = hex::encode(key); + println!("key = {hex}"); // note: current working directory is diffent when you run this test, vs when you debug it. // However, the `PWD` env variable is (surprisingly) set to the workspace root in both cases. // So, we use a path relative to PWD @@ -63,7 +66,8 @@ fn test_basic_contract() { Code::Existing(blob_hash), input, vec![], - true, + DebugInfo::Skip, + CollectEvents::Skip, ); let result = ret.result.unwrap(); @@ -94,7 +98,8 @@ fn test_basic_contract() { GAS_LIMIT, None, do_something_on_runtime_selector, - false, + DebugInfo::Skip, + CollectEvents::Skip, Determinism::Enforced, ); assert_ok!(result.result); @@ -135,7 +140,8 @@ fn test_btc_swap_contract() { Code::Existing(blob_hash), input, vec![], - true, + DebugInfo::Skip, + CollectEvents::Skip, ); let result = ret.result.unwrap(); @@ -157,7 +163,8 @@ fn test_btc_swap_contract() { GAS_LIMIT, None, create_trade, - false, + DebugInfo::Skip, + CollectEvents::Skip, Determinism::Enforced, ); assert_ok!(result.result); @@ -177,7 +184,8 @@ fn test_btc_swap_contract() { GAS_LIMIT, None, execute_trade, - false, + DebugInfo::Skip, + CollectEvents::Skip, Determinism::Enforced, ); assert_eq!(result.result.unwrap().flags.bits(), 0); // checks that result is ok, and no error flags are set @@ -195,7 +203,8 @@ fn test_btc_swap_contract() { GAS_LIMIT, None, execute_trade, - false, + DebugInfo::Skip, + CollectEvents::Skip, Determinism::Enforced, ); assert_err!(result.result, ContractsError::ContractTrapped); diff --git a/parachain/runtime/runtime-tests/src/relaychain/kusama_cross_chain_transfer.rs b/parachain/runtime/runtime-tests/src/relaychain/kusama_cross_chain_transfer.rs deleted file mode 100644 index 0880a03e06..0000000000 --- a/parachain/runtime/runtime-tests/src/relaychain/kusama_cross_chain_transfer.rs +++ /dev/null @@ -1,693 +0,0 @@ -use crate::relaychain::kusama_test_net::*; -use codec::Encode; -use frame_support::assert_ok; -use orml_traits::MultiCurrency; -use primitives::{ - CurrencyId::{ForeignAsset, Token}, - CustomMetadata, TokenSymbol, -}; -use sp_runtime::{FixedPointNumber, FixedU128}; -use xcm::latest::{prelude::*, Weight}; -use xcm_builder::ParentIsPreset; -use xcm_emulator::{TestExt, XcmExecutor}; -use xcm_executor::traits::Convert; - -mod fees { - use super::*; - - // N * unit_weight * (weight/10^12) * token_per_second - fn weight_calculation(instruction_count: u32, unit_weight: Weight, per_second: u128) -> u128 { - let weight = unit_weight.saturating_mul(instruction_count as u64); - let weight_ratio = - FixedU128::saturating_from_rational(weight.ref_time() as u128, WEIGHT_REF_TIME_PER_SECOND as u128); - weight_ratio.saturating_mul_int(per_second) - } - - fn native_unit_cost(instruction_count: u32, per_second: u128) -> u128 { - let unit_weight: Weight = kintsugi_runtime_parachain::xcm_config::UnitWeightCost::get(); - assert_eq!(unit_weight.ref_time(), 200_000_000); - assert_eq!(unit_weight.proof_size(), 0); - - weight_calculation(instruction_count, unit_weight, per_second) - } - - pub fn ksm_per_second_as_fee(instruction_count: u32) -> u128 { - let ksm_per_second = kintsugi_runtime_parachain::xcm_config::ksm_per_second(); - - // check ksm per second. It's by no means essential - it's just useful to be forced to check the - // change after polkadot updates - assert!(ksm_per_second < 210000000000); - - native_unit_cost(instruction_count, ksm_per_second) - } - - pub fn kint_per_second_as_fee(instruction_count: u32) -> u128 { - let kint_per_second = kintsugi_runtime_parachain::xcm_config::kint_per_second(); - - native_unit_cost(instruction_count, kint_per_second) - } -} - -mod hrmp { - use super::*; - - use polkadot_runtime_parachains::hrmp; - fn construct_xcm(call: hrmp::Call) -> Xcm<()> { - Xcm(vec![ - WithdrawAsset((Here, 410000000000u128).into()), - BuyExecution { - fees: (Here, 400000000000u128).into(), - weight_limit: Unlimited, - }, - Transact { - require_weight_at_most: Weight::from_parts(10000000000, 1_000_000u64), // actual pov size = 31015 - origin_kind: OriginKind::Native, - call: kusama_runtime::RuntimeCall::Hrmp(call).encode().into(), - }, - RefundSurplus, - DepositAsset { - assets: All.into(), - beneficiary: Junction::AccountId32 { id: BOB, network: None }.into(), - }, - ]) - } - - fn has_open_channel_requested_event(sender: u32, recipient: u32) -> bool { - KusamaNet::execute_with(|| { - kusama_runtime::System::events().iter().any(|r| { - matches!( - r.event, - kusama_runtime::RuntimeEvent::Hrmp(hrmp::Event::OpenChannelRequested( - actual_sender, - actual_recipient, - 1000, - 102400 - )) if actual_sender == sender.into() && actual_recipient == recipient.into() - ) - }) - }) - } - - fn has_open_channel_accepted_event(sender: u32, recipient: u32) -> bool { - KusamaNet::execute_with(|| { - kusama_runtime::System::events().iter().any(|r| { - matches!( - r.event, - kusama_runtime::RuntimeEvent::Hrmp(hrmp::Event::OpenChannelAccepted( - actual_sender, - actual_recipient - )) if actual_sender == sender.into() && actual_recipient == recipient.into() - ) - }) - }) - } - - fn init_open_channel(sender: u32, recipient: u32) - where - T: TestExt, - { - // do hrmp_init_open_channel - assert!(!has_open_channel_requested_event(sender, recipient)); // just a sanity check - T::execute_with(|| { - let message = construct_xcm(hrmp::Call::::hrmp_init_open_channel { - recipient: recipient.into(), - proposed_max_capacity: 1000, - proposed_max_message_size: 102400, - }); - assert_ok!(pallet_xcm::Pallet::::send_xcm( - Here, Parent, message - )); - }); - assert!(has_open_channel_requested_event(sender, recipient)); - } - - fn accept_open_channel(sender: u32, recipient: u32) - where - T: TestExt, - { - // do hrmp_accept_open_channel - assert!(!has_open_channel_accepted_event(sender, recipient)); // just a sanity check - T::execute_with(|| { - let message = construct_xcm(hrmp::Call::::hrmp_accept_open_channel { - sender: sender.into(), - }); - assert_ok!(pallet_xcm::Pallet::::send_xcm( - Here, Parent, message - )); - }); - assert!(has_open_channel_accepted_event(sender, recipient)); - } - #[test] - fn open_hrmp_channel() { - // setup sovereign account balances - KusamaNet::execute_with(|| { - // transfer the required funds, and make sure that the account remains above the existential deposit - // afterwards - assert_ok!(kusama_runtime::Balances::transfer( - kusama_runtime::RuntimeOrigin::signed(ALICE.into()), - sp_runtime::MultiAddress::Id(kintsugi_sovereign_account_on_kusama()), - 10_820_000_000_000 + kusama_runtime::ExistentialDeposit::get() - )); - assert_ok!(kusama_runtime::Balances::transfer( - kusama_runtime::RuntimeOrigin::signed(ALICE.into()), - sp_runtime::MultiAddress::Id(sibling_sovereign_account_on_kusama()), - 10_820_000_000_000 + kusama_runtime::ExistentialDeposit::get() - )); - }); - // open channel kintsugi -> sibling - init_open_channel::(KINTSUGI_PARA_ID, SIBLING_PARA_ID); - accept_open_channel::(KINTSUGI_PARA_ID, SIBLING_PARA_ID); - - // open channel sibling -> kintsugi - init_open_channel::(SIBLING_PARA_ID, KINTSUGI_PARA_ID); - accept_open_channel::(SIBLING_PARA_ID, KINTSUGI_PARA_ID); - - // check that Bob received left-over funds (from both Kintsugi and Sibling). - // We expect slightly less than 4 * 0.41 KSM - KusamaNet::execute_with(|| { - let free_balance = kusama_runtime::Balances::free_balance(&AccountId::from(BOB)); - assert!(free_balance > 1_600_000_000_000 && free_balance < 1_640_000_000_000); - }); - } -} - -#[test] -fn test_transact_barrier() { - let call = orml_tokens::Call::::transfer_all { - dest: ALICE.into(), - currency_id: Token(KSM), - keep_alive: false, - }; - let message = Xcm(vec![ - WithdrawAsset((Here, 410000000000u128).into()), - BuyExecution { - fees: (Here, 400000000000u128).into(), - weight_limit: Unlimited, - }, - Transact { - require_weight_at_most: Weight::from_parts(10000000000, 0u64), - origin_kind: OriginKind::Native, - call: kintsugi_runtime_parachain::RuntimeCall::Tokens(call).encode().into(), - }, - RefundSurplus, - DepositAsset { - assets: All.into(), - beneficiary: Junction::AccountId32 { id: BOB, network: None }.into(), - }, - ]); - - KusamaNet::execute_with(|| { - assert_ok!(pallet_xcm::Pallet::::send_xcm( - Here, - X1(Parachain(2092)), - message - )); - }); - - Kintsugi::execute_with(|| { - assert!(System::events().iter().any(|r| matches!( - r.event, - RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward { - outcome: Outcome::Error(XcmError::Barrier), - .. - }) - ))); - }); -} - -#[test] -fn transfer_from_relay_chain() { - KusamaNet::execute_with(|| { - assert_ok!(kusama_runtime::XcmPallet::reserve_transfer_assets( - kusama_runtime::RuntimeOrigin::signed(ALICE.into()), - Box::new(Parachain(KINTSUGI_PARA_ID).into_versioned()), - Box::new(Junction::AccountId32 { id: BOB, network: None }.into_versioned()), - Box::new((Here, KSM.one()).into()), - 0 - )); - }); - - Kintsugi::execute_with(|| { - let xcm_fee = KSM.one() - Tokens::free_balance(Token(KSM), &AccountId::from(BOB)); - - assert!(xcm_fee < 1000000000); // fees are set to 1000000000 in ui - make sure it's enough - assert!(xcm_fee > 0); // check that some fees are taken - - // check that fees go to treasury - assert_eq!(Tokens::free_balance(Token(KSM), &TreasuryAccount::get()), xcm_fee); - }); -} - -#[test] -fn transfer_to_relay_chain() { - KusamaNet::execute_with(|| { - assert_ok!(kusama_runtime::Balances::transfer( - kusama_runtime::RuntimeOrigin::signed(ALICE.into()), - sp_runtime::MultiAddress::Id(kintsugi_sovereign_account_on_kusama()), - 2 * KSM.one() - )); - }); - - Kintsugi::execute_with(|| { - assert_ok!(XTokens::transfer( - RuntimeOrigin::signed(ALICE.into()), - Token(KSM), - KSM.one(), - Box::new(MultiLocation::new(1, X1(Junction::AccountId32 { id: BOB, network: None })).into()), - WeightLimit::Unlimited - )); - }); - - KusamaNet::execute_with(|| { - let fee = KSM.one() - kusama_runtime::Balances::free_balance(&AccountId::from(BOB)); - - // UI uses 165940672 - make sure that that's an overestimation - assert!(fee < 165940672); - }); -} - -/// Send KINT to sibling. On the sibling, it will be registered as a foreign asset. -/// By also transferring it back, we test that the asset-registry has been properly -/// integrated. -#[test] -fn transfer_to_sibling_and_back() { - fn sibling_sovereign_account() -> AccountId { - use sp_runtime::traits::AccountIdConversion; - polkadot_parachain::primitives::Sibling::from(SIBLING_PARA_ID).into_account_truncating() - } - - Sibling::execute_with(|| { - register_kint_as_foreign_asset(); - }); - - Kintsugi::execute_with(|| { - assert_ok!(Tokens::deposit( - Token(KINT), - &AccountId::from(ALICE), - 100_000_000_000_000 - )); - }); - - Kintsugi::execute_with(|| { - assert_ok!(XTokens::transfer( - RuntimeOrigin::signed(ALICE.into()), - Token(KINT), - 10_000_000_000_000, - Box::new( - MultiLocation::new( - 1, - X2( - Parachain(SIBLING_PARA_ID), - Junction::AccountId32 { - network: None, - id: BOB.into(), - } - ) - ) - .into() - ), - WeightLimit::Unlimited, - )); - - assert_eq!( - Tokens::free_balance(Token(KINT), &AccountId::from(ALICE)), - 90_000_000_000_000 - ); - - assert_eq!( - Tokens::free_balance(Token(KINT), &sibling_sovereign_account()), - 10_000_000_000_000 - ); - }); - - Sibling::execute_with(|| { - let xcm_fee = 800_000_000; - - // check reception - assert_eq!( - Tokens::free_balance(ForeignAsset(1), &AccountId::from(BOB)), - 10_000_000_000_000 - xcm_fee - ); - - // return some back to kintsugi - assert_ok!(XTokens::transfer( - RuntimeOrigin::signed(BOB.into()), - ForeignAsset(1), - 5_000_000_000_000, - Box::new( - MultiLocation::new( - 1, - X2( - Parachain(KINTSUGI_PARA_ID), - Junction::AccountId32 { - network: None, - id: ALICE.into(), - } - ) - ) - .into() - ), - WeightLimit::Unlimited, - )); - }); - - // check reception - Kintsugi::execute_with(|| { - let xcm_fee = fees::kint_per_second_as_fee(4); - assert_eq!( - Tokens::free_balance(Token(KINT), &AccountId::from(ALICE)), - 95_000_000_000_000 - xcm_fee - ); - - assert_eq!(Tokens::free_balance(Token(KINT), &TreasuryAccount::get()), xcm_fee); - - assert_eq!( - Tokens::free_balance(Token(KINT), &sibling_sovereign_account()), - 5_000_000_000_000 - ); - }); -} - -#[test] -fn xcm_transfer_execution_barrier_trader_works() { - let unit_instruction_weight: Weight = kintsugi_runtime_parachain::xcm_config::UnitWeightCost::get(); - let message_weight = unit_instruction_weight.saturating_mul(3); - let xcm_fee = fees::ksm_per_second_as_fee(3); - - // relay-chain use normal account to send xcm, destination parachain can't pass Barrier check - let message = Xcm(vec![ - ReserveAssetDeposited((Parent, 100).into()), - BuyExecution { - fees: (Parent, 100).into(), - weight_limit: Unlimited, - }, - DepositAsset { - assets: All.into(), - beneficiary: Here.into(), - }, - ]); - KusamaNet::execute_with(|| { - // Kusama effectively disabled the `send` extrinsic in 0.9.19, so use send_xcm - assert_ok!(pallet_xcm::Pallet::::send_xcm( - X1(Junction::AccountId32 { - network: None, - id: ALICE.into(), - }), - Parachain(KINTSUGI_PARA_ID), - message - )); - }); - Kintsugi::execute_with(|| { - assert!(System::events().iter().any(|r| matches!( - r.event, - RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward { - outcome: Outcome::Error(XcmError::Barrier), - .. - }) - ))); - }); - - // AllowTopLevelPaidExecutionFrom barrier test case: - // para-chain use XcmExecutor `execute_xcm()` method to execute xcm. - // if `weight_limit` in BuyExecution is less than `xcm_weight(max_weight)`, then Barrier can't pass. - // other situation when `weight_limit` is `Unlimited` or large than `xcm_weight`, then it's ok. - let message = Xcm::(vec![ - ReserveAssetDeposited((Parent, 100).into()), - BuyExecution { - fees: (Parent, 100).into(), - weight_limit: Limited(message_weight - Weight::from_parts(1, 0u64)), - }, - DepositAsset { - assets: All.into(), - beneficiary: Here.into(), - }, - ]); - Kintsugi::execute_with(|| { - let hash = message.using_encoded(sp_io::hashing::blake2_256); - let r = XcmExecutor::::execute_xcm(Parent, message, hash, message_weight); - assert_eq!(r, Outcome::Error(XcmError::Barrier)); - }); - - // trader inside BuyExecution have TooExpensive error if payment less than calculated weight amount. - // the minimum of calculated weight amount(`FixedRateOfFungible`). - let message = Xcm::(vec![ - ReserveAssetDeposited((Parent, xcm_fee - 1).into()), - BuyExecution { - fees: (Parent, xcm_fee - 1).into(), - weight_limit: Limited(message_weight), - }, - DepositAsset { - assets: All.into(), - beneficiary: Here.into(), - }, - ]); - Kintsugi::execute_with(|| { - let hash = message.using_encoded(sp_io::hashing::blake2_256); - let r = XcmExecutor::::execute_xcm(Parent, message, hash, message_weight); - assert_eq!( - r, - Outcome::Incomplete(message_weight - unit_instruction_weight, XcmError::TooExpensive) - ); - }); - - // all situation fulfilled, execute success - let message = Xcm::(vec![ - ReserveAssetDeposited((Parent, xcm_fee).into()), - BuyExecution { - fees: (Parent, xcm_fee).into(), - weight_limit: Limited(message_weight), - }, - DepositAsset { - assets: All.into(), - beneficiary: Here.into(), - }, - ]); - Kintsugi::execute_with(|| { - let hash = message.using_encoded(sp_io::hashing::blake2_256); - let r = XcmExecutor::::execute_xcm(Parent, message, hash, message_weight); - assert_eq!(r, Outcome::Complete(message_weight)); - }); -} - -#[test] -fn subscribe_version_notify_works() { - // relay chain subscribe version notify of para chain - KusamaNet::execute_with(|| { - let r = pallet_xcm::Pallet::::force_subscribe_version_notify( - kusama_runtime::RuntimeOrigin::root(), - Box::new(Parachain(KINTSUGI_PARA_ID).into_versioned()), - ); - assert_ok!(r); - }); - KusamaNet::execute_with(|| { - kusama_runtime::System::assert_has_event(kusama_runtime::RuntimeEvent::XcmPallet( - pallet_xcm::Event::SupportedVersionChanged( - MultiLocation { - parents: 0, - interior: X1(Parachain(KINTSUGI_PARA_ID)), - }, - 3, - ), - )); - }); - - // para chain subscribe version notify of relay chain - Kintsugi::execute_with(|| { - let r = pallet_xcm::Pallet::::force_subscribe_version_notify( - RuntimeOrigin::root(), - Box::new(Parent.into()), - ); - assert_ok!(r); - }); - Kintsugi::execute_with(|| { - System::assert_has_event(kintsugi_runtime_parachain::RuntimeEvent::PolkadotXcm( - pallet_xcm::Event::SupportedVersionChanged( - MultiLocation { - parents: 1, - interior: Here, - }, - 3, - ), - )); - }); - - // para chain subscribe version notify of sibling chain - Kintsugi::execute_with(|| { - let r = pallet_xcm::Pallet::::force_subscribe_version_notify( - RuntimeOrigin::root(), - Box::new((Parent, Parachain(SIBLING_PARA_ID)).into()), - ); - assert_ok!(r); - }); - Kintsugi::execute_with(|| { - assert!(kintsugi_runtime_parachain::System::events().iter().any(|r| matches!( - r.event, - kintsugi_runtime_parachain::RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { - message_hash: Some(_) - }) - ))); - }); - Sibling::execute_with(|| { - assert!(kintsugi_runtime_parachain::System::events().iter().any(|r| matches!( - r.event, - kintsugi_runtime_parachain::RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { - message_hash: Some(_) - }) | kintsugi_runtime_parachain::RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Success { - message_hash: Some(_), - weight: _, - }) - ))); - }); -} - -fn general_key_of(token_symbol: TokenSymbol) -> Junction { - let id = Token(token_symbol); - let encoded = id.encode(); - let mut data = [0u8; 32]; - if encoded.len() > 32 { - // we are not returning result, so panic is inevitable. Let's make it explicit. - panic!("Currency ID was too long to be encoded"); - } - data[..encoded.len()].copy_from_slice(&encoded[..]); - GeneralKey { - length: encoded.len() as u8, - data, - } -} - -#[test] -fn trap_assets_works() { - let mut kint_treasury_amount = 0; - let mut ksm_treasury_amount = 0; - let (ksm_asset_amount, kint_asset_amount) = (KSM.one(), KINT.one()); - let trader_weight_to_treasury = fees::ksm_per_second_as_fee(3); - - let parent_account: AccountId = ParentIsPreset::::convert(Parent.into()).unwrap(); - - Kintsugi::execute_with(|| { - assert_ok!(Tokens::deposit(Token(KSM), &parent_account, 100 * KSM.one())); - assert_ok!(Tokens::deposit(Token(KINT), &parent_account, 100 * KINT.one())); - - kint_treasury_amount = Tokens::free_balance(Token(KINT), &TreasuryAccount::get()); - ksm_treasury_amount = Tokens::free_balance(Token(KSM), &TreasuryAccount::get()); - }); - - let assets: MultiAsset = (Parent, ksm_asset_amount).into(); - // Withdraw kint and ksm on kintsugi but don't deposit it - KusamaNet::execute_with(|| { - let xcm = vec![ - WithdrawAsset(assets.clone().into()), - BuyExecution { - fees: assets, - weight_limit: Limited(Weight::from_parts(KSM.one() as u64, 0u64)), - }, - WithdrawAsset( - ( - (Parent, X2(Parachain(KINTSUGI_PARA_ID), general_key_of(KINT))), - kint_asset_amount, - ) - .into(), - ), - ]; - assert_ok!(pallet_xcm::Pallet::::send_xcm( - Here, - Parachain(KINTSUGI_PARA_ID), - Xcm(xcm), - )); - }); - - let mut trapped_assets: Option = None; - // verify that the assets got trapped (i.e. didn't get burned) - Kintsugi::execute_with(|| { - assert!(System::events().iter().any(|r| matches!( - r.event, - RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped(_, _, _)) - ))); - - let event = System::events() - .iter() - .find(|r| { - matches!( - r.event, - RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped(_, _, _)) - ) - }) - .cloned() - .unwrap(); - - use std::convert::TryFrom; - use xcm::VersionedMultiAssets; - trapped_assets = match event.event { - RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped(_, _, ticket)) => { - Some(TryFrom::::try_from(ticket).unwrap()) - } - _ => panic!("event not found"), - }; - - // unchanged treasury amounts - assert_eq!( - trader_weight_to_treasury, - Tokens::free_balance(Token(KSM), &TreasuryAccount::get()) - ); - assert_eq!( - kint_treasury_amount, - Tokens::free_balance(Token(KINT), &TreasuryAccount::get()) - ); - }); - - // Now reclaim trapped assets - KusamaNet::execute_with(|| { - let xcm = vec![ - ClaimAsset { - assets: trapped_assets.unwrap(), - ticket: Here.into(), - }, - BuyExecution { - fees: ( - (Parent, X2(Parachain(KINTSUGI_PARA_ID), general_key_of(KINT))), - kint_asset_amount / 2, - ) - .into(), - weight_limit: Limited(Weight::from_parts(KSM.one() as u64, 0u64)), - }, - DepositAsset { - assets: All.into(), - beneficiary: Junction::AccountId32 { id: BOB, network: None }.into(), - }, - ]; - assert_ok!(pallet_xcm::Pallet::::send_xcm( - Here, - Parachain(KINTSUGI_PARA_ID), - Xcm(xcm), - )); - }); - - // verify that assets were claimed successfully (deposited into Bob's account) - Kintsugi::execute_with(|| { - let kint_xcm_fee = fees::kint_per_second_as_fee(3); - let ksm_xcm_fee = fees::ksm_per_second_as_fee(3); - assert_eq!( - Tokens::free_balance(Token(KINT), &AccountId::from(BOB)), - kint_asset_amount - kint_xcm_fee - ); - assert_eq!( - Tokens::free_balance(Token(KSM), &AccountId::from(BOB)), - ksm_asset_amount - ksm_xcm_fee - ); - }); -} - -fn register_kint_as_foreign_asset() { - let metadata = AssetMetadata { - decimals: 12, - name: "Kintsugi native".as_bytes().to_vec(), - symbol: "extKINT".as_bytes().to_vec(), - existential_deposit: 0, - location: Some(MultiLocation::new(1, X2(Parachain(KINTSUGI_PARA_ID), general_key_of(KINT))).into()), - additional: CustomMetadata { - fee_per_second: 1_000_000_000_000, - coingecko_id: "kint-sugi".as_bytes().to_vec(), - }, - }; - AssetRegistry::register_asset(RuntimeOrigin::root(), metadata, None).unwrap(); -} diff --git a/parachain/runtime/runtime-tests/src/relaychain/kusama_test_net.rs b/parachain/runtime/runtime-tests/src/relaychain/kusama_test_net.rs deleted file mode 100644 index 8e68f57efb..0000000000 --- a/parachain/runtime/runtime-tests/src/relaychain/kusama_test_net.rs +++ /dev/null @@ -1,242 +0,0 @@ -use cumulus_primitives_core::MultiLocation; -use frame_support::{traits::GenesisBuild, weights::Weight}; -pub use kintsugi_runtime_parachain::{xcm_config::*, *}; -use polkadot_primitives::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE}; -use polkadot_runtime_parachains::{configuration::HostConfiguration, paras::ParaKind}; -pub use primitives::{ - CurrencyId::Token, - TokenSymbol::{KINT, KSM}, -}; -use sp_runtime::traits::AccountIdConversion; -use xcm_emulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain}; - -pub const KINTSUGI_PARA_ID: u32 = 2092; -pub const SIBLING_PARA_ID: u32 = 2001; - -decl_test_relay_chain! { - pub struct KusamaNet { - Runtime = kusama_runtime::Runtime, - XcmConfig = kusama_runtime::xcm_config::XcmConfig, - new_ext = kusama_ext(), - } -} - -decl_test_parachain! { - pub struct Kintsugi { - Runtime = Runtime, - RuntimeOrigin = RuntimeOrigin, - XcmpMessageHandler = kintsugi_runtime_parachain::XcmpQueue, - DmpMessageHandler = kintsugi_runtime_parachain::DmpQueue, - new_ext = para_ext(KINTSUGI_PARA_ID), - } -} - -decl_test_parachain! { - pub struct Sibling { - Runtime = kintsugi_runtime_parachain::Runtime, - RuntimeOrigin = kintsugi_runtime_parachain::RuntimeOrigin, - XcmpMessageHandler = kintsugi_runtime_parachain::XcmpQueue, - DmpMessageHandler = kintsugi_runtime_parachain::DmpQueue, - new_ext = para_ext(SIBLING_PARA_ID), - } -} - -// note: can't use SIBLING_PARA_ID and KINTSUGI_PARA_ID in this macro - we are forced to use raw numbers -decl_test_network! { - pub struct TestNet { - relay_chain = KusamaNet, - parachains = vec![ - (2092, Kintsugi), - (2001, Sibling), - ], - } -} - -fn default_parachains_host_configuration() -> HostConfiguration { - HostConfiguration { - minimum_validation_upgrade_delay: 5, - validation_upgrade_cooldown: 5u32, - validation_upgrade_delay: 5, - code_retention_period: 1200, - max_code_size: MAX_CODE_SIZE, - max_pov_size: MAX_POV_SIZE, - max_head_data_size: 32 * 1024, - group_rotation_frequency: 20, - chain_availability_period: 4, - thread_availability_period: 4, - max_upward_queue_count: 8, - max_upward_queue_size: 1024 * 1024, - max_downward_message_size: 1024, - ump_service_total_weight: Weight::from_parts(4 * 1_000_000_000 as u64, 0u64), - max_upward_message_size: 50 * 1024, - max_upward_message_num_per_candidate: 5, - hrmp_sender_deposit: 5_000_000_000_000, - hrmp_recipient_deposit: 5_000_000_000_000, - hrmp_channel_max_capacity: 1000, - hrmp_channel_max_total_size: 8 * 1024, - hrmp_max_parachain_inbound_channels: 4, - hrmp_max_parathread_inbound_channels: 4, - hrmp_channel_max_message_size: 102400, - hrmp_max_parachain_outbound_channels: 4, - hrmp_max_parathread_outbound_channels: 4, - hrmp_max_message_num_per_candidate: 5, - dispute_period: 6, - no_show_slots: 2, - n_delay_tranches: 25, - needed_approvals: 2, - relay_vrf_modulo_samples: 2, - zeroth_delay_tranche_width: 0, - ..Default::default() - } -} - -pub fn kusama_ext() -> sp_io::TestExternalities { - use kusama_runtime::{Runtime, System}; - use polkadot_parachain::primitives::{HeadData, ValidationCode}; - - let mut t = frame_system::GenesisConfig::default() - .build_storage::() - .unwrap(); - - pallet_balances::GenesisConfig:: { - balances: vec![ - (AccountId::from(ALICE), 2002 * KSM.one()), - // (ParaId::from(KINTSUGI_PARA_ID).into_account_truncating(), 2 * KSM.one()), - ], - } - .assimilate_storage(&mut t) - .unwrap(); - - // register a parachain so that we can test opening hrmp channel - let fake_para = polkadot_runtime_parachains::paras::ParaGenesisArgs { - genesis_head: HeadData(vec![]), - para_kind: ParaKind::Parachain, - validation_code: ValidationCode(vec![0]), - }; - >::assimilate_storage( - &polkadot_runtime_parachains::paras::GenesisConfig { - paras: vec![ - (KINTSUGI_PARA_ID.into(), fake_para.clone()), - (SIBLING_PARA_ID.into(), fake_para.clone()), - ], - }, - &mut t, - ) - .unwrap(); - - polkadot_runtime_parachains::configuration::GenesisConfig:: { - config: default_parachains_host_configuration(), - } - .assimilate_storage(&mut t) - .unwrap(); - - >::assimilate_storage( - &pallet_xcm::GenesisConfig { - safe_xcm_version: Some(3), - }, - &mut t, - ) - .unwrap(); - - let mut ext = sp_io::TestExternalities::new(t); - ext.execute_with(|| System::set_block_number(1)); - ext -} - -pub fn para_ext(parachain_id: u32) -> sp_io::TestExternalities { - ExtBuilder::default() - .balances(vec![ - (AccountId::from(ALICE), Token(KSM), 10 * KSM.one()), - // (kintsugi_runtime_parachain::TreasuryAccount::get(), Token(KSM), KSM.one()), - ]) - .parachain_id(parachain_id) - .build() -} - -#[allow(dead_code)] -pub const DEFAULT: [u8; 32] = [0u8; 32]; -#[allow(dead_code)] -pub const ALICE: [u8; 32] = [4u8; 32]; -#[allow(dead_code)] -pub const BOB: [u8; 32] = [5u8; 32]; - -pub struct ExtBuilder { - balances: Vec<(AccountId, CurrencyId, Balance)>, - parachain_id: u32, -} - -impl Default for ExtBuilder { - fn default() -> Self { - Self { - balances: vec![], - parachain_id: 2000, - } - } -} - -impl ExtBuilder { - pub fn balances(mut self, balances: Vec<(AccountId, CurrencyId, Balance)>) -> Self { - self.balances = balances; - self - } - - #[allow(dead_code)] - pub fn parachain_id(mut self, parachain_id: u32) -> Self { - self.parachain_id = parachain_id; - self - } - - pub fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() - .unwrap(); - - let native_currency_id = GetNativeCurrencyId::get(); - - orml_tokens::GenesisConfig:: { - balances: self - .balances - .into_iter() - .filter(|(_, currency_id, _)| *currency_id != native_currency_id) - .collect::>(), - } - .assimilate_storage(&mut t) - .unwrap(); - - >::assimilate_storage( - ¶chain_info::GenesisConfig { - parachain_id: self.parachain_id.into(), - }, - &mut t, - ) - .unwrap(); - - >::assimilate_storage( - &pallet_xcm::GenesisConfig { - safe_xcm_version: Some(2), // NOTE! if this was required for tests we may need it on mainnet - }, - &mut t, - ) - .unwrap(); - - let mut ext = sp_io::TestExternalities::new(t); - ext.execute_with(|| { - System::set_block_number(1); - PolkadotXcm::force_xcm_version( - kintsugi_runtime_parachain::RuntimeOrigin::root(), - Box::new(MultiLocation::parent()), - 3, - ) - .unwrap(); - }); - ext - } -} - -pub(crate) fn kintsugi_sovereign_account_on_kusama() -> AccountId { - polkadot_parachain::primitives::Id::from(KINTSUGI_PARA_ID).into_account_truncating() -} - -pub(crate) fn sibling_sovereign_account_on_kusama() -> AccountId { - polkadot_parachain::primitives::Id::from(SIBLING_PARA_ID).into_account_truncating() -} diff --git a/parachain/runtime/runtime-tests/src/relaychain/mod.rs b/parachain/runtime/runtime-tests/src/relaychain/mod.rs deleted file mode 100644 index 5f90377e51..0000000000 --- a/parachain/runtime/runtime-tests/src/relaychain/mod.rs +++ /dev/null @@ -1,4 +0,0 @@ -mod kusama_cross_chain_transfer; -pub mod kusama_test_net; -mod polkadot_cross_chain_transfer; -pub mod polkadot_test_net; diff --git a/parachain/runtime/runtime-tests/src/relaychain/polkadot_cross_chain_transfer.rs b/parachain/runtime/runtime-tests/src/relaychain/polkadot_cross_chain_transfer.rs deleted file mode 100644 index dc7fd3efe9..0000000000 --- a/parachain/runtime/runtime-tests/src/relaychain/polkadot_cross_chain_transfer.rs +++ /dev/null @@ -1,736 +0,0 @@ -use crate::relaychain::polkadot_test_net::*; -use codec::Encode; -use frame_support::{ - assert_ok, - weights::{Weight as FrameWeight, WeightToFee}, -}; -use orml_traits::MultiCurrency; -use primitives::{ - CurrencyId::{ForeignAsset, Token}, - CustomMetadata, TokenSymbol, -}; -use xcm::latest::{prelude::*, Weight}; -use xcm_builder::ParentIsPreset; -use xcm_emulator::{TestExt, XcmExecutor}; -use xcm_executor::traits::{Convert, WeightBounds}; - -mod hrmp { - use super::*; - - use polkadot_runtime_parachains::hrmp; - fn construct_xcm(call: hrmp::Call, xcm_fee: u128, transact_weight: Weight) -> Xcm<()> { - Xcm(vec![ - WithdrawAsset((Here, xcm_fee).into()), - BuyExecution { - fees: (Here, xcm_fee).into(), - weight_limit: Unlimited, /* Let polkadot weigh the message. Weight will include the - * `transact.require_weight_at_most` */ - }, - Transact { - require_weight_at_most: transact_weight, - origin_kind: OriginKind::Native, - call: polkadot_runtime::RuntimeCall::Hrmp(call).encode().into(), - }, - RefundSurplus, - DepositAsset { - assets: All.into(), - beneficiary: Junction::AccountId32 { id: BOB, network: None }.into(), - }, - ]) - } - - fn has_open_channel_requested_event(sender: u32, recipient: u32) -> bool { - PolkadotNet::execute_with(|| { - polkadot_runtime::System::events().iter().any(|r| { - matches!( - r.event, - polkadot_runtime::RuntimeEvent::Hrmp(hrmp::Event::OpenChannelRequested( - actual_sender, - actual_recipient, - 1000, - 102400 - )) if actual_sender == sender.into() && actual_recipient == recipient.into() - ) - }) - }) - } - - fn has_open_channel_accepted_event(sender: u32, recipient: u32) -> bool { - PolkadotNet::execute_with(|| { - polkadot_runtime::System::events().iter().any(|r| { - matches!( - r.event, - polkadot_runtime::RuntimeEvent::Hrmp(hrmp::Event::OpenChannelAccepted( - actual_sender, - actual_recipient - )) if actual_sender == sender.into() && actual_recipient == recipient.into() - ) - }) - }) - } - - fn init_open_channel(sender: u32, recipient: u32, xcm_fee: u128, transact_weight: Weight) - where - T: TestExt, - { - // do hrmp_init_open_channel - assert!(!has_open_channel_requested_event(sender, recipient)); // just a sanity check - T::execute_with(|| { - let message = construct_xcm( - hrmp::Call::::hrmp_init_open_channel { - recipient: recipient.into(), - proposed_max_capacity: 1000, - proposed_max_message_size: 102400, - }, - xcm_fee, - transact_weight, - ); - assert_ok!(pallet_xcm::Pallet::::send_xcm( - Here, Parent, message - )); - }); - assert!(has_open_channel_requested_event(sender, recipient)); - } - - fn accept_open_channel(sender: u32, recipient: u32, xcm_fee: u128, transact_weight: Weight) - where - T: TestExt, - { - // do hrmp_accept_open_channel - assert!(!has_open_channel_accepted_event(sender, recipient)); // just a sanity check - T::execute_with(|| { - let message = construct_xcm( - hrmp::Call::::hrmp_accept_open_channel { sender: sender.into() }, - xcm_fee, - transact_weight, - ); - assert_ok!(pallet_xcm::Pallet::::send_xcm( - Here, Parent, message - )); - }); - assert!(has_open_channel_accepted_event(sender, recipient)); - } - - #[test] - fn open_hrmp_channel_cheaply() { - // check that 0.25 DOT is enough - let xcm_fee = DOT.one() / 4; - let transact_weight = Weight::from_parts(10_000_000_000, 100_000_000); - let deposit = 2 * (10 * DOT.one() + xcm_fee) + polkadot_runtime::ExistentialDeposit::get(); - open_hrmp_channel(deposit, xcm_fee, transact_weight); - } - - #[test] - fn test_required_transact_weight() { - // actual minimum transact weight at time of writing is < 700_000_000. Use - // 800_000_000 so tests don't break every polkadot upgrade - let xcm_fee = DOT.one() / 5; - let transact_weight = Weight::from_parts(800_000_000, 50_000_000); - let deposit = 2 * (10 * DOT.one() + xcm_fee) + polkadot_runtime::ExistentialDeposit::get(); - open_hrmp_channel(deposit, xcm_fee, transact_weight); - } - - #[test] - fn open_hrmp_channel_with_buffer() { - // the actual values used in production: about twice the minimum amounts - let xcm_fee = DOT.one() / 2; - let transact_weight = Weight::from_parts(10_000_000_000, 100_000_000); - let deposit = 2 * (10 * DOT.one() + xcm_fee) + polkadot_runtime::ExistentialDeposit::get(); - open_hrmp_channel(deposit, xcm_fee, transact_weight); - } - - fn open_hrmp_channel(initial_balance: u128, xcm_fee: u128, transact_weight: Weight) { - let existential_deposit = DOT.one(); - - // setup sovereign account balances - PolkadotNet::execute_with(|| { - assert_ok!(polkadot_runtime::Balances::transfer( - polkadot_runtime::RuntimeOrigin::signed(ALICE.into()), - sp_runtime::MultiAddress::Id(interlay_sovereign_account_on_polkadot()), - initial_balance - )); - assert_ok!(polkadot_runtime::Balances::transfer( - polkadot_runtime::RuntimeOrigin::signed(ALICE.into()), - sp_runtime::MultiAddress::Id(sibling_sovereign_account_on_polkadot()), - initial_balance - )); - assert_ok!(polkadot_runtime::Balances::transfer( - polkadot_runtime::RuntimeOrigin::signed(ALICE.into()), - sp_runtime::MultiAddress::Id(BOB.into()), - existential_deposit - )); - }); - - // open channel interlay -> sibling - init_open_channel::(INTERLAY_PARA_ID, SIBLING_PARA_ID, xcm_fee, transact_weight); - accept_open_channel::(INTERLAY_PARA_ID, SIBLING_PARA_ID, xcm_fee, transact_weight); - - // open channel sibling -> interlay - init_open_channel::(SIBLING_PARA_ID, INTERLAY_PARA_ID, xcm_fee, transact_weight); - accept_open_channel::(SIBLING_PARA_ID, INTERLAY_PARA_ID, xcm_fee, transact_weight); - - // check that Bob received left-over funds (from both Interlay and Sibling). - PolkadotNet::execute_with(|| { - let free_balance = polkadot_runtime::Balances::free_balance(&AccountId::from(BOB)); - assert!(free_balance > existential_deposit); - }); - } -} - -#[test] -fn test_transact_barrier() { - let call = orml_tokens::Call::::transfer_all { - dest: ALICE.into(), - currency_id: Token(DOT), - keep_alive: false, - }; - let message = Xcm(vec![ - WithdrawAsset((Here, 410000000000u128).into()), - BuyExecution { - fees: (Here, 400000000000u128).into(), - weight_limit: Unlimited, - }, - Transact { - require_weight_at_most: Weight::from_parts(10000000000, 0u64), - origin_kind: OriginKind::Native, - call: interlay_runtime_parachain::RuntimeCall::Tokens(call).encode().into(), - }, - RefundSurplus, - DepositAsset { - assets: All.into(), - beneficiary: Junction::AccountId32 { id: BOB, network: None }.into(), - }, - ]); - - PolkadotNet::execute_with(|| { - assert_ok!(pallet_xcm::Pallet::::send_xcm( - Here, - X1(Parachain(2032)), - message - )); - }); - - Interlay::execute_with(|| { - assert!(System::events().iter().any(|r| matches!( - r.event, - RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward { - outcome: Outcome::Error(XcmError::Barrier), - .. - }) - ))); - }); -} - -#[test] -fn transfer_from_relay_chain() { - PolkadotNet::execute_with(|| { - assert_ok!(polkadot_runtime::XcmPallet::reserve_transfer_assets( - polkadot_runtime::RuntimeOrigin::signed(ALICE.into()), - Box::new(Parachain(INTERLAY_PARA_ID).into_versioned()), - Box::new(Junction::AccountId32 { id: BOB, network: None }.into_versioned()), - Box::new((Here, DOT.one()).into()), - 0 - )); - }); - - Interlay::execute_with(|| { - // use an upperbound rather than an exact value so this check doesn't break at each minor update - let xcm_fee_over_estimation = 20_000_000; - - assert!(Tokens::free_balance(Token(DOT), &AccountId::from(BOB)) > DOT.one() - xcm_fee_over_estimation); - // rest should go to treasury: - assert_eq!( - Tokens::free_balance(Token(DOT), &TreasuryAccount::get()), - DOT.one() - Tokens::free_balance(Token(DOT), &AccountId::from(BOB)) - ); - }); -} - -#[test] -fn transfer_to_relay_chain() { - PolkadotNet::execute_with(|| { - assert_ok!(polkadot_runtime::Balances::transfer( - polkadot_runtime::RuntimeOrigin::signed(ALICE.into()), - sp_runtime::MultiAddress::Id(interlay_sovereign_account_on_polkadot()), - 2 * DOT.one() - )); - }); - - let used_weight = FrameWeight::from_parts(4_000_000_000 as u64, 0u64); // The value used in UI - very conservative: actually used at time of writing = 298_368_000 - - Interlay::execute_with(|| { - assert_ok!(XTokens::transfer( - RuntimeOrigin::signed(ALICE.into()), - Token(DOT), - 2 * DOT.one(), - Box::new(MultiLocation::new(1, X1(Junction::AccountId32 { id: BOB, network: None })).into()), - WeightLimit::Unlimited - )); - }); - - PolkadotNet::execute_with(|| { - let fee = - ::WeightToFee::weight_to_fee(&used_weight); - assert_eq!( - polkadot_runtime::Balances::free_balance(&AccountId::from(BOB)), - 2 * DOT.one() - fee - ); - - // UI uses 482771107 - make sure that that's an overestimation - assert!(fee < 482771107); - }); -} - -/// Send INTR to sibling. On the sibling, it will be registered as a foreign asset. -/// By also transferring it back, we test that the asset-registry has been properly -/// integrated. -#[test] -fn transfer_to_sibling_and_back() { - fn sibling_sovereign_account() -> AccountId { - use sp_runtime::traits::AccountIdConversion; - polkadot_parachain::primitives::Sibling::from(SIBLING_PARA_ID).into_account_truncating() - } - - Sibling::execute_with(|| { - register_intr_as_foreign_asset(); - }); - - Interlay::execute_with(|| { - assert_ok!(Tokens::deposit( - Token(INTR), - &AccountId::from(ALICE), - 100_000_000_000_000 - )); - }); - - Interlay::execute_with(|| { - assert_ok!(XTokens::transfer( - RuntimeOrigin::signed(ALICE.into()), - Token(INTR), - 10_000_000_000_000, - Box::new( - MultiLocation::new( - 1, - X2( - Parachain(SIBLING_PARA_ID), - Junction::AccountId32 { - network: None, - id: BOB.into(), - } - ) - ) - .into() - ), - WeightLimit::Unlimited, - )); - - assert_eq!( - Tokens::free_balance(Token(INTR), &AccountId::from(ALICE)), - 90_000_000_000_000 - ); - - assert_eq!( - Tokens::free_balance(Token(INTR), &sibling_sovereign_account()), - 10_000_000_000_000 - ); - }); - - Sibling::execute_with(|| { - let xcm_fee = 800_000_000; - - // check reception - assert_eq!( - Tokens::free_balance(ForeignAsset(1), &AccountId::from(BOB)), - 10_000_000_000_000 - xcm_fee - ); - - // return some back to interlay - assert_ok!(XTokens::transfer( - RuntimeOrigin::signed(BOB.into()), - ForeignAsset(1), - 5_000_000_000_000, - Box::new( - MultiLocation::new( - 1, - X2( - Parachain(INTERLAY_PARA_ID), - Junction::AccountId32 { - network: None, - id: ALICE.into(), - } - ) - ) - .into() - ), - WeightLimit::Unlimited, - )); - }); - - // check reception - Interlay::execute_with(|| { - let used_weight = 800_000_000; // empirically determined in test - weight is decreased in AllowTopLevelPaidExecutionFrom - let intr_per_second = interlay_runtime_parachain::xcm_config::CanonicalizedIntrPerSecond::get().1; - let xcm_fee = (intr_per_second * used_weight) / WEIGHT_REF_TIME_PER_SECOND as u128; - - assert_eq!( - Tokens::free_balance(Token(INTR), &AccountId::from(ALICE)), - 95_000_000_000_000 - xcm_fee - ); - - assert_eq!(Tokens::free_balance(Token(INTR), &TreasuryAccount::get()), xcm_fee); - - assert_eq!( - Tokens::free_balance(Token(INTR), &sibling_sovereign_account()), - 5_000_000_000_000 - ); - }); -} - -#[test] -fn xcm_transfer_execution_barrier_trader_works() { - fn construct_xcm(amount: u128, limit: WeightLimit) -> Xcm { - Xcm(vec![ - ReserveAssetDeposited((Parent, amount).into()), - BuyExecution { - fees: (Parent, amount).into(), - weight_limit: limit, - }, - DepositAsset { - assets: All.into(), - beneficiary: Here.into(), - }, - ]) - } - - let expect_weight_limit = ::Weigher::weight( - &mut construct_xcm(100, Unlimited)).unwrap(); - let weight_limit_too_low = Weight::from_parts(500_000_000, 0u64); - let unit_instruction_weight = Weight::from_parts(200_000_000, 0u64); - let minimum_fee = (interlay_runtime_parachain::xcm_config::DotPerSecond::get().1 - * expect_weight_limit.ref_time() as u128) - / WEIGHT_REF_TIME_PER_SECOND as u128; - - // relay-chain use normal account to send xcm, destination parachain can't pass Barrier check - let message = construct_xcm(100, Unlimited); - PolkadotNet::execute_with(|| { - // Polkadot effectively disabled the `send` extrinsic in 0.9.19, so use send_xcm - assert_ok!(pallet_xcm::Pallet::::send_xcm( - X1(Junction::AccountId32 { - network: None, - id: ALICE.into(), - }), - Parachain(INTERLAY_PARA_ID), - message - )); - }); - Interlay::execute_with(|| { - assert!(System::events().iter().any(|r| matches!( - r.event, - RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward { - outcome: Outcome::Error(XcmError::Barrier), - .. - }) - ))); - }); - - // AllowTopLevelPaidExecutionFrom barrier test case: - // para-chain use XcmExecutor `execute_xcm()` method to execute xcm. - // if `weight_limit` in BuyExecution is less than `xcm_weight(max_weight)`, then Barrier can't pass. - // other situation when `weight_limit` is `Unlimited` or large than `xcm_weight`, then it's ok. - let message = construct_xcm(100, Limited(weight_limit_too_low)); - Interlay::execute_with(|| { - let hash = message.using_encoded(sp_io::hashing::blake2_256); - let r = XcmExecutor::::execute_xcm(Parent, message, hash, expect_weight_limit); - assert_eq!(r, Outcome::Error(XcmError::Barrier)); - }); - - // trader inside BuyExecution have TooExpensive error if payment less than calculated weight amount. - // the minimum of calculated weight amount(`FixedRateOfFungible`) is 96_000_000 - - let message = construct_xcm(minimum_fee - 1, Limited(expect_weight_limit)); - Interlay::execute_with(|| { - let hash = message.using_encoded(sp_io::hashing::blake2_256); - let r = XcmExecutor::::execute_xcm(Parent, message, hash, expect_weight_limit); - assert_eq!( - r, - Outcome::Incomplete(expect_weight_limit - unit_instruction_weight, XcmError::TooExpensive) - ); - }); - - // all situation fulfilled, execute success - let message = construct_xcm(minimum_fee, Limited(expect_weight_limit)); - Interlay::execute_with(|| { - let hash = message.using_encoded(sp_io::hashing::blake2_256); - let r = XcmExecutor::::execute_xcm(Parent, message, hash, expect_weight_limit); - assert_eq!(r, Outcome::Complete(expect_weight_limit)); - }); -} - -#[test] -fn subscribe_version_notify_works() { - // relay chain subscribe version notify of para chain - PolkadotNet::execute_with(|| { - let r = pallet_xcm::Pallet::::force_subscribe_version_notify( - polkadot_runtime::RuntimeOrigin::root(), - Box::new(Parachain(INTERLAY_PARA_ID).into_versioned()), - ); - assert_ok!(r); - }); - PolkadotNet::execute_with(|| { - polkadot_runtime::System::assert_has_event(polkadot_runtime::RuntimeEvent::XcmPallet( - pallet_xcm::Event::SupportedVersionChanged( - MultiLocation { - parents: 0, - interior: X1(Parachain(INTERLAY_PARA_ID)), - }, - 3, - ), - )); - }); - - // para chain subscribe version notify of relay chain - Interlay::execute_with(|| { - let r = pallet_xcm::Pallet::::force_subscribe_version_notify( - RuntimeOrigin::root(), - Box::new(Parent.into()), - ); - assert_ok!(r); - }); - Interlay::execute_with(|| { - System::assert_has_event(interlay_runtime_parachain::RuntimeEvent::PolkadotXcm( - pallet_xcm::Event::SupportedVersionChanged( - MultiLocation { - parents: 1, - interior: Here, - }, - 3, - ), - )); - }); - - // para chain subscribe version notify of sibling chain - Interlay::execute_with(|| { - let r = pallet_xcm::Pallet::::force_subscribe_version_notify( - RuntimeOrigin::root(), - Box::new((Parent, Parachain(SIBLING_PARA_ID)).into()), - ); - assert_ok!(r); - }); - Interlay::execute_with(|| { - assert!(interlay_runtime_parachain::System::events().iter().any(|r| matches!( - r.event, - interlay_runtime_parachain::RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { - message_hash: Some(_) - }) - ))); - }); - Sibling::execute_with(|| { - assert!(interlay_runtime_parachain::System::events().iter().any(|r| matches!( - r.event, - interlay_runtime_parachain::RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { - message_hash: Some(_) - }) | interlay_runtime_parachain::RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Success { - message_hash: Some(_), - weight: _ - }) - ))); - }); -} - -fn weigh_xcm(mut message: Xcm, fee_per_second: u128) -> u128 { - let trapped_xcm_message_weight = ::Weigher::weight( - &mut message).unwrap(); - (fee_per_second * trapped_xcm_message_weight.ref_time() as u128) / WEIGHT_REF_TIME_PER_SECOND as u128 -} - -fn general_key_of(token_symbol: TokenSymbol) -> Junction { - let id = Token(token_symbol); - let encoded = id.encode(); - let mut data = [0u8; 32]; - if encoded.len() > 32 { - // we are not returning result, so panic is inevitable. Let's make it explicit. - panic!("Currency ID was too long to be encoded"); - } - data[..encoded.len()].copy_from_slice(&encoded[..]); - GeneralKey { - length: encoded.len() as u8, - data, - } -} - -#[test] -fn trap_assets_works() { - let mut intr_treasury_amount = 0; - let (ksm_asset_amount, intr_asset_amount) = (10 * DOT.one(), 10 * INTR.one()); - - let parent_account: AccountId = ParentIsPreset::::convert(Parent.into()).unwrap(); - - Interlay::execute_with(|| { - assert_ok!(Tokens::deposit(Token(DOT), &parent_account, 100 * DOT.one())); - assert_ok!(Tokens::deposit(Token(INTR), &parent_account, 100 * INTR.one())); - - intr_treasury_amount = Tokens::free_balance(Token(INTR), &TreasuryAccount::get()); - }); - - let assets: MultiAsset = (Parent, ksm_asset_amount).into(); - - fn construct_xcm(assets: MultiAsset, intr_asset_amount: Balance) -> Xcm { - Xcm(vec![ - WithdrawAsset(assets.clone().into()), - BuyExecution { - fees: assets, - weight_limit: Limited(Weight::from_parts(DOT.one() as u64, 0u64)), - }, - WithdrawAsset( - ( - (Parent, X2(Parachain(INTERLAY_PARA_ID), general_key_of(INTR))), - intr_asset_amount, - ) - .into(), - ), - ]) - } - - let trapped_xcm_message_fee = weigh_xcm( - construct_xcm(assets.clone(), intr_asset_amount), - interlay_runtime_parachain::xcm_config::DotPerSecond::get().1, - ); - - // Withdraw intr and ksm on interlay but don't deposit it - PolkadotNet::execute_with(|| { - assert_ok!(pallet_xcm::Pallet::::send_xcm( - Here, - Parachain(INTERLAY_PARA_ID), - construct_xcm(assets.clone(), intr_asset_amount), - )); - }); - - let mut trapped_assets: Option = None; - // verify that the assets got trapped (i.e. didn't get burned) - Interlay::execute_with(|| { - assert!(System::events().iter().any(|r| matches!( - r.event, - RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped(_, _, _)) - ))); - - let event = System::events() - .iter() - .find(|r| { - matches!( - r.event, - RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped(_, _, _)) - ) - }) - .cloned() - .unwrap(); - - use std::convert::TryFrom; - use xcm::VersionedMultiAssets; - trapped_assets = match event.event { - RuntimeEvent::PolkadotXcm(pallet_xcm::Event::AssetsTrapped(_, _, ticket)) => { - Some(TryFrom::::try_from(ticket).unwrap()) - } - _ => panic!("event not found"), - }; - - // unchanged treasury amounts - assert_eq!( - trapped_xcm_message_fee, - Tokens::free_balance(Token(DOT), &TreasuryAccount::get()) - ); - assert_eq!( - intr_treasury_amount, - Tokens::free_balance(Token(INTR), &TreasuryAccount::get()) - ); - }); - - let trapped_intr_amount = trapped_assets - .clone() - .unwrap() - .into_inner() - .into_iter() - .find_map(|x| match x { - MultiAsset { - id: AssetId::Concrete(location), - fun: Fungibility::Fungible(amount), - } if location == (Parent, X2(Parachain(INTERLAY_PARA_ID), general_key_of(INTR))).into() => Some(amount), - _ => None, - }) - .unwrap(); - - let trapped_dot_amount = trapped_assets - .clone() - .unwrap() - .into_inner() - .into_iter() - .find_map(|x| match x { - MultiAsset { - id: AssetId::Concrete(location), - fun: Fungibility::Fungible(amount), - } if location == Parent.into() => Some(amount), - _ => None, - }) - .unwrap(); - - fn construct_reclaiming_xcm(trapped_assets: Option, intr_asset_amount: Balance) -> Xcm { - Xcm(vec![ - ClaimAsset { - assets: trapped_assets.unwrap(), - ticket: Here.into(), - }, - BuyExecution { - fees: ( - (Parent, X2(Parachain(INTERLAY_PARA_ID), general_key_of(INTR))), - intr_asset_amount / 4, - ) - .into(), - weight_limit: Limited(Weight::from_parts(4_000_000_000_000, 0u64)), - }, - DepositAsset { - assets: All.into(), - beneficiary: Junction::AccountId32 { id: BOB, network: None }.into(), - }, - ]) - } - - // Now reclaim trapped assets - PolkadotNet::execute_with(|| { - assert_ok!(pallet_xcm::Pallet::::send_xcm( - Here, - Parachain(INTERLAY_PARA_ID), - construct_reclaiming_xcm(trapped_assets.clone(), intr_asset_amount), - )); - }); - - // verify that assets were claimed successfully (deposited into Bob's account) - Interlay::execute_with(|| { - let reclaim_xcm_fee = weigh_xcm( - construct_reclaiming_xcm(trapped_assets, intr_asset_amount), - interlay_runtime_parachain::xcm_config::IntrPerSecond::get().1, - ); - assert_eq!( - Tokens::free_balance(Token(INTR), &AccountId::from(BOB)), - trapped_intr_amount - reclaim_xcm_fee - ); - assert!(trapped_dot_amount > 0); - assert_eq!( - Tokens::free_balance(Token(DOT), &AccountId::from(BOB)), - trapped_dot_amount - ); - }); -} - -fn register_intr_as_foreign_asset() { - let metadata = AssetMetadata { - decimals: 12, - name: "Interlay native".as_bytes().to_vec(), - symbol: "extINTR".as_bytes().to_vec(), - existential_deposit: 0, - location: Some(MultiLocation::new(1, X2(Parachain(INTERLAY_PARA_ID), general_key_of(INTR))).into()), - additional: CustomMetadata { - fee_per_second: 1_000_000_000_000, - coingecko_id: "interlay".as_bytes().to_vec(), - }, - }; - AssetRegistry::register_asset(RuntimeOrigin::root(), metadata, None).unwrap(); -} diff --git a/parachain/runtime/runtime-tests/src/relaychain/polkadot_test_net.rs b/parachain/runtime/runtime-tests/src/relaychain/polkadot_test_net.rs deleted file mode 100644 index 5dc47c6831..0000000000 --- a/parachain/runtime/runtime-tests/src/relaychain/polkadot_test_net.rs +++ /dev/null @@ -1,245 +0,0 @@ -use cumulus_primitives_core::MultiLocation; -use frame_support::traits::GenesisBuild; -pub use interlay_runtime_parachain::{xcm_config::*, *}; -use polkadot_primitives::v4::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE}; -use polkadot_runtime_parachains::{configuration::HostConfiguration, paras::ParaKind}; -pub use primitives::{ - CurrencyId::Token, - TokenSymbol::{DOT, INTR}, -}; -use sp_runtime::traits::AccountIdConversion; -use xcm_emulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain}; - -pub const INTERLAY_PARA_ID: u32 = 2032; -pub const SIBLING_PARA_ID: u32 = 2001; - -decl_test_relay_chain! { - pub struct PolkadotNet { - Runtime = polkadot_runtime::Runtime, - XcmConfig = polkadot_runtime::xcm_config::XcmConfig, - new_ext = polkadot_ext(), - } -} - -decl_test_parachain! { - pub struct Interlay { - Runtime = Runtime, - RuntimeOrigin = RuntimeOrigin, - XcmpMessageHandler = interlay_runtime_parachain::XcmpQueue, - DmpMessageHandler = interlay_runtime_parachain::DmpQueue, - new_ext = para_ext(INTERLAY_PARA_ID), - } -} - -decl_test_parachain! { - pub struct Sibling { - Runtime = interlay_runtime_parachain::Runtime, - RuntimeOrigin = interlay_runtime_parachain::RuntimeOrigin, - XcmpMessageHandler = interlay_runtime_parachain::XcmpQueue, - DmpMessageHandler = interlay_runtime_parachain::DmpQueue, - new_ext = para_ext(SIBLING_PARA_ID), - } -} - -// note: can't use SIBLING_PARA_ID and INTERLAY_PARA_ID in this macro - we are forced to use raw numbers -decl_test_network! { - pub struct TestNet { - relay_chain = PolkadotNet, - parachains = vec![ - (2032, Interlay), - (2001, Sibling), - ], - } -} - -fn default_parachains_host_configuration() -> HostConfiguration { - HostConfiguration { - max_code_size: MAX_CODE_SIZE, - max_pov_size: MAX_POV_SIZE, - max_head_data_size: 20_480, - max_upward_queue_count: 10, - max_upward_queue_size: 51_200, - max_upward_message_size: 51_200, - max_upward_message_num_per_candidate: 10, - hrmp_max_message_num_per_candidate: 10, - validation_upgrade_cooldown: 14_400, - validation_upgrade_delay: 600, - max_downward_message_size: 51_200, - ump_service_total_weight: Weight::from_parts(100_000_000_000 as u64, 0u64), - hrmp_max_parachain_outbound_channels: 10, - hrmp_max_parathread_outbound_channels: 0, - hrmp_sender_deposit: 100_000_000_000, - hrmp_recipient_deposit: 100_000_000_000, - hrmp_channel_max_capacity: 1_000, - hrmp_channel_max_total_size: 102_400, - hrmp_max_parachain_inbound_channels: 10, - hrmp_max_parathread_inbound_channels: 0, - hrmp_channel_max_message_size: 102_400, - code_retention_period: 14_400, - parathread_cores: 0, - parathread_retries: 0, - group_rotation_frequency: 10, - chain_availability_period: 10, - thread_availability_period: 10, - scheduling_lookahead: 1, - max_validators_per_core: Some(5), - max_validators: Some(200), - dispute_period: 6, - dispute_post_conclusion_acceptance_period: 600, - no_show_slots: 2, - n_delay_tranches: 89, - zeroth_delay_tranche_width: 0, - needed_approvals: 30, - relay_vrf_modulo_samples: 40, - ump_max_individual_weight: Weight::from_parts(20_000_000_000 as u64, 0u64), - pvf_checking_enabled: false, - pvf_voting_ttl: 2, - minimum_validation_upgrade_delay: 20, - ..Default::default() - } -} - -pub fn polkadot_ext() -> sp_io::TestExternalities { - use polkadot_parachain::primitives::{HeadData, ValidationCode}; - use polkadot_runtime::{Runtime, System}; - - let mut t = frame_system::GenesisConfig::default() - .build_storage::() - .unwrap(); - - pallet_balances::GenesisConfig:: { - balances: vec![(AccountId::from(ALICE), 100_000_000 * DOT.one())], - } - .assimilate_storage(&mut t) - .unwrap(); - - // register a parachain so that we can test opening hrmp channel - let fake_para = polkadot_runtime_parachains::paras::ParaGenesisArgs { - genesis_head: HeadData(vec![]), - para_kind: ParaKind::Parachain, - validation_code: ValidationCode(vec![0]), - }; - >::assimilate_storage( - &polkadot_runtime_parachains::paras::GenesisConfig { - paras: vec![ - (INTERLAY_PARA_ID.into(), fake_para.clone()), - (SIBLING_PARA_ID.into(), fake_para.clone()), - ], - }, - &mut t, - ) - .unwrap(); - - polkadot_runtime_parachains::configuration::GenesisConfig:: { - config: default_parachains_host_configuration(), - } - .assimilate_storage(&mut t) - .unwrap(); - - >::assimilate_storage( - &pallet_xcm::GenesisConfig { - safe_xcm_version: Some(3), - }, - &mut t, - ) - .unwrap(); - - let mut ext = sp_io::TestExternalities::new(t); - ext.execute_with(|| System::set_block_number(1)); - ext -} - -pub fn para_ext(parachain_id: u32) -> sp_io::TestExternalities { - ExtBuilder::default() - .balances(vec![(AccountId::from(ALICE), Token(DOT), 10 * DOT.one())]) - .parachain_id(parachain_id) - .build() -} - -#[allow(dead_code)] -pub const DEFAULT: [u8; 32] = [0u8; 32]; -#[allow(dead_code)] -pub const ALICE: [u8; 32] = [4u8; 32]; -#[allow(dead_code)] -pub const BOB: [u8; 32] = [5u8; 32]; - -pub struct ExtBuilder { - balances: Vec<(AccountId, CurrencyId, Balance)>, - parachain_id: u32, -} - -impl Default for ExtBuilder { - fn default() -> Self { - Self { - balances: vec![], - parachain_id: 2000, - } - } -} - -impl ExtBuilder { - pub fn balances(mut self, balances: Vec<(AccountId, CurrencyId, Balance)>) -> Self { - self.balances = balances; - self - } - - #[allow(dead_code)] - pub fn parachain_id(mut self, parachain_id: u32) -> Self { - self.parachain_id = parachain_id; - self - } - - pub fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() - .unwrap(); - - let native_currency_id = GetNativeCurrencyId::get(); - - orml_tokens::GenesisConfig:: { - balances: self - .balances - .into_iter() - .filter(|(_, currency_id, _)| *currency_id != native_currency_id) - .collect::>(), - } - .assimilate_storage(&mut t) - .unwrap(); - - >::assimilate_storage( - ¶chain_info::GenesisConfig { - parachain_id: self.parachain_id.into(), - }, - &mut t, - ) - .unwrap(); - - >::assimilate_storage( - &pallet_xcm::GenesisConfig { - safe_xcm_version: Some(2), - }, - &mut t, - ) - .unwrap(); - - let mut ext = sp_io::TestExternalities::new(t); - ext.execute_with(|| { - System::set_block_number(1); - PolkadotXcm::force_xcm_version( - interlay_runtime_parachain::RuntimeOrigin::root(), - Box::new(MultiLocation::parent()), - 3, - ) - .unwrap(); - }); - ext - } -} - -pub(crate) fn interlay_sovereign_account_on_polkadot() -> AccountId { - polkadot_parachain::primitives::Id::from(INTERLAY_PARA_ID).into_account_truncating() -} - -pub(crate) fn sibling_sovereign_account_on_polkadot() -> AccountId { - polkadot_parachain::primitives::Id::from(SIBLING_PARA_ID).into_account_truncating() -} diff --git a/parachain/runtime/runtime-tests/src/setup.rs b/parachain/runtime/runtime-tests/src/setup.rs index 018643e590..aecb9308bd 100644 --- a/parachain/runtime/runtime-tests/src/setup.rs +++ b/parachain/runtime/runtime-tests/src/setup.rs @@ -1,7 +1,6 @@ pub use crate::utils::*; use bitcoin::merkle::PartialTransactionProof; pub use codec::Encode; -use frame_support::traits::GenesisBuild; pub use frame_support::{assert_noop, assert_ok, traits::Currency, BoundedVec}; pub use frame_system::RawOrigin; pub use orml_traits::{location::RelativeLocations, Change, GetByKey, MultiCurrency}; @@ -12,7 +11,6 @@ pub use sp_runtime::{ AccountId32, DispatchError, DispatchResult, FixedPointNumber, MultiAddress, Perbill, Permill, }; pub use xcm::latest::prelude::*; -pub use xcm_emulator::XcmExecutor; #[cfg(not(feature = "with-interlay-runtime"))] pub use kintsugi_imports::*; @@ -63,8 +61,8 @@ pub struct ExtBuilder { impl ExtBuilder { pub fn build() -> Self { - let mut storage = frame_system::GenesisConfig::default() - .build_storage::() + let mut storage = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); let balances = vec![ @@ -180,6 +178,14 @@ impl ExtBuilder { .assimilate_storage(&mut storage) .unwrap(); + loans::GenesisConfig:: { + max_exchange_rate: Rate::from_inner(DEFAULT_MAX_EXCHANGE_RATE), + min_exchange_rate: Rate::from_inner(DEFAULT_MIN_EXCHANGE_RATE), + _marker: Default::default(), + } + .assimilate_storage(&mut storage) + .unwrap(); + supply::GenesisConfig:: { initial_supply: token_distribution::INITIAL_ALLOCATION, start_height: YEARS * 5, @@ -187,22 +193,11 @@ impl ExtBuilder { } .assimilate_storage(&mut storage) .unwrap(); - - GenesisBuild::::assimilate_storage( - &loans::GenesisConfig { - max_exchange_rate: Rate::from_inner(DEFAULT_MAX_EXCHANGE_RATE), - min_exchange_rate: Rate::from_inner(DEFAULT_MIN_EXCHANGE_RATE), - }, - &mut storage, - ) - .unwrap(); - - >::assimilate_storage( - &pallet_xcm::GenesisConfig { - safe_xcm_version: Some(2), - }, - &mut storage, - ) + pallet_xcm::GenesisConfig:: { + safe_xcm_version: Some(2), + _config: Default::default(), + } + .assimilate_storage(&mut storage) .unwrap(); Self { diff --git a/parachain/src/chain_spec/interlay.rs b/parachain/src/chain_spec/interlay.rs index 827bf39191..88dda47848 100644 --- a/parachain/src/chain_spec/interlay.rs +++ b/parachain/src/chain_spec/interlay.rs @@ -3,7 +3,7 @@ use super::*; pub const PARA_ID: u32 = 2032; /// Specialized `ChainSpec` for the interlay parachain runtime. -pub type InterlayChainSpec = sc_service::GenericChainSpec; +pub type InterlayChainSpec = sc_service::GenericChainSpec; /// Specialized `ChainSpec` for interlay development. pub type InterlayDevChainSpec = sc_service::GenericChainSpec; @@ -12,7 +12,7 @@ pub type InterlayDevChainSpec = sc_service::GenericChainSpec interlay_runtime::GenesisConfig { +) -> interlay_runtime::RuntimeGenesisConfig { let chain_id: u32 = id.into(); endowed_accounts.extend( endowed_evm_accounts .into_iter() .map(|addr| interlay_runtime::evm::AccountConverter::into_account_id(H160::from(addr))), ); - interlay_runtime::GenesisConfig { + interlay_runtime::RuntimeGenesisConfig { system: interlay_runtime::SystemConfig { + _config: Default::default(), code: interlay_runtime::WASM_BINARY .expect("WASM binary was not build, please build it!") .to_vec(), }, parachain_system: Default::default(), - parachain_info: interlay_runtime::ParachainInfoConfig { parachain_id: id }, + parachain_info: interlay_runtime::ParachainInfoConfig { + _config: Default::default(), + parachain_id: id, + }, collator_selection: interlay_runtime::CollatorSelectionConfig { invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(), candidacy_bond: Zero::zero(), @@ -262,6 +266,7 @@ pub fn interlay_genesis( replace_griefing_collateral: FixedU128::checked_from_rational(1, 10).unwrap(), // 10% }, nomination: interlay_runtime::NominationConfig { + _marker: Default::default(), is_nomination_enabled: false, }, technical_committee: Default::default(), @@ -274,16 +279,19 @@ pub fn interlay_genesis( inflation: FixedU128::checked_from_rational(2, 100).unwrap(), // 2% }, polkadot_xcm: interlay_runtime::PolkadotXcmConfig { + _config: Default::default(), safe_xcm_version: Some(3), }, sudo: interlay_runtime::SudoConfig { key: root_key }, loans: interlay_runtime::LoansConfig { + _marker: Default::default(), max_exchange_rate: Rate::from_inner(loans::DEFAULT_MAX_EXCHANGE_RATE), min_exchange_rate: Rate::from_inner(loans::DEFAULT_MIN_EXCHANGE_RATE), }, base_fee: Default::default(), ethereum: Default::default(), - evm: kintsugi_runtime::EVMConfig { + evm: interlay_runtime::EVMConfig { + _marker: Default::default(), // we need _some_ code inserted at the precompile address so that // the evm will actually call the address. accounts: interlay_runtime::evm::Precompiles::used_addresses() @@ -301,7 +309,8 @@ pub fn interlay_genesis( }) .collect(), }, - evm_chain_id: kintsugi_runtime::EVMChainIdConfig { + evm_chain_id: interlay_runtime::EVMChainIdConfig { + _marker: Default::default(), chain_id: chain_id.into(), }, } diff --git a/parachain/src/chain_spec/kintsugi.rs b/parachain/src/chain_spec/kintsugi.rs index a77c2ee6ab..9c467e5e15 100644 --- a/parachain/src/chain_spec/kintsugi.rs +++ b/parachain/src/chain_spec/kintsugi.rs @@ -3,7 +3,7 @@ use super::*; pub const PARA_ID: u32 = 2092; /// Specialized `ChainSpec` for the kintsugi parachain runtime. -pub type KintsugiChainSpec = sc_service::GenericChainSpec; +pub type KintsugiChainSpec = sc_service::GenericChainSpec; /// Specialized `ChainSpec` for kintsugi development. pub type KintsugiDevChainSpec = sc_service::GenericChainSpec; @@ -12,11 +12,13 @@ pub type KintsugiDevChainSpec = sc_service::GenericChainSpec KintsugiDevChainSpec { ), enable_instant_seal, enable_create: true, + enable_contracts: true, }, Vec::new(), None, @@ -169,21 +173,25 @@ pub fn kintsugi_genesis( id: ParaId, bitcoin_confirmations: u32, disable_difficulty_check: bool, -) -> kintsugi_runtime::GenesisConfig { +) -> kintsugi_runtime::RuntimeGenesisConfig { let chain_id: u32 = id.into(); endowed_accounts.extend( endowed_evm_accounts .into_iter() .map(|addr| kintsugi_runtime::evm::AccountConverter::into_account_id(H160::from(addr))), ); - kintsugi_runtime::GenesisConfig { + kintsugi_runtime::RuntimeGenesisConfig { system: kintsugi_runtime::SystemConfig { + _config: Default::default(), code: kintsugi_runtime::WASM_BINARY .expect("WASM binary was not build, please build it!") .to_vec(), }, parachain_system: Default::default(), - parachain_info: kintsugi_runtime::ParachainInfoConfig { parachain_id: id }, + parachain_info: kintsugi_runtime::ParachainInfoConfig { + _config: Default::default(), + parachain_id: id, + }, collator_selection: kintsugi_runtime::CollatorSelectionConfig { invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(), candidacy_bond: Zero::zero(), @@ -290,6 +298,7 @@ pub fn kintsugi_genesis( replace_griefing_collateral: FixedU128::checked_from_rational(1, 10).unwrap(), // 10% }, nomination: kintsugi_runtime::NominationConfig { + _marker: Default::default(), is_nomination_enabled: false, }, technical_committee: Default::default(), @@ -302,16 +311,19 @@ pub fn kintsugi_genesis( inflation: FixedU128::checked_from_rational(2, 100).unwrap(), // 2% }, polkadot_xcm: kintsugi_runtime::PolkadotXcmConfig { + _config: Default::default(), safe_xcm_version: Some(3), }, sudo: kintsugi_runtime::SudoConfig { key: root_key }, loans: kintsugi_runtime::LoansConfig { + _marker: Default::default(), max_exchange_rate: Rate::from_inner(loans::DEFAULT_MAX_EXCHANGE_RATE), min_exchange_rate: Rate::from_inner(loans::DEFAULT_MIN_EXCHANGE_RATE), }, base_fee: Default::default(), ethereum: Default::default(), evm: kintsugi_runtime::EVMConfig { + _marker: Default::default(), // we need _some_ code inserted at the precompile address so that // the evm will actually call the address. accounts: kintsugi_runtime::evm::Precompiles::used_addresses() @@ -330,6 +342,7 @@ pub fn kintsugi_genesis( .collect(), }, evm_chain_id: kintsugi_runtime::EVMChainIdConfig { + _marker: Default::default(), chain_id: chain_id.into(), }, } diff --git a/parachain/src/chain_spec/testnet_kintsugi.rs b/parachain/src/chain_spec/testnet_kintsugi.rs index 7ec7628e1a..a3ef51ea94 100644 --- a/parachain/src/chain_spec/testnet_kintsugi.rs +++ b/parachain/src/chain_spec/testnet_kintsugi.rs @@ -105,6 +105,7 @@ pub fn development_config(id: ParaId, enable_instant_seal: bool) -> KintsugiDevC ), enable_instant_seal, enable_create: true, + enable_contracts: true, }, Vec::new(), None, diff --git a/parachain/src/cli.rs b/parachain/src/cli.rs index f6aaad6011..58c5ab078e 100644 --- a/parachain/src/cli.rs +++ b/parachain/src/cli.rs @@ -122,11 +122,11 @@ impl RelayChainCli { ) -> Self { let extension = chain_spec::Extensions::try_get(&*para_config.chain_spec); let chain_id = extension.map(|e| e.relay_chain.clone()); - let base_path = para_config.base_path.as_ref().map(|x| x.path().join("polkadot")); + let base_path = para_config.base_path.path().join("polkadot"); Self { - base_path, + base_path: Some(base_path), chain_id, - base: polkadot_cli::RunCmd::parse_from(relay_chain_args), + base: clap::Parser::parse_from(relay_chain_args), } } } diff --git a/parachain/src/command.rs b/parachain/src/command.rs index e3aa51ec4e..f65cc7e8c3 100644 --- a/parachain/src/command.rs +++ b/parachain/src/command.rs @@ -25,15 +25,16 @@ use log::info; use primitives::Block; use sc_cli::{ ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams, Result, - RuntimeVersion, SharedParams, SubstrateCli, + SharedParams, SubstrateCli, }; +use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch}; use sc_service::{ config::{BasePath, PrometheusConfig}, Configuration, TaskManager, }; use sp_core::hexdisplay::HexDisplay; use sp_runtime::traits::AccountIdConversion; -use std::{io::Write, net::SocketAddr, path::PathBuf}; +use std::{io::Write, path::PathBuf}; #[cfg(feature = "runtime-benchmarks")] use crate::benchmarking::*; @@ -156,16 +157,6 @@ impl SubstrateCli for Cli { fn load_spec(&self, id: &str) -> std::result::Result, String> { load_spec(id, self.instant_seal) } - - fn native_runtime_version(chain_spec: &Box) -> &'static RuntimeVersion { - if chain_spec.is_interlay() { - &interlay_runtime::VERSION - } else if chain_spec.is_kintsugi() { - &kintsugi_runtime::VERSION - } else { - panic!("Chain should be either kintsugi or interlay"); - } - } } impl SubstrateCli for RelayChainCli { @@ -202,10 +193,6 @@ impl SubstrateCli for RelayChainCli { fn load_spec(&self, id: &str) -> std::result::Result, String> { polkadot_cli::Cli::from_iter([RelayChainCli::executable_name().to_string()].iter()).load_spec(id) } - - fn native_runtime_version(chain_spec: &Box) -> &'static RuntimeVersion { - polkadot_cli::Cli::native_runtime_version(chain_spec) - } } fn write_to_file_or_stdout(raw: bool, output: &Option, raw_bytes: Vec) -> Result<()> { @@ -319,9 +306,19 @@ pub fn run() -> Result<()> { BenchmarkCmd::Pallet(cmd) => { if cfg!(feature = "runtime-benchmarks") { if runner.config().chain_spec.is_interlay() { - runner.sync_run(|config| cmd.run::(config)) + runner.sync_run(|config| { + cmd.run::::ExtendHostFunctions, + >>(config) + }) } else if runner.config().chain_spec.is_kintsugi() { - runner.sync_run(|config| cmd.run::(config)) + runner.sync_run(|config| { + cmd.run::::ExtendHostFunctions, + >>(config) + }) } else { Err("Chain doesn't support benchmarking".into()) } @@ -406,10 +403,9 @@ pub fn run() -> Result<()> { let chain_spec = &runner.config().chain_spec; with_runtime_or_err!(chain_spec, { - return runner.sync_run(|_config| { - let spec = cli.load_spec(&cmd.shared_params.chain.clone().unwrap_or_default())?; - let state_version = Cli::native_runtime_version(&spec).state_version(); - cmd.run::(&*spec, state_version) + return runner.sync_run(|config| { + let partials = new_partial::(&config, &cli.eth, false)?; + cmd.run::(&*config.chain_spec, &*partials.client) }); }) } @@ -437,7 +433,6 @@ pub fn run() -> Result<()> { } #[cfg(feature = "try-runtime")] Some(Subcommand::TryRuntime(cmd)) => { - use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch}; use try_runtime_cli::block_building_info::timestamp_with_aura_info; let runner = cli.create_runner(cmd)?; let chain_spec = &runner.config().chain_spec; @@ -504,7 +499,7 @@ async fn start_node(cli: Cli, config: Configuration) -> sc_service::error::Resul let id = ParaId::from(para_id.unwrap_or(DEFAULT_PARA_ID)); - let parachain_account = AccountIdConversion::::into_account_truncating(&id); + let parachain_account = AccountIdConversion::::into_account_truncating(&id); let tokio_handle = config.tokio_handle.clone(); let polkadot_config = SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, tokio_handle) @@ -540,14 +535,6 @@ impl DefaultConfigurationValues for RelayChainCli { 30334 } - fn rpc_ws_listen_port() -> u16 { - 9945 - } - - fn rpc_http_listen_port() -> u16 { - 9934 - } - fn prometheus_listen_port() -> u16 { 9616 } @@ -577,18 +564,6 @@ impl CliConfiguration for RelayChainCli { .or_else(|| self.base_path.clone().map(Into::into))) } - fn rpc_http(&self, default_listen_port: u16) -> Result> { - self.base.base.rpc_http(default_listen_port) - } - - fn rpc_ipc(&self) -> Result> { - self.base.base.rpc_ipc() - } - - fn rpc_ws(&self, default_listen_port: u16) -> Result> { - self.base.base.rpc_ws(default_listen_port) - } - fn prometheus_config( &self, default_listen_port: u16, @@ -632,10 +607,6 @@ impl CliConfiguration for RelayChainCli { self.base.base.rpc_methods() } - fn rpc_ws_max_connections(&self) -> Result> { - self.base.base.rpc_ws_max_connections() - } - fn rpc_cors(&self, is_dev: bool) -> Result>> { self.base.base.rpc_cors(is_dev) } diff --git a/parachain/src/eth.rs b/parachain/src/eth.rs index 6bf4ab9d4e..27d6f4081c 100644 --- a/parachain/src/eth.rs +++ b/parachain/src/eth.rs @@ -1,5 +1,4 @@ use crate::service::{FullBackend, FullClient}; -use cumulus_client_consensus_common::ParachainBlockImportMarker; pub use fc_consensus::FrontierBlockImport; use fc_rpc::{EthTask, OverrideHandle}; pub use fc_rpc_core::types::{FeeHistoryCache, FeeHistoryCacheLimit, FilterPool}; @@ -7,14 +6,11 @@ use fp_rpc::EthereumRuntimeRPCApi; use futures::{future, prelude::*}; use primitives::Block; use sc_client_api::{BlockchainEvents, StateBackendFor}; -use sc_consensus::{BlockCheckParams, BlockImport as BlockImportT, BlockImportParams, ImportResult}; use sc_executor::NativeExecutionDispatch; use sc_network_sync::SyncingService; -use sc_service::{error::Error as ServiceError, BasePath, Configuration, TaskManager}; +use sc_service::{error::Error as ServiceError, Configuration, TaskManager}; use sc_transaction_pool::{ChainApi, Pool}; use sp_api::{ConstructRuntimeApi, ProvideRuntimeApi}; -use sp_block_builder::BlockBuilder as BlockBuilderApi; -use sp_consensus::Error as ConsensusError; use sp_runtime::traits::{BlakeTwo256, Block as BlockT}; use std::{ collections::BTreeMap, @@ -27,12 +23,7 @@ use std::{ pub type FrontierBackend = fc_db::Backend; pub fn db_config_dir(config: &Configuration) -> PathBuf { - let application = &config.impl_name; - config - .base_path - .as_ref() - .map(|base_path| base_path.config_dir(config.chain_spec.id())) - .unwrap_or_else(|| BasePath::from_project("", "", application).config_dir(config.chain_spec.id())) + config.base_path.config_dir(config.chain_spec.id()) } pub fn open_frontier_backend( @@ -200,7 +191,7 @@ pub async fn spawn_frontier_tasks( overrides.clone(), Arc::new(b), 3, - 0, + 0, // TODO: update when deployed fc_mapping_sync::SyncStrategy::Normal, sync, pubsub_notification_sinks, @@ -248,48 +239,6 @@ pub async fn spawn_frontier_tasks( ); } -#[derive(Clone)] -pub struct BlockImport, C>(FrontierBlockImport); - -impl BlockImport -where - B: BlockT, - I: BlockImportT>, - I::Error: Into, - C: ProvideRuntimeApi, - C::Api: BlockBuilderApi + EthereumRuntimeRPCApi, -{ - pub fn new(inner: I, client: Arc) -> Self { - Self(FrontierBlockImport::new(inner, client)) - } -} - -#[async_trait::async_trait] -impl BlockImportT for BlockImport -where - B: BlockT, - I: BlockImportT> + Send + Sync, - I::Error: Into, - C: ProvideRuntimeApi + Send + Sync, - C::Api: BlockBuilderApi + EthereumRuntimeRPCApi, -{ - type Error = ConsensusError; - type Transaction = sp_api::TransactionFor; - - async fn check_block(&mut self, block: BlockCheckParams) -> Result { - self.0.check_block(block).await - } - - async fn import_block( - &mut self, - block: BlockImportParams, - ) -> Result { - self.0.import_block(block).await - } -} - -impl, C> ParachainBlockImportMarker for BlockImport {} - pub fn new_eth_deps( client: Arc, transaction_pool: Arc

, diff --git a/parachain/src/service.rs b/parachain/src/service.rs index 76719ed7de..13eb51c1ca 100644 --- a/parachain/src/service.rs +++ b/parachain/src/service.rs @@ -1,7 +1,7 @@ use cumulus_client_cli::CollatorOptions; use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; use cumulus_client_consensus_common::{ParachainBlockImport as TParachainBlockImport, ParachainConsensus}; -use cumulus_client_network::BlockAnnounceValidator; +use cumulus_client_network::RequireSecondedInBlockAnnounce; use cumulus_client_service::{ prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, }; @@ -13,13 +13,14 @@ use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node; use futures::StreamExt; use polkadot_service::CollatorPair; use primitives::*; -use sc_client_api::{HeaderBackend, StateBackendFor}; +use sc_client_api::{Backend, HeaderBackend, StateBackendFor}; use sc_consensus::{ImportQueue, LongestChain}; -use sc_executor::NativeElseWasmExecutor; +use sc_executor::{HeapAllocStrategy, NativeElseWasmExecutor, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY}; use sc_network::NetworkBlock; use sc_network_sync::SyncingService; use sc_service::{Configuration, PartialComponents, RpcHandlers, TFullBackend, TFullClient, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; +use sc_transaction_pool_api::OffchainTransactionPoolFactory; use sp_api::ConstructRuntimeApi; use sp_consensus_aura::{ sr25519::{AuthorityId as AuraId, AuthorityPair as AuraPair}, @@ -33,8 +34,8 @@ use substrate_prometheus_endpoint::Registry; // Frontier imports use crate::eth::{ - new_eth_deps, new_frontier_partial, open_frontier_backend, spawn_frontier_tasks, BlockImport as EthBlockImport, - EthCompatRuntimeApiCollection, EthConfiguration, FrontierBackend, FrontierPartialComponents, + new_eth_deps, new_frontier_partial, open_frontier_backend, spawn_frontier_tasks, EthCompatRuntimeApiCollection, + EthConfiguration, FrontierBackend, FrontierPartialComponents, }; macro_rules! new_runtime_executor { @@ -189,6 +190,12 @@ type MaybeFullSelectChain = Option>; type ParachainBlockImport = TParachainBlockImport>, FullBackend>; +// 0x9af9a64e6e4da8e3073901c3ff0cc4c3aad9563786d89daf6ad820b6e14a0b8b +const KINTSUGI_GENESIS_HASH: H256 = H256([ + 154, 249, 166, 78, 110, 77, 168, 227, 7, 57, 1, 195, 255, 12, 196, 195, 170, 217, 86, 55, 134, 216, 157, 175, 106, + 216, 32, 182, 225, 74, 11, 139, +]); + fn import_slot_duration(client: &C) -> SlotDuration where C: sc_client_api::backend::AuxStore @@ -197,18 +204,19 @@ where + sp_api::CallApiAt, C::Api: sp_consensus_aura::AuraApi, { - match client.runtime_version_at(client.usage_info().chain.best_hash) { - Ok(x) if x.spec_name.starts_with("kintsugi") && client.usage_info().chain.best_number < 1983993 => { - // the kintsugi runtime was misconfigured at genesis to use a slot duration of 6s - // which stalled collators when we upgraded to polkadot-v0.9.16 and subsequently - // broke mainnet when we introduced the aura timestamp hook, collators should only - // switch when syncing after the (failed) 1.20.0 upgrade - SlotDuration::from_millis(6000) - } + if client.usage_info().chain.genesis_hash == KINTSUGI_GENESIS_HASH + && client.usage_info().chain.best_number < 1983993 + { + // the kintsugi runtime was misconfigured at genesis to use a slot duration of 6s + // which stalled collators when we upgraded to polkadot-v0.9.16 and subsequently + // broke mainnet when we introduced the aura timestamp hook, collators should only + // switch when syncing after the (failed) 1.20.0 upgrade + SlotDuration::from_millis(6000) + } else { // this is pallet_timestamp::MinimumPeriod * 2 at the current height // on kintsugi we increased MinimumPeriod from 3_000 to 6_000 at 16_593 // but the interlay runtime has always used 6_000 - _ => sc_consensus_aura::slot_duration(&*client).unwrap(), + sc_consensus_aura::slot_duration(&*client).unwrap() } } @@ -228,6 +236,7 @@ pub fn new_partial( sc_consensus::DefaultImportQueue>, sc_transaction_pool::FullPool>, ( + ParachainBlockImport, Option, Option, FrontierBackend, @@ -254,11 +263,20 @@ where }) .transpose()?; - let executor = NativeElseWasmExecutor::::new( - config.wasm_method, - config.default_heap_pages, - config.max_runtime_instances, - config.runtime_cache_size, + let heap_pages = config + .default_heap_pages + .map_or(DEFAULT_HEAP_ALLOC_STRATEGY, |h| HeapAllocStrategy::Static { + extra_pages: h as _, + }); + + let executor = NativeElseWasmExecutor::::new_with_wasm_executor( + WasmExecutor::builder() + .with_execution_method(config.wasm_method) + .with_onchain_heap_alloc_strategy(heap_pages) + .with_offchain_heap_alloc_strategy(heap_pages) + .with_max_runtime_instances(config.max_runtime_instances) + .with_runtime_cache_size(config.runtime_cache_size) + .build(), ); let (client, backend, keystore_container, task_manager) = sc_service::new_full_parts::( @@ -293,11 +311,12 @@ where let overrides = interbtc_rpc::overrides_handle(client.clone()); let frontier_backend = open_frontier_backend(client.clone(), config, eth_config, overrides.clone())?; + let parachain_block_import = ParachainBlockImport::new(client.clone(), backend.clone()); let import_queue = if instant_seal { // instant sealing sc_consensus_manual_seal::import_queue( - Box::new(EthBlockImport::new(client.clone(), client.clone())), + Box::new(client.clone()), &task_manager.spawn_essential_handle(), registry, ) @@ -306,10 +325,7 @@ where cumulus_client_consensus_aura::import_queue::( cumulus_client_consensus_aura::ImportQueueParams { - block_import: EthBlockImport::new( - ParachainBlockImport::new(client.clone(), backend.clone()), - client.clone(), - ), + block_import: parachain_block_import.clone(), client: client.clone(), create_inherent_data_providers: move |_parent: sp_core::H256, _| async move { let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); @@ -336,7 +352,13 @@ where task_manager, transaction_pool, select_chain, - other: (telemetry, telemetry_worker_handle, frontier_backend, overrides), + other: ( + parachain_block_import, + telemetry, + telemetry_worker_handle, + frontier_backend, + overrides, + ), }; Ok(params) @@ -382,7 +404,7 @@ where CT: fp_rpc::ConvertTransaction<::Extrinsic> + Clone + Default + Send + Sync + 'static, BIC: FnOnce( Arc>, - EthBlockImport, FullClient>, + ParachainBlockImport, Option<&Registry>, Option, &TaskManager, @@ -396,7 +418,8 @@ where let mut parachain_config = prepare_node_config(parachain_config); let params = new_partial(¶chain_config, ð_config, false)?; - let (mut telemetry, telemetry_worker_handle, frontier_backend, overrides) = params.other; + let (parachain_block_import, mut telemetry, telemetry_worker_handle, frontier_backend, overrides) = params.other; + let net_config = sc_network::config::FullNetworkConfiguration::new(¶chain_config.network); let client = params.client.clone(); let backend = params.backend.clone(); @@ -412,7 +435,7 @@ where .await .map_err(|e| sc_service::Error::Application(Box::new(e) as Box<_>))?; - let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), id); + let block_announce_validator = RequireSecondedInBlockAnnounce::new(relay_chain_interface.clone(), id); let force_authoring = parachain_config.force_authoring; let validator = parachain_config.role.is_authority(); @@ -422,6 +445,7 @@ where let (network, system_rpc_tx, tx_handler_controller, start_network, sync_service) = sc_service::build_network(sc_service::BuildNetworkParams { config: ¶chain_config, + net_config, client: client.clone(), transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), @@ -477,11 +501,23 @@ where }; if parachain_config.offchain_worker.enabled { - sc_service::build_offchain_workers( - ¶chain_config, - task_manager.spawn_handle(), - client.clone(), - network.clone(), + use futures::FutureExt; + + task_manager.spawn_handle().spawn( + "offchain-workers-runner", + "offchain-work", + sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions { + runtime_api_provider: client.clone(), + keystore: Some(params.keystore_container.keystore()), + offchain_db: backend.offchain_storage(), + transaction_pool: Some(OffchainTransactionPoolFactory::new(transaction_pool.clone())), + network_provider: network.clone(), + is_validator: parachain_config.role.is_authority(), + enable_http_requests: false, + custom_extensions: move |_| vec![], + }) + .run(client.clone(), task_manager.spawn_handle()) + .boxed(), ); }; @@ -528,10 +564,7 @@ where if validator { let parachain_consensus = build_consensus( client.clone(), - EthBlockImport::new( - ParachainBlockImport::new(client.clone(), backend.clone()), - client.clone(), - ), + parachain_block_import, prometheus_registry.as_ref(), telemetry.as_ref().map(|t| t.handle()), &task_manager, @@ -695,12 +728,14 @@ where keystore_container, select_chain: maybe_select_chain, transaction_pool, - other: (mut telemetry, _telemetry_worker_handle, frontier_backend, overrides), + other: (_, mut telemetry, _telemetry_worker_handle, frontier_backend, overrides), } = new_partial::(&config, ð_config, true)?; + let net_config = sc_network::config::FullNetworkConfiguration::new(&config.network); let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) = sc_service::build_network(sc_service::BuildNetworkParams { config: &config, + net_config, client: client.clone(), transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), @@ -710,7 +745,24 @@ where })?; if config.offchain_worker.enabled { - sc_service::build_offchain_workers(&config, task_manager.spawn_handle(), client.clone(), network.clone()); + use futures::FutureExt; + + task_manager.spawn_handle().spawn( + "offchain-workers-runner", + "offchain-work", + sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions { + runtime_api_provider: client.clone(), + keystore: None, + offchain_db: backend.offchain_storage(), + transaction_pool: Some(OffchainTransactionPoolFactory::new(transaction_pool.clone())), + network_provider: network.clone(), + is_validator: config.role.is_authority(), + enable_http_requests: false, + custom_extensions: move |_| vec![], + }) + .run(client.clone(), task_manager.spawn_handle()) + .boxed(), + ); }; let prometheus_registry = config.prometheus_registry().cloned(); @@ -744,7 +796,7 @@ where let client_for_cidp = client.clone(); let authorship_future = sc_consensus_manual_seal::run_manual_seal(sc_consensus_manual_seal::ManualSealParams { - block_import: EthBlockImport::new(client.clone(), client.clone()), + block_import: client.clone(), env: proposer_factory, client: client.clone(), pool: transaction_pool.clone(), diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 16c7c432a8..52fc16caea 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -6,7 +6,7 @@ version = "1.2.0" [dependencies] bstringify = "0.1.2" -serde = { version = "1.0.130", optional = true } +serde = { version = "1.0.130", default-features = false } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false } primitive-types = { version = "0.12.1", default-features = false, features = ["codec", "scale-info"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -22,10 +22,9 @@ bitcoin = { path = "../crates/bitcoin", default-features = false } [features] default = ["std", "substrate-compat"] std = [ - "serde", + "serde/std", "codec/std", "primitive-types/std", - "primitive-types/serde", "scale-decode", "scale-encode", diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs index 293e2e10ad..73e9fa2a4e 100644 --- a/primitives/src/lib.rs +++ b/primitives/src/lib.rs @@ -17,7 +17,6 @@ use scale_decode::DecodeAsType; #[cfg(feature = "std")] use scale_encode::EncodeAsType; use scale_info::TypeInfo; -#[cfg(feature = "std")] use serde::{Deserialize, Deserializer, Serialize, Serializer}; pub use bitcoin::types::H256Le; @@ -77,15 +76,19 @@ mod arithmetic { } } -#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize, std::hash::Hash))] +#[derive( + Serialize, Deserialize, Encode, Decode, Clone, PartialEq, Eq, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen, +)] +#[cfg_attr(feature = "std", derive(std::hash::Hash))] pub struct VaultCurrencyPair { pub collateral: CurrencyId, pub wrapped: CurrencyId, } -#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize, std::hash::Hash))] +#[derive( + Serialize, Deserialize, Encode, Decode, Clone, PartialEq, Eq, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen, +)] +#[cfg_attr(feature = "std", derive(std::hash::Hash))] pub struct VaultId { pub account_id: AccountId, pub currencies: VaultCurrencyPair, @@ -124,9 +127,9 @@ impl From<(AccountId, VaultCurrencyPair pub mod issue { use super::*; - #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] - #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] + #[derive(Serialize, Deserialize, Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Debug))] + #[serde(rename_all = "camelCase")] pub enum IssueRequestStatus { /// opened, but not yet executed or cancelled Pending, @@ -144,8 +147,8 @@ pub mod issue { // Due to a known bug in serde we need to specify how u128 is (de)serialized. // See https://github.com/paritytech/substrate/issues/4641 - #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] + #[derive(Serialize, Deserialize, Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Debug))] pub struct IssueRequest { /// the vault associated with this issue request pub vault: VaultId, @@ -186,9 +189,8 @@ pub mod issue { } } -#[derive(Eq, PartialEq, Encode, Decode, Default, TypeInfo)] -#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] -#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] +#[derive(Serialize, Deserialize, Eq, PartialEq, Encode, Decode, Default, TypeInfo)] +#[serde(rename_all = "camelCase")] /// a wrapper around a balance, used in RPC to workaround a bug where using u128 /// in runtime-apis fails. See pub struct BalanceWrapper { @@ -214,9 +216,9 @@ fn deserialize_from_string<'de, D: Deserializer<'de>, T: std::str::FromStr>(dese pub mod redeem { use super::*; - #[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] - #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] + #[derive(Serialize, Deserialize, Encode, Decode, Clone, Eq, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Debug))] + #[serde(rename_all = "camelCase")] pub enum RedeemRequestStatus { /// opened, but not yet executed or cancelled Pending, @@ -236,8 +238,8 @@ pub mod redeem { // Due to a known bug in serde we need to specify how u128 is (de)serialized. // See https://github.com/paritytech/substrate/issues/4641 - #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] + #[derive(Serialize, Deserialize, Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Debug))] pub struct RedeemRequest { /// the vault associated with this redeem request pub vault: VaultId, @@ -283,9 +285,9 @@ pub mod redeem { pub mod replace { use super::*; - #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize, Eq))] - #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] + #[derive(Serialize, Deserialize, Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Debug, Eq))] + #[serde(rename_all = "camelCase")] pub enum ReplaceRequestStatus { /// accepted, but not yet executed or cancelled Pending, @@ -303,8 +305,8 @@ pub mod replace { // Due to a known bug in serde we need to specify how u128 is (de)serialized. // See https://github.com/paritytech/substrate/issues/4641 - #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize, Eq))] + #[derive(Serialize, Deserialize, Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Eq, Debug))] pub struct ReplaceRequest { /// the vault which has requested to be replaced pub old_vault: VaultId, @@ -344,9 +346,8 @@ pub mod replace { pub mod oracle { use super::*; - #[derive(Encode, Decode, Clone, Eq, PartialEq, Debug, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] - #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] + #[derive(Serialize, Deserialize, Encode, Decode, Clone, Eq, PartialEq, Debug, TypeInfo, MaxEncodedLen)] + #[serde(rename_all = "camelCase")] pub enum Key { ExchangeRate(CurrencyId), FeeEstimation, @@ -503,8 +504,7 @@ macro_rules! create_currency_id { } create_currency_id! { - #[derive(Encode, Decode, Eq, Hash, PartialEq, Copy, Clone, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] + #[derive(Serialize, Deserialize,Encode, Decode, Eq, Hash, PartialEq, Copy, Clone, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] #[cfg_attr(feature = "std", derive(EncodeAsType,DecodeAsType))] #[repr(u8)] pub enum TokenSymbol { @@ -518,9 +518,23 @@ create_currency_id! { } } -#[derive(Encode, Decode, Eq, Hash, PartialEq, Copy, Clone, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] -#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] +#[derive( + Serialize, + Deserialize, + Encode, + Decode, + Eq, + Hash, + PartialEq, + Copy, + Clone, + Debug, + PartialOrd, + Ord, + TypeInfo, + MaxEncodedLen, +)] +#[serde(rename_all = "camelCase")] #[cfg_attr(feature = "std", derive(EncodeAsType, DecodeAsType))] pub enum LpToken { Token(TokenSymbol), @@ -528,9 +542,23 @@ pub enum LpToken { StableLpToken(StablePoolId), } -#[derive(Encode, Decode, Eq, Hash, PartialEq, Copy, Clone, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] -#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] +#[derive( + Serialize, + Deserialize, + Encode, + Decode, + Eq, + Hash, + PartialEq, + Copy, + Clone, + Debug, + PartialOrd, + Ord, + TypeInfo, + MaxEncodedLen, +)] +#[serde(rename_all = "camelCase")] #[cfg_attr(feature = "std", derive(EncodeAsType, DecodeAsType))] pub enum CurrencyId { Token(TokenSymbol), diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index f09ee2ea4d..b821854c0a 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -44,10 +44,9 @@ sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkad sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } - fc-db = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42" } fc-mapping-sync = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42" } -fc-rpc = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42" } +fc-rpc = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42", features = ["txpool"] } fc-rpc-core = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42" } fc-storage = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42" } fp-rpc = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.42" } \ No newline at end of file diff --git a/rpc/src/eth.rs b/rpc/src/eth.rs index 5e264624eb..40b56bdf70 100644 --- a/rpc/src/eth.rs +++ b/rpc/src/eth.rs @@ -153,13 +153,12 @@ where .into_rpc(), )?; - let tx_pool = TxPool::new(client.clone(), graph); if let Some(filter_pool) = filter_pool { io.merge( EthFilter::new( client.clone(), frontier_backend, - tx_pool.clone(), + graph.clone(), filter_pool, 500_usize, // max stored filters max_past_logs, @@ -191,7 +190,8 @@ where .into_rpc(), )?; - io.merge(Web3::new(client).into_rpc())?; + io.merge(Web3::new(client.clone()).into_rpc())?; + let tx_pool = TxPool::new(client, graph.clone()); io.merge(tx_pool.into_rpc())?; Ok(io) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index d25de7b7ec..4316bc9d61 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2023-03-01" +channel = "nightly-2023-04-01" components = [ "rustfmt", "rls" ] targets = [ "wasm32-unknown-unknown" ] diff --git a/scripts/benchmark.sh b/scripts/benchmark.sh index 536b50b074..397089c959 100644 --- a/scripts/benchmark.sh +++ b/scripts/benchmark.sh @@ -22,9 +22,11 @@ while getopts ":r:p:" opt; do done if [ -z "${pallet}" ]; then - pallet="*" + pallet='*' fi +path=${runtime%-*} + cargo run \ --bin interbtc-parachain \ --features runtime-benchmarks \ @@ -38,5 +40,5 @@ cargo run \ --wasm-execution=compiled \ --steps 50 \ --repeat 10 \ - --output "parachain/runtime/${runtime}/src/weights/" \ + --output "parachain/runtime/${path}/src/weights/" \ --template .deploy/runtime-weight-template.hbs From a8d30b7f8418fd572404a5aa32d5deadce223a10 Mon Sep 17 00:00:00 2001 From: nakul1010 Date: Tue, 5 Sep 2023 15:12:21 +0530 Subject: [PATCH 2/7] fix: removed unused patches --- Cargo.toml | 15 --------------- crates/btc-relay/src/lib.rs | 3 +-- crates/collator-selection/src/lib.rs | 1 + crates/farming/src/mock.rs | 2 +- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f8a6f68401..32c9e02ea0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,8 +63,6 @@ pallet-indices = { git = "https://github.com/paritytech//substrate", branch = "p pallet-membership = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } pallet-mmr = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } pallet-multisig = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } -pallet-nfts = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } -pallet-nfts-runtime-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } pallet-nis = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } pallet-nomination-pools = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } pallet-nomination-pools-benchmarking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } @@ -76,7 +74,6 @@ pallet-proxy = { git = "https://github.com/paritytech//substrate", branch = "pol pallet-ranked-collective = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } pallet-recovery = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } pallet-referenda = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } -pallet-root-testing = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } pallet-scheduler = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } pallet-session = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } pallet-session-benchmarking = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } @@ -93,7 +90,6 @@ pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } pallet-treasury = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } -pallet-uniques = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } pallet-utility = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } pallet-vesting = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } pallet-whitelist = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } @@ -183,8 +179,6 @@ substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } substrate-test-client = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } -substrate-test-utils = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } -substrate-test-utils-derive = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } try-runtime-cli = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } pallet-glutton = { git = "https://github.com/paritytech//substrate", branch = "polkadot-v1.0.0" } @@ -258,8 +252,6 @@ cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumu cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } parachain-info = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } parachains-common = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } -asset-hub-kusama-runtime = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } -asset-hub-polkadot-runtime = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } xcm-emulator = { git = "https://github.com/paritytech//cumulus", branch = "polkadot-v1.0.0" } [patch."https://github.com/open-web3-stack/open-runtime-module-library"] @@ -275,9 +267,6 @@ orml-xcm = { git = "https://github.com/open-web3-stack//open-runtime-module-libr orml-xtokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "f7c8b38cdc0fa6dddf915a20d2ccf6ae4ad5cac5" } [patch."https://github.com/paritytech/frontier"] -# ToDo: remove this if not required -#fc-api = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } -fc-cli = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } fc-consensus = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } fc-db = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } fc-mapping-sync = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } @@ -287,7 +276,6 @@ fc-storage = { git = "https://github.com/paritytech//frontier", branch = "polkad # Frontier Primitive fp-account = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } fp-consensus = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } -fp-dynamic-fee = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } fp-ethereum = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } fp-evm = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } fp-rpc = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } @@ -295,12 +283,9 @@ fp-self-contained = { git = "https://github.com/paritytech//frontier", branch = fp-storage = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } # Frontier FRAME pallet-base-fee = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } -pallet-dynamic-fee = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } pallet-ethereum = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } pallet-evm = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } pallet-evm-chain-id = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } pallet-evm-precompile-modexp = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } pallet-evm-precompile-sha3fips = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } pallet-evm-precompile-simple = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } -pallet-evm-test-vector-support = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } -pallet-hotfix-sufficients = { git = "https://github.com/paritytech//frontier", branch = "polkadot-v1.0.0" } diff --git a/crates/btc-relay/src/lib.rs b/crates/btc-relay/src/lib.rs index 0b4c4f3701..c2937d26d4 100644 --- a/crates/btc-relay/src/lib.rs +++ b/crates/btc-relay/src/lib.rs @@ -64,7 +64,7 @@ use frame_support::{ traits::Get, transactional, }; -use frame_system::ensure_signed; +use frame_system::{ensure_signed, pallet_prelude::BlockNumberFor}; use sp_core::{H256, U256}; use sp_runtime::traits::{CheckedAdd, CheckedDiv, CheckedSub, One}; use sp_std::{ @@ -419,7 +419,6 @@ pub const UNROUNDED_MAX_TARGET: U256 = U256([::MAX, ::MAX, ::MAX, /// Main chain id pub const MAIN_CHAIN_ID: u32 = 0; -use frame_system::pallet_prelude::BlockNumberFor; #[cfg_attr(test, mockable)] impl Pallet { diff --git a/crates/collator-selection/src/lib.rs b/crates/collator-selection/src/lib.rs index f2935777d4..7a801ccd23 100644 --- a/crates/collator-selection/src/lib.rs +++ b/crates/collator-selection/src/lib.rs @@ -74,6 +74,7 @@ pub mod pallet { use sp_runtime::traits::Convert; use sp_staking::SessionIndex; use sp_std::prelude::*; + type BalanceOf = <::StakingCurrency as Currency<::AccountId>>::Balance; /// A convertor from collators id. Since this pallet does not have stash/controller, this is diff --git a/crates/farming/src/mock.rs b/crates/farming/src/mock.rs index ca2160d27a..365114bbe7 100644 --- a/crates/farming/src/mock.rs +++ b/crates/farming/src/mock.rs @@ -19,7 +19,7 @@ type Block = frame_system::mocking::MockBlock; frame_support::construct_runtime!( pub enum Test { - System: frame_system::{Pallet, Call, Storage, Config, Event}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, Tokens: orml_tokens::{Pallet, Storage, Config, Event}, Rewards: reward::{Pallet, Call, Storage, Event}, Farming: farming::{Pallet, Call, Storage, Event}, From 96b9c3ca285480fdd36b5d8b18514b9be60c2677 Mon Sep 17 00:00:00 2001 From: nakul1010 Date: Tue, 5 Sep 2023 15:17:21 +0530 Subject: [PATCH 3/7] fix: runtime version --- Cargo.lock | 65 -------------------- parachain/runtime/interlay/src/lib.rs | 5 +- parachain/runtime/kintsugi/src/lib.rs | 5 +- parachain/runtime/kintsugi/src/xcm_config.rs | 2 +- 4 files changed, 3 insertions(+), 74 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7fb70758e7..47622b6483 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17604,68 +17604,3 @@ dependencies = [ "libc", "pkg-config", ] - -[[patch.unused]] -name = "asset-hub-kusama-runtime" -version = "0.9.420" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" - -[[patch.unused]] -name = "asset-hub-polkadot-runtime" -version = "0.9.420" -source = "git+https://github.com/paritytech//cumulus?branch=polkadot-v1.0.0#0d17cf6bef320f156f2859d6d2b0abd4154ae1d5" - -[[patch.unused]] -name = "pallet-nfts" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" - -[[patch.unused]] -name = "pallet-nfts-runtime-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" - -[[patch.unused]] -name = "pallet-root-testing" -version = "1.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" - -[[patch.unused]] -name = "pallet-uniques" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" - -[[patch.unused]] -name = "substrate-test-utils" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" - -[[patch.unused]] -name = "substrate-test-utils-derive" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?branch=polkadot-v1.0.0#948fbd2fd1233dc26dbb9f9bbc1d2cca2c03945d" - -[[patch.unused]] -name = "fc-cli" -version = "1.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" - -[[patch.unused]] -name = "fp-dynamic-fee" -version = "1.0.0" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" - -[[patch.unused]] -name = "pallet-dynamic-fee" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" - -[[patch.unused]] -name = "pallet-evm-test-vector-support" -version = "1.0.0-dev" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" - -[[patch.unused]] -name = "pallet-hotfix-sufficients" -version = "1.0.0" -source = "git+https://github.com/paritytech//frontier?branch=polkadot-v1.0.0#b520b749eb90df15177144dbece3fbd3622a2b19" diff --git a/parachain/runtime/interlay/src/lib.rs b/parachain/runtime/interlay/src/lib.rs index 3ac6e11f39..04a38c600e 100644 --- a/parachain/runtime/interlay/src/lib.rs +++ b/parachain/runtime/interlay/src/lib.rs @@ -114,11 +114,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { authoring_version: 1, spec_version: 1025002, impl_version: 1, - #[cfg(not(feature = "disable-runtime-api"))] - apis: RUNTIME_API_VERSIONS, - #[cfg(feature = "disable-runtime-api")] - apis: sp_version::create_apis_vec![[]], transaction_version: 4, + apis: RUNTIME_API_VERSIONS, state_version: 0, }; diff --git a/parachain/runtime/kintsugi/src/lib.rs b/parachain/runtime/kintsugi/src/lib.rs index 32afda18f3..fb1ec5dadc 100644 --- a/parachain/runtime/kintsugi/src/lib.rs +++ b/parachain/runtime/kintsugi/src/lib.rs @@ -117,11 +117,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { authoring_version: 1, spec_version: 1025002, impl_version: 1, - #[cfg(not(feature = "disable-runtime-api"))] - apis: RUNTIME_API_VERSIONS, - #[cfg(feature = "disable-runtime-api")] - apis: sp_version::create_apis_vec![[]], transaction_version: 4, + apis: RUNTIME_API_VERSIONS, state_version: 0, }; diff --git a/parachain/runtime/kintsugi/src/xcm_config.rs b/parachain/runtime/kintsugi/src/xcm_config.rs index 5a3c0a2398..d853546525 100644 --- a/parachain/runtime/kintsugi/src/xcm_config.rs +++ b/parachain/runtime/kintsugi/src/xcm_config.rs @@ -30,7 +30,7 @@ parameter_types! { } /// Means for transacting assets on this chain. -pub type LocationToAccountId = ( +type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. From c6e48166edefbe1e5ec79dc8d2e103f8ea2241ac Mon Sep 17 00:00:00 2001 From: nakul1010 Date: Tue, 5 Sep 2023 15:36:30 +0530 Subject: [PATCH 4/7] fix: add type nonce --- crates/annuity/src/mock.rs | 3 ++- crates/btc-relay/src/mock.rs | 3 ++- crates/clients-info/src/mock.rs | 3 ++- crates/currency/src/mock.rs | 3 ++- crates/escrow/src/mock.rs | 3 ++- crates/farming/src/mock.rs | 3 ++- crates/fee/src/mock.rs | 3 ++- crates/issue/src/mock.rs | 3 ++- crates/nomination/src/mock.rs | 3 ++- crates/oracle/src/mock.rs | 3 ++- crates/redeem/src/mock.rs | 3 ++- crates/replace/src/mock.rs | 3 ++- crates/reward/src/mock.rs | 3 ++- crates/security/src/mock.rs | 3 ++- crates/staking/src/mock.rs | 3 ++- crates/supply/src/mock.rs | 3 ++- crates/tx-pause/src/mock.rs | 2 +- crates/vault-registry/src/mock.rs | 3 ++- 18 files changed, 35 insertions(+), 18 deletions(-) diff --git a/crates/annuity/src/mock.rs b/crates/annuity/src/mock.rs index 73554e6cca..a3855b4f42 100644 --- a/crates/annuity/src/mock.rs +++ b/crates/annuity/src/mock.rs @@ -27,6 +27,7 @@ frame_support::construct_runtime!( pub type AccountId = u64; pub type Balance = u128; pub type BlockNumber = u64; +pub type Nonce = u64; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -40,7 +41,7 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u64; + type Nonce = Nonce; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; diff --git a/crates/btc-relay/src/mock.rs b/crates/btc-relay/src/mock.rs index ed6133338f..ab620a61e0 100644 --- a/crates/btc-relay/src/mock.rs +++ b/crates/btc-relay/src/mock.rs @@ -32,6 +32,7 @@ frame_support::construct_runtime!( pub type AccountId = u64; pub type BlockNumber = u64; pub type Moment = u64; +pub type Nonce = u64; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -45,7 +46,7 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u64; + type Nonce = Nonce; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; diff --git a/crates/clients-info/src/mock.rs b/crates/clients-info/src/mock.rs index 3ca6c594ea..540bb8c563 100644 --- a/crates/clients-info/src/mock.rs +++ b/crates/clients-info/src/mock.rs @@ -22,6 +22,7 @@ frame_support::construct_runtime!( ); pub type AccountId = u64; +pub type Nonce = u64; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -35,7 +36,7 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u64; + type Nonce = Nonce; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; diff --git a/crates/currency/src/mock.rs b/crates/currency/src/mock.rs index d972fc3f99..bac9d6d523 100644 --- a/crates/currency/src/mock.rs +++ b/crates/currency/src/mock.rs @@ -33,6 +33,7 @@ pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; pub type CurrencyId = primitives::CurrencyId; pub type Moment = u64; +pub type Nonce = u64; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -46,7 +47,7 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u64; + type Nonce = Nonce; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; diff --git a/crates/escrow/src/mock.rs b/crates/escrow/src/mock.rs index fcf3cf3286..20de95ca02 100644 --- a/crates/escrow/src/mock.rs +++ b/crates/escrow/src/mock.rs @@ -28,6 +28,7 @@ frame_support::construct_runtime!( pub type AccountId = u64; pub type Balance = u128; pub type BlockNumber = u64; +pub type Nonce = u64; pub type SignedFixedPoint = FixedI128; parameter_types! { @@ -42,7 +43,7 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u64; + type Nonce = Nonce; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; diff --git a/crates/farming/src/mock.rs b/crates/farming/src/mock.rs index 365114bbe7..177771aee5 100644 --- a/crates/farming/src/mock.rs +++ b/crates/farming/src/mock.rs @@ -28,6 +28,7 @@ frame_support::construct_runtime!( pub type AccountId = u64; pub type Balance = u128; +pub type Nonce = u64; pub type SignedFixedPoint = FixedI128; parameter_types! { @@ -42,7 +43,7 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u64; + type Nonce = Nonce; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; diff --git a/crates/fee/src/mock.rs b/crates/fee/src/mock.rs index 7df104ddd5..e34a60288a 100644 --- a/crates/fee/src/mock.rs +++ b/crates/fee/src/mock.rs @@ -42,6 +42,7 @@ pub type AccountId = u64; pub type Balance = u128; pub type RawAmount = i128; pub type Moment = u64; +pub type Nonce = u64; pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; pub type UnsignedFixedPoint = FixedU128; @@ -58,7 +59,7 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u64; + type Nonce = Nonce; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; diff --git a/crates/issue/src/mock.rs b/crates/issue/src/mock.rs index 633e1c67d8..8f48313256 100644 --- a/crates/issue/src/mock.rs +++ b/crates/issue/src/mock.rs @@ -52,6 +52,7 @@ pub type Balance = u128; pub type RawAmount = i128; pub type BlockNumber = u64; pub type Moment = u64; +pub type Nonce = u64; pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; pub type UnsignedFixedPoint = FixedU128; @@ -68,7 +69,7 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u64; + type Nonce = Nonce; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; diff --git a/crates/nomination/src/mock.rs b/crates/nomination/src/mock.rs index 3b65ab6f07..20c2c4b3c2 100644 --- a/crates/nomination/src/mock.rs +++ b/crates/nomination/src/mock.rs @@ -51,6 +51,7 @@ pub type AccountId = u64; pub type Balance = u128; pub type RawAmount = i128; pub type Moment = u64; +pub type Nonce = u64; pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; pub type UnsignedFixedPoint = FixedU128; @@ -67,7 +68,7 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u64; + type Nonce = Nonce; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; diff --git a/crates/oracle/src/mock.rs b/crates/oracle/src/mock.rs index 57882d2dbf..12e35597f0 100644 --- a/crates/oracle/src/mock.rs +++ b/crates/oracle/src/mock.rs @@ -41,6 +41,7 @@ pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; pub type CurrencyId = primitives::CurrencyId; pub type Moment = u64; +pub type Nonce = u64; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -54,7 +55,7 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u64; + type Nonce = Nonce; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; diff --git a/crates/redeem/src/mock.rs b/crates/redeem/src/mock.rs index 12b9f17331..8a5fd6bbe5 100644 --- a/crates/redeem/src/mock.rs +++ b/crates/redeem/src/mock.rs @@ -54,6 +54,7 @@ pub type Balance = u128; pub type RawAmount = i128; pub type BlockNumber = u64; pub type Moment = u64; +pub type Nonce = u64; pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; pub type UnsignedFixedPoint = FixedU128; @@ -70,7 +71,7 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u64; + type Nonce = Nonce; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; diff --git a/crates/replace/src/mock.rs b/crates/replace/src/mock.rs index 30cdf7a405..b77eb99db7 100644 --- a/crates/replace/src/mock.rs +++ b/crates/replace/src/mock.rs @@ -52,6 +52,7 @@ pub type Balance = u128; pub type RawAmount = i128; pub type BlockNumber = u64; pub type Moment = u64; +pub type Nonce = u64; pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; pub type UnsignedFixedPoint = FixedU128; @@ -68,7 +69,7 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u64; + type Nonce = Nonce; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; diff --git a/crates/reward/src/mock.rs b/crates/reward/src/mock.rs index 029bf0744e..3782f0b775 100644 --- a/crates/reward/src/mock.rs +++ b/crates/reward/src/mock.rs @@ -30,6 +30,7 @@ frame_support::construct_runtime!( pub type AccountId = u64; pub type SignedFixedPoint = FixedI128; +pub type Nonce = u64; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -43,7 +44,7 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u64; + type Nonce = Nonce; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; diff --git a/crates/security/src/mock.rs b/crates/security/src/mock.rs index 90a35bdfb1..dbb9250f19 100644 --- a/crates/security/src/mock.rs +++ b/crates/security/src/mock.rs @@ -21,6 +21,7 @@ frame_support::construct_runtime!( ); pub type AccountId = u64; +pub type Nonce = u64; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -33,7 +34,7 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u64; + type Nonce = Nonce; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; diff --git a/crates/staking/src/mock.rs b/crates/staking/src/mock.rs index 7d056c6b97..fa9f6beb31 100644 --- a/crates/staking/src/mock.rs +++ b/crates/staking/src/mock.rs @@ -29,6 +29,7 @@ frame_support::construct_runtime!( pub type AccountId = u64; pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; +pub type Nonce = u64; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -42,7 +43,7 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u64; + type Nonce = Nonce; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; diff --git a/crates/supply/src/mock.rs b/crates/supply/src/mock.rs index 6762a06669..c9cfcdd11c 100644 --- a/crates/supply/src/mock.rs +++ b/crates/supply/src/mock.rs @@ -23,6 +23,7 @@ frame_support::construct_runtime!( pub type AccountId = u64; pub type Balance = u128; pub type BlockNumber = u64; +pub type Nonce = u64; parameter_types! { pub const BlockHashCount: u64 = 250; @@ -36,7 +37,7 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u64; + type Nonce = Nonce; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; diff --git a/crates/tx-pause/src/mock.rs b/crates/tx-pause/src/mock.rs index ef916ac7e6..db6f237ae6 100644 --- a/crates/tx-pause/src/mock.rs +++ b/crates/tx-pause/src/mock.rs @@ -40,7 +40,7 @@ impl frame_system::Config for Test { type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u32; + type Nonce = u64; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; diff --git a/crates/vault-registry/src/mock.rs b/crates/vault-registry/src/mock.rs index 9e79375d11..885ee3e8f8 100644 --- a/crates/vault-registry/src/mock.rs +++ b/crates/vault-registry/src/mock.rs @@ -51,6 +51,7 @@ pub type Balance = u128; pub type RawAmount = i128; pub type BlockNumber = u64; pub type Moment = u64; +pub type Nonce = u64; pub type SignedFixedPoint = FixedI128; pub type SignedInner = i128; pub type UnsignedFixedPoint = FixedU128; @@ -67,7 +68,7 @@ impl frame_system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Nonce = u32; + type Nonce = Nonce; type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; From 68237f1ef4da2a27d0ecaa4b1f80c21c2b359a10 Mon Sep 17 00:00:00 2001 From: nakul1010 Date: Tue, 5 Sep 2023 21:14:54 +0530 Subject: [PATCH 5/7] fix: add back checks for contracts pallet --- parachain/runtime/kintsugi/src/lib.rs | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/parachain/runtime/kintsugi/src/lib.rs b/parachain/runtime/kintsugi/src/lib.rs index fb1ec5dadc..5c92592bbe 100644 --- a/parachain/runtime/kintsugi/src/lib.rs +++ b/parachain/runtime/kintsugi/src/lib.rs @@ -28,6 +28,7 @@ use frame_system::{ use loans::{OnSlashHook, PostDeposit, PostTransfer, PreDeposit, PreTransfer}; use orml_asset_registry::SequentialId; use orml_traits::{currency::MutationHooks, parameter_type_with_key}; +use pallet_contracts_primitives::ContractResult; use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment}; use sp_api::impl_runtime_apis; use sp_core::{OpaqueMetadata, H256}; @@ -2173,6 +2174,17 @@ impl_runtime_apis! { storage_deposit_limit: Option, input_data: Vec, ) -> pallet_contracts_primitives::ContractExecResult { + if !contracts::EnableContracts::get() { + return ContractResult { + gas_consumed: Default::default(), + gas_required: Default::default(), + storage_deposit: Default::default(), + debug_message: Default::default(), + events: Default::default(), + result: Err(sp_runtime::DispatchError::Other("pallet_contracts is disabled")), + }; + } + let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block); Contracts::bare_call( origin, @@ -2197,6 +2209,17 @@ impl_runtime_apis! { salt: Vec, ) -> pallet_contracts_primitives::ContractInstantiateResult { + if !contracts::EnableContracts::get() { + return ContractResult { + gas_consumed: Default::default(), + gas_required: Default::default(), + storage_deposit: Default::default(), + debug_message: Default::default(), + events: Default::default(), + result: Err(sp_runtime::DispatchError::Other("pallet_contracts is disabled")), + }; + } + let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block); Contracts::bare_instantiate( origin, @@ -2218,6 +2241,9 @@ impl_runtime_apis! { determinism: pallet_contracts::Determinism, ) -> pallet_contracts_primitives::CodeUploadResult { + if !contracts::EnableContracts::get() { + return Err(sp_runtime::DispatchError::Other("pallet_contracts is disabled")); + } Contracts::bare_upload_code( origin, code, From a262f15cee6f236e08c3c9c8f1c1e536797bd3fe Mon Sep 17 00:00:00 2001 From: nakul1010 Date: Wed, 6 Sep 2023 02:25:07 +0530 Subject: [PATCH 6/7] fix: try feature gating traits --- crates/bitcoin/src/address.rs | 9 ++- crates/bitcoin/src/types.rs | 6 +- crates/loans/Cargo.toml | 2 +- crates/loans/src/rate_model.rs | 47 ++------------- crates/loans/src/types.rs | 29 ++------- crates/vault-registry/Cargo.toml | 3 +- crates/vault-registry/src/types.rs | 4 +- primitives/src/lib.rs | 96 +++++++++++------------------- 8 files changed, 56 insertions(+), 140 deletions(-) diff --git a/crates/bitcoin/src/address.rs b/crates/bitcoin/src/address.rs index 43edece67d..28809257cd 100644 --- a/crates/bitcoin/src/address.rs +++ b/crates/bitcoin/src/address.rs @@ -3,7 +3,6 @@ use bitcoin_hashes::{hash160::Hash as Hash160, Hash}; use codec::{Decode, Encode, MaxEncodedLen}; use primitive_types::{H160, H256}; use scale_info::TypeInfo; -use serde::{Deserialize, Serialize}; use sha2::{Digest, Sha256}; #[cfg(not(feature = "std"))] @@ -14,10 +13,8 @@ use secp256k1::{constants::PUBLIC_KEY_SIZE, Error as Secp256k1Error, PublicKey a /// A Bitcoin address is a serialized identifier that represents the destination for a payment. /// Address prefixes are used to indicate the network as well as the format. Since the Parachain /// follows SPV assumptions we do not need to know which network a payment is included in. -#[derive( - Serialize, Deserialize, Encode, Decode, Clone, Ord, PartialOrd, PartialEq, Eq, Debug, Copy, TypeInfo, MaxEncodedLen, -)] -#[cfg_attr(feature = "std", derive(std::hash::Hash))] +#[derive(Encode, Decode, Clone, Ord, PartialOrd, PartialEq, Eq, Debug, Copy, TypeInfo, MaxEncodedLen)] +#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize, std::hash::Hash))] pub enum Address { // input: {signature} {pubkey} // output: OP_DUP OP_HASH160 {hash160(pubkey)} OP_EQUALVERIFY OP_CHECKSIG @@ -153,6 +150,7 @@ impl From<[u8; PUBLIC_KEY_SIZE]> for PublicKey { } } +#[cfg(feature = "std")] impl serde::Serialize for PublicKey { fn serialize(&self, serializer: S) -> Result where @@ -163,6 +161,7 @@ impl serde::Serialize for PublicKey { } } +#[cfg(feature = "std")] impl<'de> serde::Deserialize<'de> for PublicKey { fn deserialize(deserializer: D) -> Result where diff --git a/crates/bitcoin/src/types.rs b/crates/bitcoin/src/types.rs index 1fa46b57e6..f1a38b3318 100644 --- a/crates/bitcoin/src/types.rs +++ b/crates/bitcoin/src/types.rs @@ -19,6 +19,7 @@ use alloc::{vec, vec::Vec}; #[cfg(feature = "std")] use codec::alloc::string::String; +#[cfg(feature = "std")] use serde::{Deserialize, Serialize}; /// We also check the coinbase proof in order to defend against the 'leaf-node weakness'. @@ -590,9 +591,8 @@ pub struct BlockChain { } /// Represents a bitcoin 32 bytes hash digest encoded in little-endian -#[derive( - Serialize, Deserialize, Encode, Decode, Default, PartialEq, Eq, Clone, Copy, Debug, TypeInfo, MaxEncodedLen, -)] +#[derive(Encode, Decode, Default, PartialEq, Eq, Clone, Copy, Debug, TypeInfo, MaxEncodedLen)] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] pub struct H256Le { content: [u8; 32], } diff --git a/crates/loans/Cargo.toml b/crates/loans/Cargo.toml index 9852952375..c551a20997 100644 --- a/crates/loans/Cargo.toml +++ b/crates/loans/Cargo.toml @@ -8,7 +8,7 @@ version = "1.9.3" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -serde = { version = "1.0.136", default-features = false, features = ["derive"] } +serde = { version = "1.0.136", default-features = false, features = ["derive"] , optional = true } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } num-traits = { default-features = false, version = "0.2" } diff --git a/crates/loans/src/rate_model.rs b/crates/loans/src/rate_model.rs index 2da4a4cdc3..fb625c6f18 100644 --- a/crates/loans/src/rate_model.rs +++ b/crates/loans/src/rate_model.rs @@ -23,19 +23,8 @@ use sp_runtime::traits::{CheckedAdd, CheckedDiv, CheckedSub, Saturating}; use crate::*; /// Parallel interest rate model -#[derive( - serde::Deserialize, - serde::Serialize, - Encode, - Decode, - Eq, - PartialEq, - Copy, - Clone, - RuntimeDebug, - TypeInfo, - MaxEncodedLen, -)] +#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, TypeInfo, MaxEncodedLen)] +#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] pub enum InterestRateModel { Jump(JumpModel), Curve(CurveModel), @@ -87,20 +76,8 @@ impl InterestRateModel { } /// The jump interest rate model -#[derive( - serde::Deserialize, - serde::Serialize, - Encode, - Decode, - Eq, - PartialEq, - Copy, - Clone, - RuntimeDebug, - Default, - TypeInfo, - MaxEncodedLen, -)] +#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, Default, TypeInfo, MaxEncodedLen)] +#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] pub struct JumpModel { /// The base interest rate when utilization rate is 0 pub base_rate: Rate, @@ -170,20 +147,8 @@ impl JumpModel { } /// The curve interest rate model -#[derive( - serde::Deserialize, - serde::Serialize, - Encode, - Decode, - Eq, - PartialEq, - Copy, - Clone, - RuntimeDebug, - Default, - TypeInfo, - MaxEncodedLen, -)] +#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, Default, TypeInfo, MaxEncodedLen)] +#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] pub struct CurveModel { pub base_rate: Rate, } diff --git a/crates/loans/src/types.rs b/crates/loans/src/types.rs index 9bb916dfae..0c4f887e17 100644 --- a/crates/loans/src/types.rs +++ b/crates/loans/src/types.rs @@ -76,19 +76,8 @@ pub struct EarnedSnapshot { } /// The current state of a market. For more information, see [Market]. -#[derive( - serde::Deserialize, - serde::Serialize, - Clone, - Copy, - PartialEq, - Eq, - codec::Decode, - codec::Encode, - RuntimeDebug, - TypeInfo, - MaxEncodedLen, -)] +#[derive(Clone, Copy, PartialEq, Eq, codec::Decode, codec::Encode, RuntimeDebug, TypeInfo, MaxEncodedLen)] +#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] pub enum MarketState { Active, Pending, @@ -100,18 +89,8 @@ pub enum MarketState { /// Market. /// /// A large pool of liquidity where accounts can lend and borrow. -#[derive( - serde::Deserialize, - serde::Serialize, - Clone, - PartialEq, - Eq, - codec::Decode, - codec::Encode, - RuntimeDebug, - TypeInfo, - MaxEncodedLen, -)] +#[derive(Clone, PartialEq, Eq, codec::Decode, codec::Encode, RuntimeDebug, TypeInfo, MaxEncodedLen)] +#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] pub struct Market { /// The secure collateral ratio pub collateral_factor: Ratio, diff --git a/crates/vault-registry/Cargo.toml b/crates/vault-registry/Cargo.toml index c40a558ccf..8cc4cc4333 100644 --- a/crates/vault-registry/Cargo.toml +++ b/crates/vault-registry/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Interlay Ltd"] edition = "2021" [dependencies] -serde = { version = "1.0.130", default-features = false, features = ["derive"] } +serde = { version = "1.0.130", default-features = false, features = ["derive"] , optional = true } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -80,6 +80,7 @@ std = [ "loans/std", ] runtime-benchmarks = [ +# "primitives", "frame-benchmarking", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", diff --git a/crates/vault-registry/src/types.rs b/crates/vault-registry/src/types.rs index d96a7760f3..9f161923b3 100644 --- a/crates/vault-registry/src/types.rs +++ b/crates/vault-registry/src/types.rs @@ -171,8 +171,8 @@ pub struct Vault { // Number of tokens pending issue pub to_be_issued_tokens: Balance, diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs index 73e9fa2a4e..293e2e10ad 100644 --- a/primitives/src/lib.rs +++ b/primitives/src/lib.rs @@ -17,6 +17,7 @@ use scale_decode::DecodeAsType; #[cfg(feature = "std")] use scale_encode::EncodeAsType; use scale_info::TypeInfo; +#[cfg(feature = "std")] use serde::{Deserialize, Deserializer, Serialize, Serializer}; pub use bitcoin::types::H256Le; @@ -76,19 +77,15 @@ mod arithmetic { } } -#[derive( - Serialize, Deserialize, Encode, Decode, Clone, PartialEq, Eq, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen, -)] -#[cfg_attr(feature = "std", derive(std::hash::Hash))] +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize, std::hash::Hash))] pub struct VaultCurrencyPair { pub collateral: CurrencyId, pub wrapped: CurrencyId, } -#[derive( - Serialize, Deserialize, Encode, Decode, Clone, PartialEq, Eq, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen, -)] -#[cfg_attr(feature = "std", derive(std::hash::Hash))] +#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize, std::hash::Hash))] pub struct VaultId { pub account_id: AccountId, pub currencies: VaultCurrencyPair, @@ -127,9 +124,9 @@ impl From<(AccountId, VaultCurrencyPair pub mod issue { use super::*; - #[derive(Serialize, Deserialize, Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Debug))] - #[serde(rename_all = "camelCase")] + #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] + #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] pub enum IssueRequestStatus { /// opened, but not yet executed or cancelled Pending, @@ -147,8 +144,8 @@ pub mod issue { // Due to a known bug in serde we need to specify how u128 is (de)serialized. // See https://github.com/paritytech/substrate/issues/4641 - #[derive(Serialize, Deserialize, Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Debug))] + #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] pub struct IssueRequest { /// the vault associated with this issue request pub vault: VaultId, @@ -189,8 +186,9 @@ pub mod issue { } } -#[derive(Serialize, Deserialize, Eq, PartialEq, Encode, Decode, Default, TypeInfo)] -#[serde(rename_all = "camelCase")] +#[derive(Eq, PartialEq, Encode, Decode, Default, TypeInfo)] +#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] +#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] /// a wrapper around a balance, used in RPC to workaround a bug where using u128 /// in runtime-apis fails. See pub struct BalanceWrapper { @@ -216,9 +214,9 @@ fn deserialize_from_string<'de, D: Deserializer<'de>, T: std::str::FromStr>(dese pub mod redeem { use super::*; - #[derive(Serialize, Deserialize, Encode, Decode, Clone, Eq, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Debug))] - #[serde(rename_all = "camelCase")] + #[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] + #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] pub enum RedeemRequestStatus { /// opened, but not yet executed or cancelled Pending, @@ -238,8 +236,8 @@ pub mod redeem { // Due to a known bug in serde we need to specify how u128 is (de)serialized. // See https://github.com/paritytech/substrate/issues/4641 - #[derive(Serialize, Deserialize, Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Debug))] + #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] pub struct RedeemRequest { /// the vault associated with this redeem request pub vault: VaultId, @@ -285,9 +283,9 @@ pub mod redeem { pub mod replace { use super::*; - #[derive(Serialize, Deserialize, Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Debug, Eq))] - #[serde(rename_all = "camelCase")] + #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize, Eq))] + #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] pub enum ReplaceRequestStatus { /// accepted, but not yet executed or cancelled Pending, @@ -305,8 +303,8 @@ pub mod replace { // Due to a known bug in serde we need to specify how u128 is (de)serialized. // See https://github.com/paritytech/substrate/issues/4641 - #[derive(Serialize, Deserialize, Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Eq, Debug))] + #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize, Eq))] pub struct ReplaceRequest { /// the vault which has requested to be replaced pub old_vault: VaultId, @@ -346,8 +344,9 @@ pub mod replace { pub mod oracle { use super::*; - #[derive(Serialize, Deserialize, Encode, Decode, Clone, Eq, PartialEq, Debug, TypeInfo, MaxEncodedLen)] - #[serde(rename_all = "camelCase")] + #[derive(Encode, Decode, Clone, Eq, PartialEq, Debug, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] + #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] pub enum Key { ExchangeRate(CurrencyId), FeeEstimation, @@ -504,7 +503,8 @@ macro_rules! create_currency_id { } create_currency_id! { - #[derive(Serialize, Deserialize,Encode, Decode, Eq, Hash, PartialEq, Copy, Clone, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] + #[derive(Encode, Decode, Eq, Hash, PartialEq, Copy, Clone, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] #[cfg_attr(feature = "std", derive(EncodeAsType,DecodeAsType))] #[repr(u8)] pub enum TokenSymbol { @@ -518,23 +518,9 @@ create_currency_id! { } } -#[derive( - Serialize, - Deserialize, - Encode, - Decode, - Eq, - Hash, - PartialEq, - Copy, - Clone, - Debug, - PartialOrd, - Ord, - TypeInfo, - MaxEncodedLen, -)] -#[serde(rename_all = "camelCase")] +#[derive(Encode, Decode, Eq, Hash, PartialEq, Copy, Clone, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] #[cfg_attr(feature = "std", derive(EncodeAsType, DecodeAsType))] pub enum LpToken { Token(TokenSymbol), @@ -542,23 +528,9 @@ pub enum LpToken { StableLpToken(StablePoolId), } -#[derive( - Serialize, - Deserialize, - Encode, - Decode, - Eq, - Hash, - PartialEq, - Copy, - Clone, - Debug, - PartialOrd, - Ord, - TypeInfo, - MaxEncodedLen, -)] -#[serde(rename_all = "camelCase")] +#[derive(Encode, Decode, Eq, Hash, PartialEq, Copy, Clone, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] #[cfg_attr(feature = "std", derive(EncodeAsType, DecodeAsType))] pub enum CurrencyId { Token(TokenSymbol), From f50fc329ad2bd74a43f57544036ada9c594b3abc Mon Sep 17 00:00:00 2001 From: nakul1010 Date: Wed, 6 Sep 2023 12:02:16 +0530 Subject: [PATCH 7/7] fix: remove std feature gate for serde. --- crates/bitcoin/src/address.rs | 9 +-- crates/bitcoin/src/types.rs | 6 +- crates/loans/Cargo.toml | 2 +- crates/loans/src/rate_model.rs | 45 ++++++++++++-- crates/loans/src/types.rs | 30 ++++++++-- crates/vault-registry/Cargo.toml | 3 +- crates/vault-registry/src/types.rs | 4 +- primitives/src/lib.rs | 96 +++++++++++++++++++----------- 8 files changed, 139 insertions(+), 56 deletions(-) diff --git a/crates/bitcoin/src/address.rs b/crates/bitcoin/src/address.rs index 28809257cd..43edece67d 100644 --- a/crates/bitcoin/src/address.rs +++ b/crates/bitcoin/src/address.rs @@ -3,6 +3,7 @@ use bitcoin_hashes::{hash160::Hash as Hash160, Hash}; use codec::{Decode, Encode, MaxEncodedLen}; use primitive_types::{H160, H256}; use scale_info::TypeInfo; +use serde::{Deserialize, Serialize}; use sha2::{Digest, Sha256}; #[cfg(not(feature = "std"))] @@ -13,8 +14,10 @@ use secp256k1::{constants::PUBLIC_KEY_SIZE, Error as Secp256k1Error, PublicKey a /// A Bitcoin address is a serialized identifier that represents the destination for a payment. /// Address prefixes are used to indicate the network as well as the format. Since the Parachain /// follows SPV assumptions we do not need to know which network a payment is included in. -#[derive(Encode, Decode, Clone, Ord, PartialOrd, PartialEq, Eq, Debug, Copy, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize, std::hash::Hash))] +#[derive( + Serialize, Deserialize, Encode, Decode, Clone, Ord, PartialOrd, PartialEq, Eq, Debug, Copy, TypeInfo, MaxEncodedLen, +)] +#[cfg_attr(feature = "std", derive(std::hash::Hash))] pub enum Address { // input: {signature} {pubkey} // output: OP_DUP OP_HASH160 {hash160(pubkey)} OP_EQUALVERIFY OP_CHECKSIG @@ -150,7 +153,6 @@ impl From<[u8; PUBLIC_KEY_SIZE]> for PublicKey { } } -#[cfg(feature = "std")] impl serde::Serialize for PublicKey { fn serialize(&self, serializer: S) -> Result where @@ -161,7 +163,6 @@ impl serde::Serialize for PublicKey { } } -#[cfg(feature = "std")] impl<'de> serde::Deserialize<'de> for PublicKey { fn deserialize(deserializer: D) -> Result where diff --git a/crates/bitcoin/src/types.rs b/crates/bitcoin/src/types.rs index f1a38b3318..1fa46b57e6 100644 --- a/crates/bitcoin/src/types.rs +++ b/crates/bitcoin/src/types.rs @@ -19,7 +19,6 @@ use alloc::{vec, vec::Vec}; #[cfg(feature = "std")] use codec::alloc::string::String; -#[cfg(feature = "std")] use serde::{Deserialize, Serialize}; /// We also check the coinbase proof in order to defend against the 'leaf-node weakness'. @@ -591,8 +590,9 @@ pub struct BlockChain { } /// Represents a bitcoin 32 bytes hash digest encoded in little-endian -#[derive(Encode, Decode, Default, PartialEq, Eq, Clone, Copy, Debug, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +#[derive( + Serialize, Deserialize, Encode, Decode, Default, PartialEq, Eq, Clone, Copy, Debug, TypeInfo, MaxEncodedLen, +)] pub struct H256Le { content: [u8; 32], } diff --git a/crates/loans/Cargo.toml b/crates/loans/Cargo.toml index c551a20997..9852952375 100644 --- a/crates/loans/Cargo.toml +++ b/crates/loans/Cargo.toml @@ -8,7 +8,7 @@ version = "1.9.3" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -serde = { version = "1.0.136", default-features = false, features = ["derive"] , optional = true } +serde = { version = "1.0.136", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } num-traits = { default-features = false, version = "0.2" } diff --git a/crates/loans/src/rate_model.rs b/crates/loans/src/rate_model.rs index fb625c6f18..0e95e3cd6a 100644 --- a/crates/loans/src/rate_model.rs +++ b/crates/loans/src/rate_model.rs @@ -23,8 +23,19 @@ use sp_runtime::traits::{CheckedAdd, CheckedDiv, CheckedSub, Saturating}; use crate::*; /// Parallel interest rate model -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] +#[derive( + serde::Deserialize, + serde::Serialize, + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + TypeInfo, + MaxEncodedLen, +)] pub enum InterestRateModel { Jump(JumpModel), Curve(CurveModel), @@ -76,8 +87,19 @@ impl InterestRateModel { } /// The jump interest rate model -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, Default, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] +#[derive( + serde::Deserialize, + serde::Serialize, + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + TypeInfo, + MaxEncodedLen, +)] pub struct JumpModel { /// The base interest rate when utilization rate is 0 pub base_rate: Rate, @@ -147,8 +169,19 @@ impl JumpModel { } /// The curve interest rate model -#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, Default, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] +#[derive( + serde::Deserialize, + serde::Serialize, + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + TypeInfo, + MaxEncodedLen, +)] pub struct CurveModel { pub base_rate: Rate, } diff --git a/crates/loans/src/types.rs b/crates/loans/src/types.rs index 0c4f887e17..afc4b870ff 100644 --- a/crates/loans/src/types.rs +++ b/crates/loans/src/types.rs @@ -76,8 +76,19 @@ pub struct EarnedSnapshot { } /// The current state of a market. For more information, see [Market]. -#[derive(Clone, Copy, PartialEq, Eq, codec::Decode, codec::Encode, RuntimeDebug, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] +#[derive( + serde::Deserialize, + serde::Serialize, + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + TypeInfo, + MaxEncodedLen, +)] pub enum MarketState { Active, Pending, @@ -89,8 +100,19 @@ pub enum MarketState { /// Market. /// /// A large pool of liquidity where accounts can lend and borrow. -#[derive(Clone, PartialEq, Eq, codec::Decode, codec::Encode, RuntimeDebug, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] +#[derive( + serde::Deserialize, + serde::Serialize, + Encode, + Decode, + Eq, + PartialEq, + Copy, + Clone, + RuntimeDebug, + TypeInfo, + MaxEncodedLen, +)] pub struct Market { /// The secure collateral ratio pub collateral_factor: Ratio, diff --git a/crates/vault-registry/Cargo.toml b/crates/vault-registry/Cargo.toml index 8cc4cc4333..c40a558ccf 100644 --- a/crates/vault-registry/Cargo.toml +++ b/crates/vault-registry/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Interlay Ltd"] edition = "2021" [dependencies] -serde = { version = "1.0.130", default-features = false, features = ["derive"] , optional = true } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } @@ -80,7 +80,6 @@ std = [ "loans/std", ] runtime-benchmarks = [ -# "primitives", "frame-benchmarking", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", diff --git a/crates/vault-registry/src/types.rs b/crates/vault-registry/src/types.rs index 9f161923b3..d96a7760f3 100644 --- a/crates/vault-registry/src/types.rs +++ b/crates/vault-registry/src/types.rs @@ -171,8 +171,8 @@ pub struct Vault { // Number of tokens pending issue pub to_be_issued_tokens: Balance, diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs index 293e2e10ad..73e9fa2a4e 100644 --- a/primitives/src/lib.rs +++ b/primitives/src/lib.rs @@ -17,7 +17,6 @@ use scale_decode::DecodeAsType; #[cfg(feature = "std")] use scale_encode::EncodeAsType; use scale_info::TypeInfo; -#[cfg(feature = "std")] use serde::{Deserialize, Deserializer, Serialize, Serializer}; pub use bitcoin::types::H256Le; @@ -77,15 +76,19 @@ mod arithmetic { } } -#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize, std::hash::Hash))] +#[derive( + Serialize, Deserialize, Encode, Decode, Clone, PartialEq, Eq, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen, +)] +#[cfg_attr(feature = "std", derive(std::hash::Hash))] pub struct VaultCurrencyPair { pub collateral: CurrencyId, pub wrapped: CurrencyId, } -#[derive(Encode, Decode, Clone, PartialEq, Eq, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize, std::hash::Hash))] +#[derive( + Serialize, Deserialize, Encode, Decode, Clone, PartialEq, Eq, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen, +)] +#[cfg_attr(feature = "std", derive(std::hash::Hash))] pub struct VaultId { pub account_id: AccountId, pub currencies: VaultCurrencyPair, @@ -124,9 +127,9 @@ impl From<(AccountId, VaultCurrencyPair pub mod issue { use super::*; - #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] - #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] + #[derive(Serialize, Deserialize, Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Debug))] + #[serde(rename_all = "camelCase")] pub enum IssueRequestStatus { /// opened, but not yet executed or cancelled Pending, @@ -144,8 +147,8 @@ pub mod issue { // Due to a known bug in serde we need to specify how u128 is (de)serialized. // See https://github.com/paritytech/substrate/issues/4641 - #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] + #[derive(Serialize, Deserialize, Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Debug))] pub struct IssueRequest { /// the vault associated with this issue request pub vault: VaultId, @@ -186,9 +189,8 @@ pub mod issue { } } -#[derive(Eq, PartialEq, Encode, Decode, Default, TypeInfo)] -#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] -#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] +#[derive(Serialize, Deserialize, Eq, PartialEq, Encode, Decode, Default, TypeInfo)] +#[serde(rename_all = "camelCase")] /// a wrapper around a balance, used in RPC to workaround a bug where using u128 /// in runtime-apis fails. See pub struct BalanceWrapper { @@ -214,9 +216,9 @@ fn deserialize_from_string<'de, D: Deserializer<'de>, T: std::str::FromStr>(dese pub mod redeem { use super::*; - #[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] - #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] + #[derive(Serialize, Deserialize, Encode, Decode, Clone, Eq, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Debug))] + #[serde(rename_all = "camelCase")] pub enum RedeemRequestStatus { /// opened, but not yet executed or cancelled Pending, @@ -236,8 +238,8 @@ pub mod redeem { // Due to a known bug in serde we need to specify how u128 is (de)serialized. // See https://github.com/paritytech/substrate/issues/4641 - #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))] + #[derive(Serialize, Deserialize, Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Debug))] pub struct RedeemRequest { /// the vault associated with this redeem request pub vault: VaultId, @@ -283,9 +285,9 @@ pub mod redeem { pub mod replace { use super::*; - #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize, Eq))] - #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] + #[derive(Serialize, Deserialize, Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Debug, Eq))] + #[serde(rename_all = "camelCase")] pub enum ReplaceRequestStatus { /// accepted, but not yet executed or cancelled Pending, @@ -303,8 +305,8 @@ pub mod replace { // Due to a known bug in serde we need to specify how u128 is (de)serialized. // See https://github.com/paritytech/substrate/issues/4641 - #[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize, Eq))] + #[derive(Serialize, Deserialize, Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)] + #[cfg_attr(feature = "std", derive(Eq, Debug))] pub struct ReplaceRequest { /// the vault which has requested to be replaced pub old_vault: VaultId, @@ -344,9 +346,8 @@ pub mod replace { pub mod oracle { use super::*; - #[derive(Encode, Decode, Clone, Eq, PartialEq, Debug, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] - #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] + #[derive(Serialize, Deserialize, Encode, Decode, Clone, Eq, PartialEq, Debug, TypeInfo, MaxEncodedLen)] + #[serde(rename_all = "camelCase")] pub enum Key { ExchangeRate(CurrencyId), FeeEstimation, @@ -503,8 +504,7 @@ macro_rules! create_currency_id { } create_currency_id! { - #[derive(Encode, Decode, Eq, Hash, PartialEq, Copy, Clone, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] - #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] + #[derive(Serialize, Deserialize,Encode, Decode, Eq, Hash, PartialEq, Copy, Clone, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] #[cfg_attr(feature = "std", derive(EncodeAsType,DecodeAsType))] #[repr(u8)] pub enum TokenSymbol { @@ -518,9 +518,23 @@ create_currency_id! { } } -#[derive(Encode, Decode, Eq, Hash, PartialEq, Copy, Clone, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] -#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] +#[derive( + Serialize, + Deserialize, + Encode, + Decode, + Eq, + Hash, + PartialEq, + Copy, + Clone, + Debug, + PartialOrd, + Ord, + TypeInfo, + MaxEncodedLen, +)] +#[serde(rename_all = "camelCase")] #[cfg_attr(feature = "std", derive(EncodeAsType, DecodeAsType))] pub enum LpToken { Token(TokenSymbol), @@ -528,9 +542,23 @@ pub enum LpToken { StableLpToken(StablePoolId), } -#[derive(Encode, Decode, Eq, Hash, PartialEq, Copy, Clone, Debug, PartialOrd, Ord, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] -#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))] +#[derive( + Serialize, + Deserialize, + Encode, + Decode, + Eq, + Hash, + PartialEq, + Copy, + Clone, + Debug, + PartialOrd, + Ord, + TypeInfo, + MaxEncodedLen, +)] +#[serde(rename_all = "camelCase")] #[cfg_attr(feature = "std", derive(EncodeAsType, DecodeAsType))] pub enum CurrencyId { Token(TokenSymbol),