diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml new file mode 100644 index 00000000000..f41f9a52ef5 --- /dev/null +++ b/.github/workflows/build-artifacts.yml @@ -0,0 +1,118 @@ +name: "Build Artifacts" + +on: + workflow_dispatch: + push: + branches: + - fix-release + tags: + - '*' + +env: + DOCKER_USER_OPTION: '$UID:$GID' + SCCACHE_GCS_BUCKET: 'composable-build-artefacts' + RUSTC_WRAPPER: "/home/runner/.cargo/bin/sccache" + SCCACHE_GCS_RW_MODE: "READ_WRITE" + +jobs: + build-and-publish: + runs-on: + - self-hosted + - linux + - x64 + - sre + strategy: + fail-fast: true + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Set env + run: | + echo "RELEASE_VERSION=$(git tag --sort=committerdate | grep -E '^v[0-9]' | tail -1 )" >> $GITHUB_ENV + make version + + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + + - name: 🔨 Build and Upload Composable Binary + id: client_release + run: | + .maintain/client_release.sh + + - name: Build wasm with srtool + id: runtime_release + run: | + .maintain/runtime_release.sh + + - name: Upload Compact Picasso wasm # TODO only upload wasm that has changed + uses: svenstaro/upload-release-action@v2 + if: "$${{ env.picasso-wasm }} == 1" + with: + repo_token: ${{ secrets.COMPOSABLE_GITHUB_TOKEN }} + file: ./runtime/picasso/target/srtool/release/wbuild/picasso-runtime/picasso_runtime.compact.wasm + asset_name: picasso_runtime.compact.compressed.wasm + tag: ${{ github.ref }} + overwrite: true + + - name: Upload Compact Dali wasm # TODO only upload wasm that has changed + uses: svenstaro/upload-release-action@v2 + if: "$${{ env.dali-wasm }} == 1" + with: + repo_token: ${{ secrets.COMPOSABLE_GITHUB_TOKEN }} + file: ./runtime/dali/target/srtool/release/wbuild/dali-runtime/dali_runtime.compact.wasm + asset_name: dali_runtime.compact.compressed.wasm + tag: ${{ github.ref }} + overwrite: true + + - name: Upload Compact Composable wasm # TODO only upload wasm that has changed + uses: svenstaro/upload-release-action@v2 + if: "$${{ env.composable-wasm }} == 1" + with: + repo_token: ${{ secrets.COMPOSABLE_GITHUB_TOKEN }} + file: ./runtime/picasso/target/srtool/release/wbuild/composable-runtime/composable_runtime.compact.wasm + asset_name: composable_runtime.compact.compressed.wasm + tag: ${{ github.ref }} + overwrite: true + + - name: Upload Binary on Release # TODO Only upload binary if client files have changed + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.COMPOSABLE_GITHUB_TOKEN }} + file: target/release/composable + asset_name: composable + tag: ${{ github.ref }} + overwrite: true + + - name: Update Release Note + run: sed -i '1i # Code ' release.md + + - name: Release + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + body_path: release.md + token: ${{ secrets.COMPOSABLE_GITHUB_TOKEN }} + + + dali-chacha-client-release: + needs: [build-and-publish] + runs-on: + - self-hosted + - linux + - X64 + - ansible-runner + + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Set env + run: | + echo "RELEASE_VERSION=$(git tag --sort=committerdate | grep -E '^v[0-9]' | tail -1 )" >> $GITHUB_ENV + + - name: Run ansible playbook + run: ansible-playbook -l _environment_testnet client-upgrade.yml -i gcp.yaml --user runner -e 'ansible_python_interpreter=/usr/bin/python3' diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 30b3421baf7..d560e5e74e9 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -7,7 +7,7 @@ on: branches: - main - develop - - release/* + - releases push: branches: - main @@ -53,6 +53,8 @@ jobs: steps: - uses: actions/checkout@v2 - run: | + /home/runner/.cargo/bin/rustup install nightly-2021-11-29 + /home/runner/.cargo/bin/rustup target add --toolchain=nightly-2021-11-29 wasm32-unknown-unknown /home/runner/.cargo/bin/rustup show /home/runner/.cargo/bin/rustup override unset /home/runner/.cargo/bin/rustup show @@ -62,7 +64,7 @@ jobs: node-version: 14.x - name: Cargo fmt run: | - /home/runner/.cargo/bin/cargo fmt -- --check + /home/runner/.cargo/bin/cargo +nightly-2021-11-29 fmt -- --check - name: Hadolint env: HADOLINT_VERSION: v2.8.0 @@ -93,7 +95,7 @@ jobs: exit $total_exit_code - name: Cargo clippy run: | - /home/runner/.cargo/bin/cargo clippy -- -D warnings + SKIP_WASM_BUILD=1 /home/runner/.cargo/bin/cargo +nightly-2021-11-29 clippy -- -D warnings - name: Cargo udeps env: UDEPS_VERSION: v0.1.24 @@ -102,8 +104,8 @@ jobs: tar xzf "cargo-udeps-${UDEPS_VERSION}-x86_64-unknown-linux-gnu.tar.gz" cp "cargo-udeps-${UDEPS_VERSION}-x86_64-unknown-linux-gnu/cargo-udeps" ~/.cargo/bin/ rm -r "cargo-udeps-${UDEPS_VERSION}-x86_64-unknown-linux-gnu.tar.gz" "cargo-udeps-${UDEPS_VERSION}-x86_64-unknown-linux-gnu" - cargo udeps --version - SKIP_WASM_BUILD=1 cargo udeps --workspace --all-features + /home/runner/.cargo/bin/cargo +nightly-2021-11-29 udeps --version + SKIP_WASM_BUILD=1 /home/runner/.cargo/bin/cargo +nightly-2021-11-29 udeps --workspace --all-features continue-on-error: true # Often this turns gives false positives, due to the different ways that Substrate uses features. test: name: Unit Test @@ -118,7 +120,9 @@ jobs: run: curl -LsSf https://github.com/taiki-e/cargo-llvm-cov/releases/latest/download/cargo-llvm-cov-x86_64-unknown-linux-gnu.tar.gz | tar xzf - -C ~/.cargo/bin - name: Run Test (with coverage) run: | - SKIP_WASM_BUILD=1 /home/runner/.cargo/bin/cargo llvm-cov --workspace --lcov --output-path lcov.info + /home/runner/.cargo/bin/rustup install nightly-2021-11-29 + /home/runner/.cargo/bin/rustup component add llvm-tools-preview --toolchain=nightly-2021-11-29 + SKIP_WASM_BUILD=1 /home/runner/.cargo/bin/cargo +nightly-2021-11-29 llvm-cov --workspace --lcov --output-path lcov.info - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 with: diff --git a/.github/workflows/client-release.yml b/.github/workflows/client-release.yml deleted file mode 100644 index 94787c6d180..00000000000 --- a/.github/workflows/client-release.yml +++ /dev/null @@ -1,86 +0,0 @@ -name: "Community Release (Dali Chacha)" - -on: - push: - tags: - - '*' - branches: - - feature/add-cache-build - -env: - DOCKER_USER_OPTION: '$UID:$GID' - SCCACHE_GCS_BUCKET: 'composable-build-artefacts' - RUSTC_WRAPPER: "/home/runner/.cargo/bin/sccache" - SCCACHE_GCS_RW_MODE: "READ_WRITE" - -jobs: - build-and-publish: - runs-on: - - self-hosted - - linux - - x64 - - sre - strategy: - fail-fast: true - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Set env - run: | - echo "RELEASE_VERSION=$(git tag --sort=committerdate | grep -E '^v[0-9]' | tail -1 )" >> $GITHUB_ENV - make version - - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - - name: 🔨 Build - uses: actions-rs/cargo@v1 - with: - command: build - args: --release --bins - - - name: Archive build targets - run: | - tar -czvf composable-${{ env.RELEASE_VERSION }}.tar.gz target/release/ - tar -czvf composable-${{ env.RELEASE_VERSION }}.tar.gz target/release/composable - tar -czvf picasso_runtime.compact.wasm-${RELEASE_VERSION}.tar.gz target/release/wbuild/picasso-runtime/picasso_runtime.compact.wasm - tar -czvf parachain-utils-${RELEASE_VERSION}.tar.gz target/release/parachain-utils - gsutil cp *.tar.gz gs://composable-binaries/community-releases/${{ env.RELEASE_VERSION }}/ - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - - name: Build Docker image - run: make containerize-release - - - name: Docker push - run: make push-release - - dali-chacha-client-release: - needs: [build-and-publish] - runs-on: - - self-hosted - - linux - - X64 - - ansible-runner - - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Set env - run: | - echo "RELEASE_VERSION=$(git tag --sort=committerdate | grep -E '^v[0-9]' | tail -1 )" >> $GITHUB_ENV - - - name: Run ansible playbook - working-directory: "./.maintain/playbooks" - run: | - ansible-playbook -l _environment_testnet client-upgrade.yml -i gcp.yaml --user runner -e 'ansible_python_interpreter=/usr/bin/python3' - diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml new file mode 100644 index 00000000000..da0b1de8498 --- /dev/null +++ b/.github/workflows/docker-release.yml @@ -0,0 +1,45 @@ +name: "Docker Release" + +on: + workflow_dispatch: + push: + tags: + - '*' + +env: + DOCKER_USER_OPTION: '$UID:$GID' + SCCACHE_GCS_BUCKET: 'composable-build-artefacts' + RUSTC_WRAPPER: "/home/runner/.cargo/bin/sccache" + SCCACHE_GCS_RW_MODE: "READ_WRITE" + +jobs: + build-and-publish: + runs-on: + - self-hosted + - linux + - x64 + - sre + strategy: + fail-fast: true + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Set env + run: | + echo "RELEASE_VERSION=$(git tag --sort=committerdate | grep -E '^v[0-9]' | tail -1 )" >> $GITHUB_ENV + make version + + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + + - name: Build Docker image + run: make containerize-release + + - name: Docker push + run: make push-release + diff --git a/.github/workflows/picashot.yml b/.github/workflows/picashot.yml index bc6e60fccb1..97d860d765b 100644 --- a/.github/workflows/picashot.yml +++ b/.github/workflows/picashot.yml @@ -1,5 +1,6 @@ name: Check Runtime on: + workflow_dispatch: schedule: - cron: '0 0 * * *' jobs: @@ -16,3 +17,16 @@ jobs: run: | ansible-playbook -l _mainnet_collator_yes picashot.yml -i picasso-gcp.yaml --user root -e 'ansible_python_interpreter=/usr/bin/python3' + dalishot: + runs-on: + - self-hosted + - linux + - X64 + - ansible-runner + + steps: + - name: Run ansible playbook + working-directory: "./.maintain/playbooks" + run: | + ansible-playbook -l _collator_node_yes picashot.yml -i gcp.yaml --user runner -e 'ansible_python_interpreter=/usr/bin/python3' + diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index e2477eae05d..978ab894f75 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -3,7 +3,7 @@ on: push: branches: - main - - release/* + - releases jobs: update_release_draft: runs-on: ubuntu-latest diff --git a/.github/workflows/runtime-check.yml b/.github/workflows/runtime-check.yml index 6e4d03a6d8d..96d1e758692 100644 --- a/.github/workflows/runtime-check.yml +++ b/.github/workflows/runtime-check.yml @@ -2,21 +2,51 @@ name: Check Runtime on: push: branches: - - release-* + - releases - main pull_request: branches: - - release-* + - releases - main jobs: check-runtime: - runs-on: ubuntu-latest + runs-on: + - self-hosted + - linux + - x64 + - sre + if: github.event.pull_request.draft == false steps: - uses: actions/checkout@v2 with: fetch-depth: 0 - name: Check for runtime changes - working-directory: "./.maintain/" - run: | - sh check_runtime.sh + id: check_runtime + run: .maintain/check_runtime.sh + + - name: Echo output + run: echo ${{ env.RUNTIME_CHECK }} + + - name: Run Simnode + if: "$${{ env.RUNTIME_CHECK }} == 1" + id: run_simnode + run: .maintain/run_simnode.sh + + benchmark: + name: Benchmark + runs-on: + - self-hosted + - linux + - x64 + - bmark + if: github.event.pull_request.draft == false + steps: + - uses: actions/checkout@v2 + - name: Benchmark Test + if: "$${{ env.RUNTIME_CHECK }} == 1" + id: run_benchmarks + run: .maintain/run_benchmarks.sh + + + diff --git a/.maintain/check_runtime.sh b/.maintain/check_runtime.sh old mode 100644 new mode 100755 index 99825fd73ad..6a8332ba2a1 --- a/.maintain/check_runtime.sh +++ b/.maintain/check_runtime.sh @@ -1,103 +1,48 @@ -#!/bin/sh +#!/bin/bash # -# -# check for any changes in the node/src/runtime, frame/* and primitives/sr_* trees. if +# check for any changes in the runtime/ and frame/*. if # there are any changes found, it should mark the PR breaksconsensus and # "auto-fail" the PR if there isn't a change in the runtime/src/lib.rs file # that alters the version. -set -e # fail on any error +#set -e # fail on any error #shellcheck source=../common/lib.sh . "$(dirname "${0}")/./common/lib.sh" -VERSIONS_FILE="runtime/picasso/src/lib.rs" - -boldprint () { printf "|\n| \033[1m%s\033[0m\n|\n" "${@}"; } -boldcat () { printf "|\n"; while read -r l; do printf "| \033[1m%s\033[0m\n" "${l}"; done; printf "|\n" ; } - - -boldprint "latest 10 commits of ${GITHUB_REF_NAME}" -git log --graph --oneline --decorate=short -n 10 - - -boldprint "check if the wasm sources changed" -if ! has_runtime_changes origin/main "${GITHUB_REF_NAME}" -then - boldcat <<-EOT - - no changes to the runtime source code detected - - EOT - - exit 0 -fi - - - -# check for spec_version updates: if the spec versions changed, then there is -# consensus-critical logic that has changed. the runtime wasm blobs must be -# rebuilt. - -add_spec_version="$(git diff tags/release ${GITHUB_SHA} -- "${VERSIONS_FILE}" \ - | sed -n -r "s/^\+[[:space:]]+spec_version: +([0-9]+),$/\1/p")" -sub_spec_version="$(git diff tags/release ${GITHUB_SHA} -- "${VERSIONS_FILE}" \ - | sed -n -r "s/^\-[[:space:]]+spec_version: +([0-9]+),$/\1/p")" - - - -if [ "${add_spec_version}" != "${sub_spec_version}" ] -then - - boldcat <<-EOT - - changes to the runtime sources and changes in the spec version. - - spec_version: ${sub_spec_version} -> ${add_spec_version} - - EOT - exit 0 - -else - # check for impl_version updates: if only the impl versions changed, we assume - # there is no consensus-critical logic that has changed. - - add_impl_version="$(git diff tags/release ${GITHUB_SHA} -- "${VERSIONS_FILE}" \ - | sed -n -r 's/^\+[[:space:]]+impl_version: +([0-9]+),$/\1/p')" - sub_impl_version="$(git diff tags/release ${GITHUB_SHA} -- "${VERSIONS_FILE}" \ - | sed -n -r 's/^\-[[:space:]]+impl_version: +([0-9]+),$/\1/p')" - - - # see if the impl version changed - if [ "${add_impl_version}" != "${sub_impl_version}" ] - then - boldcat <<-EOT - - changes to the runtime sources and changes in the impl version. - - impl_version: ${sub_impl_version} -> ${add_impl_version} - - EOT - exit 0 - fi - - - boldcat <<-EOT - - wasm source files changed but not the spec/impl version. If changes made do not alter logic, - just bump 'impl_version'. If they do change logic, bump 'spec_version'. - - source file directories: - - frame/* - - runtime/* - - versions file: ${VERSIONS_FILE} - - EOT -fi +# shellcheck disable=SC2039 +VERSIONS_FILES=( + "runtime/picasso/src/lib.rs,picasso,picasso" + "runtime/dali/src/lib.rs,dali-chachacha,dali" + "runtime/composable/src/lib.rs,composable,composable" +) + + echo "latest 10 commits of ${GITHUB_REF_NAME}" + git log --graph --oneline --decorate=short -n 10 + + echo "make sure the main branch and release tag are available in shallow clones" + git fetch --depth="${GIT_DEPTH:-100}" origin main + git fetch --depth="${GIT_DEPTH:-100}" origin "${LATEST_TAG_NAME}" + git tag -f "${LATEST_TAG_NAME}" FETCH_HEAD + git log -n1 "${LATEST_TAG_NAME}" + +simnode_check() { + VERSIONS_FILE="$1" + if has_runtime_changes "${LATEST_TAG_NAME}" "${GITHUB_REF_NAME}" "$3" && check_runtime "$VERSIONS_FILE" "$2" + then + echo "Wasm sources have changed" + echo "RUNTIME_CHECK=1" >> "$GITHUB_ENV" + fi +} + +for i in "${VERSIONS_FILES[@]}"; do + while IFS=',' read -r output chain folder; do + echo "check if the wasm sources changed for $chain" + simnode_check $output $folder + done <<< "$i" +done # dropped through. there's something wrong; exit 1. - -exit 1 +exit 0 # vim: noexpandtab diff --git a/.maintain/client_release.sh b/.maintain/client_release.sh new file mode 100755 index 00000000000..2d7fe4e3492 --- /dev/null +++ b/.maintain/client_release.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# +# check for any changes in the runtime/ and frame/*. if +# there are any changes found, it should mark the PR breaksconsensus and +# "auto-fail" the PR if there isn't a change in the runtime/src/lib.rs file +# that alters the version. + +#set -e # fail on any error + +#shellcheck source=../common/lib.sh +. "$(dirname "${0}")/./common/lib.sh" + +RELEASE_VERSION=$(git tag --sort=committerdate | grep -E '^v[0-9]' | tail -1 ) + + +if has_client_changes "${LATEST_TAG_NAME}" "${GITHUB_REF_NAME}" +then + boldprint "Building new client binaries" + cargo build --release -p composable + tar -czvf composable-"${RELEASE_VERSION}".tar.gz target/release/composable + tar -czvf picasso_runtime.compact.wasm-"${RELEASE_VERSION}".tar.gz runtime/picasso/target/srtool/release/wbuild/picasso-runtime/picasso_runtime.compact.wasm + gsutil cp *.tar.gz gs://composable-binaries/community-releases/"${RELEASE_VERSION}"/ +fi diff --git a/.maintain/common/lib.sh b/.maintain/common/lib.sh index 9721ba3ec7a..2f4607703e1 100644 --- a/.maintain/common/lib.sh +++ b/.maintain/common/lib.sh @@ -1,24 +1,32 @@ -#!/bin/sh +#!/bin/bash api_base="https://api.github.com/repos" +GITHUB_REF_NAME=$(git rev-parse --abbrev-ref HEAD) # Function to take 2 git tags/commits and get any lines from commit messages # that contain something that looks like a PR reference: e.g., (#1234) -sanitised_git_logs(){ +sanitised_git_logs() { git --no-pager log --pretty=format:"%s" "$1...$2" | - # Only find messages referencing a PR - grep -E '\(#[0-9]+\)' | - # Strip any asterisks - sed 's/^* //g' | - # And add them all back - sed 's/^/* /g' + # Only find messages referencing a PR + grep -E '\(#[0-9]+\)' | + # Strip any asterisks + sed 's/^* //g' | + # And add them all back + sed 's/^/* /g' } +get_latest_release() { + curl --silent "https://api.github.com/repos/$1/releases/latest" | # Get latest release from GitHub api + grep '"tag_name":' | # Get tag line + sed -E 's/.*"([^"]+)".*/\1/' # Pluck JSON value +} +LATEST_TAG_NAME=$(get_latest_release ComposableFi/composable) + # Returns the last published release on github # Note: we can't just use /latest because that ignores prereleases # repo: 'organization/repo' # Usage: last_github_release "$repo" -last_github_release(){ +last_github_release() { i=0 # Iterate over releases until we find the last release that's not just a draft while [ $i -lt 29 ]; do @@ -34,11 +42,12 @@ last_github_release(){ done } + # Checks whether a tag on github has been verified # repo: 'organization/repo' # tagver: 'v1.2.3' # Usage: check_tag $repo $tagver -check_tag () { +check_tag() { repo=$1 tagver=$2 tag_out=$(curl -H "Authorization: token $GITHUB_RELEASE_TOKEN" -s "$api_base/$repo/git/refs/tags/$tagver") @@ -57,12 +66,13 @@ check_tag () { fi } + # Checks whether a given PR has a given label. # repo: 'organization/repo' # pr_id: 12345 # label: B1-silent # Usage: has_label $repo $pr_id $label -has_label(){ +has_label() { repo="$1" pr_id="$2" label="$3" @@ -86,9 +96,9 @@ has_label(){ # Usage: structure_message $content $formatted_content (optional) structure_message() { if [ -z "$2" ]; then - body=$(jq -Rs --arg body "$1" '{"msgtype": "m.text", $body}' < /dev/null) + body=$(jq -Rs --arg body "$1" '{"msgtype": "m.text", $body}' ${add_spec_version} + + EOT + return 0 + + else + # check for impl_version updates: if only the impl versions changed, we assume + # there is no consensus-critical logic that has changed. + + add_impl_version="$(git diff "${LATEST_TAG_NAME}" "${GITHUB_REF_NAME}" -- "${VERSIONS_FILE}" | + sed -n -r 's/^\+[[:space:]]+impl_version: +([0-9]+),$/\1/p')" + sub_impl_version="$(git diff "${LATEST_TAG_NAME}" "${GITHUB_REF_NAME}" -- "${VERSIONS_FILE}" | + sed -n -r 's/^\-[[:space:]]+impl_version: +([0-9]+),$/\1/p')" + + # see if the impl version changed + if [ "${add_impl_version}" != "${sub_impl_version}" ]; then + boldcat <<-EOT + + changes to the runtime sources and changes in the impl version. + + impl_version: ${sub_impl_version} -> ${add_impl_version} + + EOT + return 0 + fi + + boldcat <<-EOT + + wasm source files changed but not the spec/impl version. If changes made do not alter logic, + just bump 'impl_version'. If they do change logic, bump 'spec_version'. + + source file directories: + - frame/* + - runtime/$2/* + + versions file: ${VERSIONS_FILE} + + EOT + return 1 + fi +} diff --git a/.maintain/playbooks/client-upgrade.yml b/.maintain/playbooks/client-upgrade.yml index 09afc8e8ca3..eeb76c2b8c5 100644 --- a/.maintain/playbooks/client-upgrade.yml +++ b/.maintain/playbooks/client-upgrade.yml @@ -1,44 +1,44 @@ --- - - hosts: all - vars: - release_version: "{{ lookup('env','RELEASE_VERSION') }}" - tasks: - - name: Stop Composable service - become: true - command: supervisorctl stop composable - - - name: Download composable binary {{ release_version }} - become: yes - get_url: - url: https://storage.googleapis.com/composable-binaries/community-releases/{{ release_version }}/composable-{{ release_version }}.tar.gz - dest: ~/ - mode: "+x" +- hosts: all + vars: + release_version: "{{ lookup('env','RELEASE_VERSION') }}" + tasks: + - name: Stop Composable service + become: true + command: supervisorctl stop composable + + - name: Download composable binary {{ release_version }} + become: yes + get_url: + url: https://storage.googleapis.com/composable-binaries/community-releases/{{ release_version }}/composable-{{ release_version }}.tar.gz + dest: ~/ + mode: "+x" + + + - name: Unpack Composable Bonary file + become: yes + unarchive: + src: ~/composable-{{ release_version }}.tar.gz + dest: ~/ + remote_src: yes - - - name: Unpack Composable Bonary file - become: yes - unarchive: - src: ~/composable-{{ release_version }}.tar.gz - dest: ~/ - remote_src: yes - - - - name: Move composable binary to /usr/local/bin/composable - become: yes - command: mv ~/target/release/composable /usr/bin/composable - - - name: Change Composable file permission - become: yes - file: - path: /usr/bin/composable - owner: "composable" - group: "composable" - - - name: Check Version - become: yes - command: composable --version - - - - name: Start Composable service - become: true - command: supervisorctl start composable + + - name: Move composable binary to /usr/local/bin/composable + become: yes + command: mv ~/target/release/composable /usr/bin/composable + + - name: Change Composable file permission + become: yes + file: + path: /usr/bin/composable + owner: "composable" + group: "composable" + + - name: Check Version + become: yes + command: composable --version + + + - name: Start Composable service + become: true + command: supervisorctl start composable diff --git a/.maintain/playbooks/gcp.yaml b/.maintain/playbooks/gcp.yaml index 7f7ce90470b..fdfded539f6 100644 --- a/.maintain/playbooks/gcp.yaml +++ b/.maintain/playbooks/gcp.yaml @@ -1,19 +1,19 @@ --- - plugin: gcp_compute - projects: - - composable-ops-5568 - hostname: - - name - keyed_groups: - - key: labels - groups: - collator-node: "collator' in (labels|list)" - bootnode: "'bootnode' in (labels|list)" - validator-node: "'validator' in (labels|list)" - rpc-node: "'rpc' in (labels|list)" - testnode: "testnode' in (labels|list)" - filters: [] - auth_kind: serviceaccount - service_account_file: /opt/ansible/inventory/new.json - vars: - - ansible_python_interpreter: /usr/bin/python3 +plugin: gcp_compute +projects: + - composable-ops-5568 +hostname: + - name +keyed_groups: + - key: labels +groups: + collator-node: "collator' in (labels|list)" + bootnode: "'bootnode' in (labels|list)" + validator-node: "'validator' in (labels|list)" + rpc-node: "'rpc' in (labels|list)" + testnode: "testnode' in (labels|list)" +filters: [] +auth_kind: serviceaccount +service_account_file: /opt/ansible/inventory/new.json +vars: + - ansible_python_interpreter: /usr/bin/python3 diff --git a/.maintain/playbooks/picashot.yml b/.maintain/playbooks/picashot.yml index 7b48b91752c..39c22bb04e4 100644 --- a/.maintain/playbooks/picashot.yml +++ b/.maintain/playbooks/picashot.yml @@ -11,7 +11,7 @@ HOST=$(echo $HOSTNAME) FILENAME=$HOST-$DATE.zip BACKUP_DIR="/var/lib/composable-data/chains" - GS_BUCKET="composable-picasso-data-sync" + GS_BUCKET="picasso-data-store" zip -r $FILENAME $BACKUP_DIR gsutil mv $FILENAME gs://$GS_BUCKET/ args: diff --git a/.maintain/playbooks/runtime-upgrade.yml b/.maintain/playbooks/runtime-upgrade.yml index 25304b0cd3a..9984dda4fa6 100644 --- a/.maintain/playbooks/runtime-upgrade.yml +++ b/.maintain/playbooks/runtime-upgrade.yml @@ -1,64 +1,64 @@ --- - - hosts: all - vars: - chain: "{{ lookup('env','CHAIN') }}" - release_version: "{{ lookup('env','RELEASE_VERSION') }}" - root_key: "{{ lookup('env','ROOT_KEY') }}" - tasks: - - name: Stop Composable service - become: true - command: supervisorctl stop composable +- hosts: all + vars: + chain: "{{ lookup('env','CHAIN') }}" + release_version: "{{ lookup('env','RELEASE_VERSION') }}" + root_key: "{{ lookup('env','ROOT_KEY') }}" + tasks: + - name: Stop Composable service + become: true + command: supervisorctl stop composable + + - name: Download WASM runtime {{ release_version }} + become: yes + get_url: + url: https://storage.googleapis.com/composable-binaries/community-releases/{{ chain }}/picasso_runtime.compact.wasm-{{ release_version }}.tar.gz + dest: ~/ + mode: "+x" - - name: Download WASM runtime {{ release_version }} - become: yes - get_url: - url: https://storage.googleapis.com/composable-binaries/community-releases/{{ chain }}/picasso_runtime.compact.wasm-{{ release_version }}.tar.gz - dest: ~/ - mode: "+x" - - - name: Download Parachain utils {{ release_version }} - become: yes - get_url: - url: https://storage.googleapis.com/composable-binaries/community-releases/{{ chain }}/parachain-utils-{{ release_version }}.tar.gz - dest: ~/ - mode: "+x" - - - name: Unpack WASM runtime file - become: yes - unarchive: - src: ~/picasso_runtime.compact.wasm-{{ release_version }}.tar.gz - dest: ~/ - remote_src: yes + - name: Download Parachain utils {{ release_version }} + become: yes + get_url: + url: https://storage.googleapis.com/composable-binaries/community-releases/{{ chain }}/parachain-utils-{{ release_version }}.tar.gz + dest: ~/ + mode: "+x" - - name: Unpack WASM runtime file - become: yes - unarchive: - src: ~/picasso_runtime.compact.wasm-{{ release_version }}.tar.gz - dest: ~/ - remote_src: yes - - - name: Unpack Parachain utils - become: yes - unarchive: - src: ~/parachain-utils-{{ release_version }}.tar.gz - dest: ~/ - remote_src: yes - - - name: Move parachain-utils binary to /usr/local/bin/ - become: yes - command: mv ~/target/release/parachain-utils /usr/bin/parachain-utils - - - name: Change Parachain utils file permission - become: yes - file: - path: /usr/bin/parachain-utils - owner: "composable" - group: "composable" - - - name: Runtime Upgrade - become: yes - command: parachain-utils upgrade-runtime --path ~/target/release/picasso_runtime.compact.wasm - - - name: Start Composable service - become: true - command: supervisorctl start composable + - name: Unpack WASM runtime file + become: yes + unarchive: + src: ~/picasso_runtime.compact.wasm-{{ release_version }}.tar.gz + dest: ~/ + remote_src: yes + + - name: Unpack WASM runtime file + become: yes + unarchive: + src: ~/picasso_runtime.compact.wasm-{{ release_version }}.tar.gz + dest: ~/ + remote_src: yes + + - name: Unpack Parachain utils + become: yes + unarchive: + src: ~/parachain-utils-{{ release_version }}.tar.gz + dest: ~/ + remote_src: yes + + - name: Move parachain-utils binary to /usr/local/bin/ + become: yes + command: mv ~/target/release/parachain-utils /usr/bin/parachain-utils + + - name: Change Parachain utils file permission + become: yes + file: + path: /usr/bin/parachain-utils + owner: "composable" + group: "composable" + + - name: Runtime Upgrade + become: yes + command: parachain-utils upgrade-runtime --path ~/target/release/picasso_runtime.compact.wasm + + - name: Start Composable service + become: true + command: supervisorctl start composable diff --git a/.maintain/run_benchmarks.sh b/.maintain/run_benchmarks.sh new file mode 100755 index 00000000000..754fc847acc --- /dev/null +++ b/.maintain/run_benchmarks.sh @@ -0,0 +1,85 @@ +#!/bin/bash +# +# Runs benchmarks for runtimes whose files have changed. + +#set -e # fail on any error + +#shellcheck source=../common/lib.sh +. "$(dirname "${0}")/./common/lib.sh" + +VERSIONS_FILES=( + "runtime/picasso/src/weights,picasso-dev,picasso" + "runtime/dali/src/weights,dali-dev,dali" + "runtime/composable/src/weights,composable-dev,composable" +) + +steps=50 +repeat=20 + +pallets=( + oracle + frame_system + timestamp + session + balances + indices + membership + treasury + scheduler + collective + democracy + collator_selection + utility + lending + dutch_auction +) + + echo "make sure the main branch and release tag are available in shallow clones" + git fetch --depth="${GIT_DEPTH:-100}" origin main + git fetch --depth="${GIT_DEPTH:-100}" origin "${LATEST_TAG_NAME}" + git tag -f "${LATEST_TAG_NAME}" FETCH_HEAD + git log -n1 "${LATEST_TAG_NAME}" + + +/home/runner/.cargo/bin/rustup install nightly +/home/runner/.cargo/bin/rustup target add wasm32-unknown-unknown --toolchain nightly +/home/runner/.cargo/bin/cargo build --release -p composable --features=runtime-benchmarks + +run_benchmarks() { + OUTPUT=$1 + CHAIN=$2 + FOLDER=$3 + # shellcheck disable=SC2068 + echo "Running benchmarks for $CHAIN" + # shellcheck disable=SC2068 + for p in ${pallets[@]}; do + ./target/release/composable benchmark \ + --chain="$CHAIN" \ + --execution=wasm \ + --wasm-execution=compiled \ + --pallet="$p" \ + --extrinsic='*' \ + --steps=$steps \ + --repeat=$repeat \ + --raw \ + --output="$OUTPUT" + done + git config --global user.email "haroldsphinx@gmail.com" + git config --global user.name "haroldsphinx" + USERNAME=$(gcloud secrets versions access latest --secret=github-api-username) + PASSWORD=$(gcloud secrets versions access latest --secret=github-api-token) + git remote set-url origin https://"$USERNAME":"$PASSWORD"@github.com/ComposableFi/composable.git + git pull origin "$GITHUB_REF_NAME" + git add runtime/"$FOLDER" + git commit -m "Updates weights for $CHAIN" + git push origin "$GITHUB_REF_NAME" + # ToDO: Setup gpg signing and create a bot account for pushing +} + +for i in "${VERSIONS_FILES[@]}"; do + while IFS=',' read -r output chain folder; do + if has_runtime_changes "${LATEST_TAG_NAME}" "${GITHUB_REF_NAME}" "$folder"; then + run_benchmarks $output $chain $folder + fi + done <<<"$i" +done diff --git a/.maintain/run_simnode.sh b/.maintain/run_simnode.sh new file mode 100755 index 00000000000..a4dde9334cc --- /dev/null +++ b/.maintain/run_simnode.sh @@ -0,0 +1,43 @@ +#!/bin/bash +# +# Runs simnode for runtimes whose files have changed. + +#set -e # fail on any error + +#shellcheck source=../common/lib.sh +. "$(dirname "${0}")/./common/lib.sh" + +# shellcheck disable=SC2039 +VERSIONS_FILES=( + "picasso,picasso" + "dali-chachacha,dali" + # "composable,composable" # TODO: add simnode suppport for composable +) + +/home/runner/.cargo/bin/rustup update nightly +/home/runner/.cargo/bin/rustup target add wasm32-unknown-unknown --toolchain nightly +/home/runner/.cargo/bin/cargo build --release -p simnode +sudo chown -R runner:runner target/release/simnode && sudo chmod +x target/release/simnode +sudo chown -R runner:runner /tmp/db +YDATE=$(date -d yesterday +'%m-%d-%Y') + +run_simnode() { + CHAIN="$1" + echo "Running simnode for $CHAIN" + FILENAME=cl-1-$YDATE.zip + GS_BUCKET="$CHAIN-data-store" + sudo gsutil cp gs://$GS_BUCKET/"$FILENAME" . + sudo unzip -o "$FILENAME" -d /tmp/db + ./target/release/simnode --chain="$CHAIN" --base-path=/tmp/db/ --pruning=archive --execution=wasm +} + +# shellcheck disable=SC2039 +for i in "${VERSIONS_FILES[@]}"; do + while IFS=',' read -r chain folder; do + echo "check if the wasm sources changed for $chain" + if has_runtime_changes "${LATEST_TAG_NAME}" "${GITHUB_REF_NAME}" "$folder"; then + # shellcheck disable=SC2086 + run_simnode $chain + fi + done <<<"$i" +done diff --git a/.maintain/runtime_release.sh b/.maintain/runtime_release.sh new file mode 100755 index 00000000000..6328a93a405 --- /dev/null +++ b/.maintain/runtime_release.sh @@ -0,0 +1,44 @@ +#!/bin/bash +# +# check for any changes in the runtime/ and frame/*. if +# there are any changes found, it should mark the PR breaksconsensus and +# "auto-fail" the PR if there isn't a change in the runtime/src/lib.rs file +# that alters the version. + +#set -e # fail on any error + +#shellcheck source=../common/lib.sh +. "$(dirname "${0}")/./common/lib.sh" + +# shellcheck disable=SC2039 +VERSIONS_FILES=( + "runtime/picasso/src/lib.rs,picasso,picasso" + # "runtime/dali/src/lib.rs,dali-chachacha,dali" + # "runtime/composable/src/lib.rs,composable,composable" +) + +# Install the neccessary tools needed for building +cargo install --git https://github.com/chevdor/srtool-cli +cargo install --locked --git https://github.com/chevdor/subwasm --tag v0.16.1 + + +build_runtime () { + chain=$3 + # srtool for reproducible builds + srtool build --package "$chain"-runtime --profile release --runtime-dir runtime/"$chain" + # subwasm for runtime metadata + echo "# $chain Runtime " >> release.md + subwasm info ./runtime/"$chain"/target/srtool/release/wbuild/"$chain"-runtime/"$chain"_runtime.compact.wasm >> release.md +} + +# Check which runtimes have changed and build them +for i in "${VERSIONS_FILES[@]}"; do + while IFS=',' read -r output chain folder; do + echo "check if the wasm sources changed for $chain" + if has_runtime_changes "${LATEST_TAG_NAME}" "${GITHUB_REF_NAME}" "$folder" + then + build_runtime $output $chain $folder + echo "$chain-wasm=1" >> "$GITHUB_ENV" + fi + done <<< "$i" +done diff --git a/Cargo.lock b/Cargo.lock index f65bf0f2bff..05655644377 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -581,7 +581,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "beefy-primitives", "fnv", @@ -609,7 +609,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -629,12 +629,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "parity-scale-codec", "scale-info", @@ -3085,7 +3085,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "parity-scale-codec", ] @@ -3103,7 +3103,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support", "frame-system", @@ -3123,7 +3123,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "Inflector", "chrono", @@ -3149,7 +3149,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support", "frame-system", @@ -3163,7 +3163,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support", "frame-system", @@ -3191,7 +3191,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "bitflags", "frame-metadata", @@ -3220,7 +3220,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -3232,7 +3232,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.0", @@ -3244,7 +3244,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "proc-macro2 1.0.36", "quote 1.0.14", @@ -3254,7 +3254,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support", "log 0.4.14", @@ -3271,7 +3271,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -3286,7 +3286,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "parity-scale-codec", "sp-api", @@ -3295,7 +3295,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support", "sp-api", @@ -6361,7 +6361,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support", "frame-system", @@ -6377,7 +6377,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support", "frame-system", @@ -6393,7 +6393,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support", "frame-system", @@ -6408,7 +6408,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -6432,7 +6432,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6452,7 +6452,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -6467,7 +6467,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "beefy-primitives", "frame-support", @@ -6483,7 +6483,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -6532,7 +6532,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -6649,7 +6649,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -6756,7 +6756,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -6801,7 +6801,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6843,7 +6843,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -6876,7 +6876,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -6899,7 +6899,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6915,7 +6915,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -6935,7 +6935,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -7004,7 +7004,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -7021,7 +7021,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -7039,7 +7039,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support", "frame-system", @@ -7055,7 +7055,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -7072,7 +7072,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -7087,7 +7087,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support", "frame-system", @@ -7101,7 +7101,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support", "frame-system", @@ -7118,7 +7118,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7197,7 +7197,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -7212,7 +7212,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support", "frame-system", @@ -7226,7 +7226,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support", "frame-system", @@ -7240,7 +7240,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -7256,7 +7256,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support", "frame-system", @@ -7277,7 +7277,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -7293,7 +7293,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support", "frame-system", @@ -7307,7 +7307,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7330,7 +7330,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2 1.0.36", @@ -7341,7 +7341,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "log 0.4.14", "sp-arithmetic", @@ -7350,7 +7350,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support", "frame-system", @@ -7364,7 +7364,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -7382,7 +7382,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -7421,7 +7421,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-support", "frame-system", @@ -7438,7 +7438,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -7455,7 +7455,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -7466,7 +7466,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -7510,7 +7510,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -7571,7 +7571,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-benchmarking", "frame-support", @@ -9941,7 +9941,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "env_logger 0.9.0", "jsonrpsee 0.4.1", @@ -10336,7 +10336,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "log 0.4.14", "sp-core", @@ -10347,7 +10347,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-trait", "derive_more", @@ -10374,7 +10374,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "futures 0.3.19", "futures-timer 3.0.2", @@ -10397,7 +10397,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -10413,7 +10413,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.2", @@ -10430,7 +10430,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2 1.0.36", @@ -10441,7 +10441,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "chrono", "fdlimit", @@ -10479,7 +10479,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "fnv", "futures 0.3.19", @@ -10507,7 +10507,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "hash-db", "kvdb", @@ -10532,7 +10532,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-trait", "futures 0.3.19", @@ -10556,7 +10556,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-trait", "derive_more", @@ -10585,7 +10585,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-trait", "derive_more", @@ -10628,7 +10628,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "derive_more", "futures 0.3.19", @@ -10652,7 +10652,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "fork-tree", "parity-scale-codec", @@ -10665,7 +10665,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "assert_matches", "async-trait", @@ -10701,7 +10701,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-trait", "futures 0.3.19", @@ -10727,7 +10727,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "sc-client-api", "sp-authorship", @@ -10738,7 +10738,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "lazy_static", "libsecp256k1", @@ -10765,7 +10765,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "derive_more", "environmental", @@ -10783,7 +10783,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "log 0.4.14", "parity-scale-codec", @@ -10799,7 +10799,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "cfg-if 1.0.0", "libc", @@ -10817,7 +10817,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-trait", "derive_more", @@ -10854,7 +10854,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "derive_more", "finality-grandpa", @@ -10878,7 +10878,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "ansi_term", "futures 0.3.19", @@ -10895,7 +10895,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-trait", "derive_more", @@ -10910,7 +10910,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-std", "async-trait", @@ -10961,7 +10961,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "futures 0.3.19", "futures-timer 3.0.2", @@ -10977,7 +10977,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "bytes 1.1.0", "fnv", @@ -11005,7 +11005,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "futures 0.3.19", "libp2p", @@ -11018,7 +11018,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "log 0.4.14", "substrate-prometheus-endpoint", @@ -11027,7 +11027,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "futures 0.3.19", "hash-db", @@ -11058,7 +11058,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "futures 0.3.19", "jsonrpc-core", @@ -11083,7 +11083,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "futures 0.3.19", "jsonrpc-core", @@ -11100,7 +11100,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-trait", "directories", @@ -11164,7 +11164,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "log 0.4.14", "parity-scale-codec", @@ -11178,7 +11178,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -11200,7 +11200,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "chrono", "futures 0.3.19", @@ -11218,7 +11218,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "ansi_term", "atty", @@ -11249,7 +11249,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2 1.0.36", @@ -11260,7 +11260,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "futures 0.3.19", "intervalier", @@ -11287,7 +11287,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "derive_more", "futures 0.3.19", @@ -11301,7 +11301,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "futures 0.3.19", "futures-timer 3.0.2", @@ -11840,7 +11840,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "hash-db", "log 0.4.14", @@ -11857,7 +11857,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "blake2-rfc", "proc-macro-crate 1.1.0", @@ -11869,7 +11869,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "parity-scale-codec", "scale-info", @@ -11882,7 +11882,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "integer-sqrt", "num-traits", @@ -11897,7 +11897,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "parity-scale-codec", "scale-info", @@ -11910,7 +11910,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-trait", "parity-scale-codec", @@ -11922,7 +11922,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "parity-scale-codec", "sp-api", @@ -11934,7 +11934,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "futures 0.3.19", "log 0.4.14", @@ -11952,7 +11952,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-trait", "futures 0.3.19", @@ -11971,7 +11971,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-trait", "parity-scale-codec", @@ -11989,7 +11989,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-trait", "merlin", @@ -12012,7 +12012,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "parity-scale-codec", "scale-info", @@ -12024,7 +12024,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -12036,7 +12036,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "base58", "bitflags", @@ -12084,7 +12084,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "blake2-rfc", "byteorder", @@ -12097,7 +12097,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "proc-macro2 1.0.36", "quote 1.0.14", @@ -12108,7 +12108,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "kvdb", "parking_lot 0.11.2", @@ -12117,7 +12117,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "proc-macro2 1.0.36", "quote 1.0.14", @@ -12127,7 +12127,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "environmental", "parity-scale-codec", @@ -12138,7 +12138,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "finality-grandpa", "log 0.4.14", @@ -12156,7 +12156,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -12170,7 +12170,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "futures 0.3.19", "hash-db", @@ -12194,7 +12194,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "lazy_static", "sp-core", @@ -12205,7 +12205,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-trait", "derive_more", @@ -12222,7 +12222,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "zstd", ] @@ -12230,7 +12230,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "parity-scale-codec", "scale-info", @@ -12245,7 +12245,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2 1.0.36", @@ -12256,7 +12256,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "sp-api", "sp-core", @@ -12266,7 +12266,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "backtrace", "lazy_static", @@ -12276,7 +12276,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "rustc-hash", "serde", @@ -12286,7 +12286,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "either", "hash256-std-hasher", @@ -12308,7 +12308,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -12325,7 +12325,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "Inflector", "proc-macro-crate 1.1.0", @@ -12337,7 +12337,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "serde", "serde_json", @@ -12346,7 +12346,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "parity-scale-codec", "scale-info", @@ -12360,7 +12360,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "parity-scale-codec", "scale-info", @@ -12371,7 +12371,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "hash-db", "log 0.4.14", @@ -12394,12 +12394,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "impl-serde", "parity-scale-codec", @@ -12412,7 +12412,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "log 0.4.14", "sp-core", @@ -12425,7 +12425,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -12441,7 +12441,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "parity-scale-codec", "sp-std", @@ -12453,7 +12453,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "sp-api", "sp-runtime", @@ -12462,7 +12462,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-trait", "log 0.4.14", @@ -12478,7 +12478,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "hash-db", "memory-db", @@ -12493,7 +12493,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "impl-serde", "parity-scale-codec", @@ -12509,7 +12509,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "parity-scale-codec", "proc-macro2 1.0.36", @@ -12520,7 +12520,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -12729,7 +12729,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "platforms", ] @@ -12737,7 +12737,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.19", @@ -12759,7 +12759,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "async-std", "derive_more", @@ -12826,7 +12826,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "ansi_term", "build-helper", @@ -13540,7 +13540,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#1681b1e8a82d7189b1fe32fe054a421a0cb96c0c" +source = "git+https://github.com/composableFi/substrate?branch=polkadot-v0.9.13#375db2b94b52da8420ceebcd77b4896aff960413" dependencies = [ "jsonrpsee 0.4.1", "log 0.4.14", diff --git a/docker/Dockerfile b/docker/Dockerfile index fb443c9fe85..4a0fcee9977 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -20,16 +20,15 @@ LABEL description="Precompiled Docker image for Composable" \ image.documentation="https://github.com/ComposableFi/composable#readme" SHELL ["/bin/bash", "-o", "pipefail", "-c"] -RUN curl "https://storage.googleapis.com/composable-binaries/community-releases/${VERSION}/composable-${VERSION}.tar.gz" | tar -xz - -RUN chmod +x target/release/composable && mv target/release/composable /usr/local/bin - -RUN useradd -m -u 1001 -U -s /bin/sh -d /composable composable && \ +RUN curl "https://storage.googleapis.com/composable-binaries/community-releases/${VERSION}/composable-${VERSION}.tar.gz" | tar -xz \ + chmod +x target/release/composable && mv target/release/composable /usr/local/bin \ + useradd -m -u 1001 -U -s /bin/sh -d /composable composable && \ mkdir -p /composable/.local/share/local_testnet && \ mkdir /data && \ chown -R composable:composable /data && \ chown -R composable:composable /composable/.local/share/local_testnet && \ ln -s /data /composable/.local/share/local_testnet + USER composable EXPOSE 30333 9933 9944 9615 diff --git a/frame/assets-registry/Cargo.toml b/frame/assets-registry/Cargo.toml index 12fb5feb14b..a4f1d109066 100644 --- a/frame/assets-registry/Cargo.toml +++ b/frame/assets-registry/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/frame/assets/Cargo.toml b/frame/assets/Cargo.toml index a81b1c8ce36..5a933d365da 100644 --- a/frame/assets/Cargo.toml +++ b/frame/assets/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/frame/bonded-finance/Cargo.toml b/frame/bonded-finance/Cargo.toml index 5b38f6e4bc7..a103c6ab1d1 100644 --- a/frame/bonded-finance/Cargo.toml +++ b/frame/bonded-finance/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/frame/call-filter/Cargo.toml b/frame/call-filter/Cargo.toml index 4ad49e6cb19..eb73435e785 100644 --- a/frame/call-filter/Cargo.toml +++ b/frame/call-filter/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + [dependencies] serde = { version = "1.0.124", optional = true } diff --git a/frame/composable-traits/Cargo.toml b/frame/composable-traits/Cargo.toml index 50c7936ee1c..96f552d286d 100644 --- a/frame/composable-traits/Cargo.toml +++ b/frame/composable-traits/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/frame/composable-traits/src/rate_model.rs b/frame/composable-traits/src/rate_model.rs index adebe31a0ed..acd8fdde8fa 100644 --- a/frame/composable-traits/src/rate_model.rs +++ b/frame/composable-traits/src/rate_model.rs @@ -135,10 +135,12 @@ impl InterestRate for InterestRateModel { match self { Self::Jump(jump) => jump.get_borrow_rate(utilization), Self::Curve(curve) => curve.get_borrow_rate(utilization), - Self::DynamicPIDController(dynamic_pid_model) => - dynamic_pid_model.get_borrow_rate(utilization), - Self::DoubleExponent(double_exponents_model) => - double_exponents_model.get_borrow_rate(utilization), + Self::DynamicPIDController(dynamic_pid_model) => { + dynamic_pid_model.get_borrow_rate(utilization) + }, + Self::DoubleExponent(double_exponents_model) => { + double_exponents_model.get_borrow_rate(utilization) + }, } } } @@ -173,11 +175,11 @@ impl JumpModel { ) -> Option { let model = Self { base_rate, jump_rate, full_rate, target_utilization }; - if model.base_rate <= Self::MAX_BASE_RATE && - model.jump_rate <= Self::MAX_JUMP_RATE && - model.full_rate <= Self::MAX_FULL_RATE && - model.base_rate <= model.jump_rate && - model.jump_rate <= model.full_rate + if model.base_rate <= Self::MAX_BASE_RATE + && model.jump_rate <= Self::MAX_JUMP_RATE + && model.full_rate <= Self::MAX_FULL_RATE + && model.base_rate <= model.jump_rate + && model.jump_rate <= model.full_rate { Some(model) } else { @@ -284,8 +286,8 @@ impl DynamicPIDControllerModel { utilization_ratio: FixedU128, ) -> Result { // compute error term `et = uo - ut` - let et: i128 = self.uo.into_inner().try_into().unwrap_or(0_i128) - - utilization_ratio.into_inner().try_into().unwrap_or(0_i128); + let et: i128 = self.uo.into_inner().try_into().unwrap_or(0_i128) + - utilization_ratio.into_inner().try_into().unwrap_or(0_i128); let et: FixedI128 = FixedI128::from_inner(et); // compute proportional term `pt = kp * et` let pt = self.kp.checked_mul(&et).ok_or(ArithmeticError::Overflow)?; @@ -341,7 +343,7 @@ impl InterestRate for DynamicPIDControllerModel { // const NINE: usize = 9; let utilization: Rate = utilization.into(); if let Ok(interest_rate) = Self::get_output_utilization_ratio(self, utilization) { - return Some(interest_rate) + return Some(interest_rate); } None } @@ -367,7 +369,7 @@ impl DoubleExponentModel { pub fn new_model(coefficients: [u8; 16]) -> Option { let sum_of_coefficients = coefficients.iter().fold(0_u16, |acc, &c| acc + c as u16); if sum_of_coefficients == EXPECTED_COEFFICIENTS_SUM { - return Some(DoubleExponentModel { coefficients }) + return Some(DoubleExponentModel { coefficients }); } None } @@ -474,9 +476,9 @@ mod tests { let excess_util = utilization.saturating_sub(target_utilization); assert_eq!( borrow_rate, - (jump_model.full_rate - jump_model.jump_rate).saturating_mul(excess_util.into()) / - FixedU128::saturating_from_rational(20, 100) + - normal_rate, + (jump_model.full_rate - jump_model.jump_rate).saturating_mul(excess_util.into()) + / FixedU128::saturating_from_rational(20, 100) + + normal_rate, ); } @@ -526,10 +528,10 @@ mod tests { // collection alternative to define arbitrary and proptest attributes with filtering // overall cardinality is small, so should work well // here we have one liner, not sure why in code we have many lines.... - base <= jump && - jump <= full && base <= &JumpModel::MAX_BASE_RATE && - jump <= &JumpModel::MAX_JUMP_RATE && - full <= &JumpModel::MAX_FULL_RATE + base <= jump + && jump <= full && base <= &JumpModel::MAX_BASE_RATE + && jump <= &JumpModel::MAX_JUMP_RATE + && full <= &JumpModel::MAX_FULL_RATE }) .prop_map(|(base_rate, jump_percentage, full_percentage, target_utilization)| { JumpModelStrategy { @@ -571,15 +573,15 @@ mod tests { let x2 = 75; let y1 = jump_model.get_borrow_rate(Percent::from_percent(x1)).unwrap(); let y2 = jump_model.get_borrow_rate(Percent::from_percent(x2)).unwrap(); - let s1 = (y2 - y1) / - (FixedU128::saturating_from_integer(x2) - FixedU128::saturating_from_integer(x1)); + let s1 = (y2 - y1) + / (FixedU128::saturating_from_integer(x2) - FixedU128::saturating_from_integer(x1)); let x1 = 81; let x2 = 86; let y1 = jump_model.get_borrow_rate(Percent::from_percent(x1)).unwrap(); let y2 = jump_model.get_borrow_rate(Percent::from_percent(x2)).unwrap(); - let s2 = (y2 - y1) / - (FixedU128::saturating_from_integer(x2) - FixedU128::saturating_from_integer(x1)); + let s2 = (y2 - y1) + / (FixedU128::saturating_from_integer(x2) - FixedU128::saturating_from_integer(x1)); assert!(s1 < s2, "slope after target is growing faster") } diff --git a/frame/crowdloan-rewards/Cargo.toml b/frame/crowdloan-rewards/Cargo.toml index 89a7984825c..c9ac573167e 100644 --- a/frame/crowdloan-rewards/Cargo.toml +++ b/frame/crowdloan-rewards/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/frame/currency-factory/Cargo.toml b/frame/currency-factory/Cargo.toml index 44542404a77..e0bea308917 100644 --- a/frame/currency-factory/Cargo.toml +++ b/frame/currency-factory/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/frame/curve-amm/Cargo.toml b/frame/curve-amm/Cargo.toml index 09f9d4c18d6..971c34d3671 100644 --- a/frame/curve-amm/Cargo.toml +++ b/frame/curve-amm/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/frame/dutch-auction/Cargo.toml b/frame/dutch-auction/Cargo.toml index f98a549fb44..5d8e4871299 100644 --- a/frame/dutch-auction/Cargo.toml +++ b/frame/dutch-auction/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] @@ -65,5 +65,4 @@ runtime-benchmarks = [ "frame-benchmarking", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - "pallet-assets/runtime-benchmarks", ] diff --git a/frame/governance-registry/Cargo.toml b/frame/governance-registry/Cargo.toml index d9da42e056b..b871df12b97 100644 --- a/frame/governance-registry/Cargo.toml +++ b/frame/governance-registry/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/frame/lending/Cargo.toml b/frame/lending/Cargo.toml index 56d6c75a725..b73946ec3ad 100644 --- a/frame/lending/Cargo.toml +++ b/frame/lending/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/frame/liquidations/Cargo.toml b/frame/liquidations/Cargo.toml index 89a12c7efe5..24f422a5ba4 100644 --- a/frame/liquidations/Cargo.toml +++ b/frame/liquidations/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/frame/oracle/Cargo.toml b/frame/oracle/Cargo.toml index 953dd708cdb..778724b1c96 100644 --- a/frame/oracle/Cargo.toml +++ b/frame/oracle/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/frame/ping/Cargo.toml b/frame/ping/Cargo.toml index 170bb9c6813..94028b7baf2 100644 --- a/frame/ping/Cargo.toml +++ b/frame/ping/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + name = "pallet-ping" version = "0.1.0" diff --git a/frame/transaction-fee/Cargo.toml b/frame/transaction-fee/Cargo.toml index 4333f7a02a0..776276fc037 100644 --- a/frame/transaction-fee/Cargo.toml +++ b/frame/transaction-fee/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/frame/uniswap-v2/Cargo.toml b/frame/uniswap-v2/Cargo.toml index 93aed2fc847..15926b1d827 100644 --- a/frame/uniswap-v2/Cargo.toml +++ b/frame/uniswap-v2/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/frame/vault/Cargo.toml b/frame/vault/Cargo.toml index fb7d849ff3d..69889b22649 100644 --- a/frame/vault/Cargo.toml +++ b/frame/vault/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml index 2807f9d0205..19487c20e18 100644 --- a/frame/vesting/Cargo.toml +++ b/frame/vesting/Cargo.toml @@ -5,7 +5,7 @@ version = "0.0.1" authors = ["Composable Developers"] homepage = "https://composable.finance" edition = "2021" -rust-version = "1.56" + [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index 58cd6a274a9..1ce356507ab 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -2,7 +2,7 @@ name = "integration-tests" version = "0.1.0" edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/node/src/command.rs b/node/src/command.rs index eea0854c081..666de25cfa9 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -14,6 +14,10 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +#[cfg(feature = "composable")] +use crate::service::ComposableExecutor; +#[cfg(feature = "dali")] +use crate::service::DaliExecutor; use crate::{ chain_spec, @@ -269,7 +273,14 @@ pub fn run() -> Result<()> { if cfg!(feature = "runtime-benchmarks") { let runner = cli.create_runner(cmd)?; - runner.sync_run(|config| cmd.run::(config)) + runner.sync_run(|config| match config.chain_spec.id() { + id if id.contains("picasso") => cmd.run::(config), + #[cfg(feature = "dali")] + id if id.contains("dali") => cmd.run::(config), + #[cfg(feature = "composable")] + id if id.contains("composable") => cmd.run::(config), + id => panic!("Unknown Id: {}", id), + }) } else { Err("Benchmarking wasn't enabled when building the node. \ You can enable it with `--features runtime-benchmarks`." diff --git a/node/src/res/picasso.json b/node/src/res/picasso.json index c7c90e07b75..57fd6b210f8 100644 --- a/node/src/res/picasso.json +++ b/node/src/res/picasso.json @@ -3,9 +3,9 @@ "id": "picasso", "chainType": "Live", "bootNodes": [ - "/dns/picasso-bn1.composable.finance/tcp/30334/p2p/12D3KooWJUwiZN4ePCwgbEM7AxJ4U2SaTrrgzkppFQxDmDhXXX2x", - "/dns/picasso-bn2.composable.finance/tcp/30334/p2p/12D3KooWD4M96HiuBUvhZZ8jmSzic4V6cWWvxFGPa7XAZnubmLtX", - "/dns/picasso-bn3.composable.finance/tcp/30334/p2p/12D3KooWASeF5JW1HGvpH46r9UzTBh77TfP4z8VPQ1RuyiKf34JN" + "/dns/picasso-bn1.composable.finance/tcp/30334/p2p/12D3KooWNh6vJ8ZypaXGJDQmxrDs8TC1HTNyPDSF9dfe1waFLaHD", + "/dns/picasso-bn2.composable.finance/tcp/30334/p2p/12D3KooWAKCft1b38awDNhCzV82Rb8qfRVyJv7E1pCEE95aoBzfs", + "/dns/picasso-bn3.composable.finance/tcp/30334/p2p/12D3KooWKTTnduPVwdmZS29AZaSSSTP6TXBv3FQ6r775bqC8o6gJ" ], "telemetryEndpoints": [ [ diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index eadb1ff28cd..54db6067563 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -3,7 +3,7 @@ name = "common" version = "0.8.30" authors = ["Composable Developers "] edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/runtime/composable/Cargo.toml b/runtime/composable/Cargo.toml index 669c0afd8c4..aefcf9e9b39 100644 --- a/runtime/composable/Cargo.toml +++ b/runtime/composable/Cargo.toml @@ -2,7 +2,7 @@ name = "composable-runtime" version = "0.1.0" edition = "2021" -rust-version = "1.56" + description = "Composable, Polkadot Parachain Runtime Implementation" authors = ["Seun Lanlege "] @@ -26,7 +26,7 @@ normal = [ [dependencies] frame-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -support = { package = "frame-support", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } # primitives @@ -127,7 +127,7 @@ std = [ "sp-block-builder/std", "sp-transaction-pool/std", "sp-inherents/std", - "support/std", + "frame-support/std", "executive/std", "frame-system/std", "utility/std", @@ -179,7 +179,7 @@ runtime-benchmarks = [ "assets/runtime-benchmarks", "balances/runtime-benchmarks", "benchmarking", - "support/runtime-benchmarks", + "frame-support/runtime-benchmarks", "system-benchmarking", "frame-system/runtime-benchmarks", "hex-literal", diff --git a/runtime/composable/src/lib.rs b/runtime/composable/src/lib.rs index ca3fdaca001..306ecf946e8 100644 --- a/runtime/composable/src/lib.rs +++ b/runtime/composable/src/lib.rs @@ -43,7 +43,7 @@ use sp_version::RuntimeVersion; use sp_runtime::traits::AccountIdConversion; // A few exports that help ease life for downstream crates. -pub use support::{ +pub use frame_support::{ construct_runtime, match_type, parameter_types, traits::{Contains, Everything, KeyOwnerProofSystem, Nothing, Randomness, StorageInfo}, weights::{ @@ -55,11 +55,11 @@ pub use support::{ }; use codec::Encode; +use frame_support::traits::EqualPrivilegeOnly; use frame_system as system; #[cfg(any(feature = "std", test))] pub use sp_runtime::BuildStorage; pub use sp_runtime::{FixedPointNumber, Perbill, Permill, Perquintill}; -use support::traits::EqualPrivilegeOnly; use system::{ limits::{BlockLength, BlockWeights}, EnsureRoot, @@ -827,10 +827,10 @@ impl_runtime_apis! { impl benchmarking::Benchmark for Runtime { fn benchmark_metadata(extra: bool) -> ( Vec, - Vec, + Vec, ) { use benchmarking::{list_benchmark, Benchmarking, BenchmarkList}; - use support::traits::StorageInfoTrait; + use frame_support::traits::StorageInfoTrait; use system_benchmarking::Pallet as SystemBench; let mut list = Vec::::new(); diff --git a/runtime/composable/src/weights/balances.rs b/runtime/composable/src/weights/balances.rs index 6e6dd646fbd..effdccc6e5a 100644 --- a/runtime/composable/src/weights/balances.rs +++ b/runtime/composable/src/weights/balances.rs @@ -1,63 +1,73 @@ -//! Autogenerated weights for balances + +//! Autogenerated weights for `balances` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-22, STEPS: `[5, ]`, REPEAT: 2, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("composable-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=composable-dev // --execution=wasm // --wasm-execution=compiled // --pallet=balances // --extrinsic=* -// --steps=5 -// --repeat=2 +// --steps=50 +// --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/composable/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for balances. +/// Weight functions for `balances`. pub struct WeightInfo(PhantomData); impl balances::WeightInfo for WeightInfo { + // Storage: System Account (r:2 w:2) fn transfer() -> Weight { - (139_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + (84_077_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) } + // Storage: System Account (r:1 w:1) fn transfer_keep_alive() -> Weight { - (81_000_000 as Weight) + (49_893_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: System Account (r:1 w:1) fn set_balance_creating() -> Weight { - (47_000_000 as Weight) + (28_200_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: System Account (r:1 w:1) fn set_balance_killing() -> Weight { - (54_000_000 as Weight) + (34_293_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: System Account (r:3 w:3) fn force_transfer() -> Weight { - (110_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + (84_155_000 as Weight) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) } + // Storage: System Account (r:1 w:1) fn transfer_all() -> Weight { - (100_000_000 as Weight) + (61_279_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - + // Storage: System Account (r:1 w:1) fn force_unreserve() -> Weight { - (0 as Weight) + (26_083_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } } diff --git a/runtime/composable/src/weights/collator_selection.rs b/runtime/composable/src/weights/collator_selection.rs index 8e7427027e1..734a112334b 100644 --- a/runtime/composable/src/weights/collator_selection.rs +++ b/runtime/composable/src/weights/collator_selection.rs @@ -1,52 +1,93 @@ + +//! Autogenerated weights for `collator_selection` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("composable-dev"), DB CACHE: 128 + +// Executed Command: +// ./target/release/composable +// benchmark +// --chain=composable-dev +// --execution=wasm +// --wasm-execution=compiled +// --pallet=collator_selection +// --extrinsic=* +// --steps=50 +// --repeat=20 +// --raw +// --output=runtime/composable/src/weights + +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weights for pallet_collator_selection using the Substrate node and recommended hardware. +/// Weight functions for `collator_selection`. pub struct WeightInfo(PhantomData); impl collator_selection::WeightInfo for WeightInfo { - fn set_invulnerables(b: u32) -> Weight { - (18_563_000 as Weight) + // Storage: CollatorSelection Invulnerables (r:0 w:1) + fn set_invulnerables(b: u32, ) -> Weight { + (15_646_000 as Weight) // Standard Error: 0 - .saturating_add((68_000 as Weight).saturating_mul(b as Weight)) + .saturating_add((40_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: CollatorSelection DesiredCandidates (r:0 w:1) fn set_desired_candidates() -> Weight { - (16_363_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (13_953_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: CollatorSelection CandidacyBond (r:0 w:1) fn set_candidacy_bond() -> Weight { - (16_840_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (14_437_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn register_as_candidate(c: u32) -> Weight { - (71_196_000 as Weight) - // Standard Error: 0 - .saturating_add((198_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) + // Storage: CollatorSelection Candidates (r:1 w:1) + // Storage: CollatorSelection DesiredCandidates (r:1 w:0) + // Storage: CollatorSelection Invulnerables (r:1 w:0) + // Storage: Session NextKeys (r:1 w:0) + // Storage: CollatorSelection CandidacyBond (r:1 w:0) + // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) + fn register_as_candidate(c: u32, ) -> Weight { + (89_736_000 as Weight) + // Standard Error: 1_000 + .saturating_add((173_000 as Weight).saturating_mul(c as Weight)) + .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn leave_intent(c: u32) -> Weight { - (55_336_000 as Weight) - // Standard Error: 0 - .saturating_add((151_000 as Weight).saturating_mul(c as Weight)) + // Storage: CollatorSelection Candidates (r:1 w:1) + // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) + fn leave_intent(c: u32, ) -> Weight { + (81_766_000 as Weight) + // Standard Error: 1_000 + .saturating_add((240_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } + // Storage: System Account (r:2 w:2) + // Storage: System BlockWeight (r:1 w:1) + // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn note_author() -> Weight { - (71_461_000 as Weight) + (61_512_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } - fn new_session(r: u32, c: u32) -> Weight { + // Storage: CollatorSelection Candidates (r:1 w:1) + // Storage: CollatorSelection LastAuthoredBlock (r:1000 w:1) + // Storage: System Account (r:1 w:1) + // Storage: CollatorSelection Invulnerables (r:1 w:0) + // Storage: System BlockWeight (r:1 w:1) + fn new_session(r: u32, c: u32, ) -> Weight { (0 as Weight) - // Standard Error: 1_010_000 - .saturating_add((109_961_000 as Weight).saturating_mul(r as Weight)) - // Standard Error: 1_010_000 - .saturating_add((151_952_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) + // Standard Error: 4_493_000 + .saturating_add((22_945_000 as Weight).saturating_mul(r as Weight)) + // Standard Error: 4_493_000 + .saturating_add((118_123_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight))) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(c as Weight))) + .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(c as Weight))) } } diff --git a/runtime/composable/src/weights/collective.rs b/runtime/composable/src/weights/collective.rs index 6fc9ddebf28..9558ace3227 100644 --- a/runtime/composable/src/weights/collective.rs +++ b/runtime/composable/src/weights/collective.rs @@ -1,13 +1,14 @@ -//! Autogenerated weights for collective + +//! Autogenerated weights for `collective` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-24, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("composable-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=composable-dev // --execution=wasm // --wasm-execution=compiled // --pallet=collective @@ -15,106 +16,144 @@ // --steps=50 // --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/composable/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for collective. +/// Weight functions for `collective`. pub struct WeightInfo(PhantomData); impl collective::WeightInfo for WeightInfo { - fn set_members(m: u32, _n: u32, p: u32) -> Weight { + // Storage: Council Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: Council Voting (r:100 w:100) + // Storage: Council Prime (r:0 w:1) + fn set_members(m: u32, n: u32, p: u32, ) -> Weight { (0 as Weight) - // Standard Error: 63_000 - .saturating_add((25_207_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 63_000 - .saturating_add((33_546_000 as Weight).saturating_mul(p as Weight)) + // Standard Error: 209_000 + .saturating_add((11_995_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 209_000 + .saturating_add((179_000 as Weight).saturating_mul(n as Weight)) + // Standard Error: 209_000 + .saturating_add((23_116_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight))) .saturating_add(T::DbWeight::get().writes(2 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) } - fn execute(b: u32, m: u32) -> Weight { - (30_323_000 as Weight) + // Storage: Council Members (r:1 w:0) + fn execute(b: u32, m: u32, ) -> Weight { + (20_657_000 as Weight) // Standard Error: 0 - .saturating_add((5_000 as Weight).saturating_mul(b as Weight)) + .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) // Standard Error: 0 - .saturating_add((127_000 as Weight).saturating_mul(m as Weight)) + .saturating_add((93_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) } - fn propose_execute(b: u32, m: u32) -> Weight { - (38_575_000 as Weight) + // Storage: Council Members (r:1 w:0) + // Storage: Council ProposalOf (r:1 w:0) + fn propose_execute(b: u32, m: u32, ) -> Weight { + (25_129_000 as Weight) // Standard Error: 0 .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) - // Standard Error: 3_000 - .saturating_add((254_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 0 + .saturating_add((176_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) } - fn propose_proposed(b: u32, m: u32, p: u32) -> Weight { - (48_131_000 as Weight) + // Storage: Council Members (r:1 w:0) + // Storage: Council ProposalOf (r:1 w:1) + // Storage: Council Proposals (r:1 w:1) + // Storage: Council ProposalCount (r:1 w:1) + // Storage: Council Voting (r:0 w:1) + fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight { + (34_266_000 as Weight) // Standard Error: 0 - .saturating_add((18_000 as Weight).saturating_mul(b as Weight)) - // Standard Error: 7_000 - .saturating_add((147_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 7_000 - .saturating_add((909_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((10_000 as Weight).saturating_mul(b as Weight)) + // Standard Error: 2_000 + .saturating_add((105_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 2_000 + .saturating_add((425_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } - fn vote(m: u32) -> Weight { - (75_974_000 as Weight) - // Standard Error: 4_000 - .saturating_add((370_000 as Weight).saturating_mul(m as Weight)) + // Storage: Council Members (r:1 w:0) + // Storage: Council Voting (r:1 w:1) + fn vote(m: u32, ) -> Weight { + (42_847_000 as Weight) + // Standard Error: 3_000 + .saturating_add((198_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn close_early_disapproved(m: u32, p: u32) -> Weight { - (63_575_000 as Weight) - // Standard Error: 5_000 - .saturating_add((293_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 5_000 - .saturating_add((761_000 as Weight).saturating_mul(p as Weight)) + // Storage: Council Voting (r:1 w:1) + // Storage: Council Members (r:1 w:0) + // Storage: Council Proposals (r:1 w:1) + // Storage: Council ProposalOf (r:0 w:1) + fn close_early_disapproved(m: u32, p: u32, ) -> Weight { + (42_813_000 as Weight) + // Standard Error: 2_000 + .saturating_add((189_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 2_000 + .saturating_add((356_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn close_early_approved(b: u32, m: u32, p: u32) -> Weight { - (86_824_000 as Weight) + // Storage: Council Voting (r:1 w:1) + // Storage: Council Members (r:1 w:0) + // Storage: Council ProposalOf (r:1 w:1) + // Storage: Council Proposals (r:1 w:1) + fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight { + (51_855_000 as Weight) // Standard Error: 0 - .saturating_add((12_000 as Weight).saturating_mul(b as Weight)) - // Standard Error: 8_000 - .saturating_add((321_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 8_000 - .saturating_add((860_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((8_000 as Weight).saturating_mul(b as Weight)) + // Standard Error: 2_000 + .saturating_add((195_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 2_000 + .saturating_add((424_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn close_disapproved(m: u32, p: u32) -> Weight { - (70_231_000 as Weight) - // Standard Error: 7_000 - .saturating_add((323_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 6_000 - .saturating_add((784_000 as Weight).saturating_mul(p as Weight)) + // Storage: Council Voting (r:1 w:1) + // Storage: Council Members (r:1 w:0) + // Storage: Council Prime (r:1 w:0) + // Storage: Council Proposals (r:1 w:1) + // Storage: Council ProposalOf (r:0 w:1) + fn close_disapproved(m: u32, p: u32, ) -> Weight { + (48_871_000 as Weight) + // Standard Error: 2_000 + .saturating_add((181_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 2_000 + .saturating_add((349_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn close_approved(b: u32, m: u32, p: u32) -> Weight { - (92_370_000 as Weight) - // Standard Error: 1_000 - .saturating_add((11_000 as Weight).saturating_mul(b as Weight)) - // Standard Error: 10_000 - .saturating_add((327_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 9_000 - .saturating_add((899_000 as Weight).saturating_mul(p as Weight)) + // Storage: Council Voting (r:1 w:1) + // Storage: Council Members (r:1 w:0) + // Storage: Council Prime (r:1 w:0) + // Storage: Council ProposalOf (r:1 w:1) + // Storage: Council Proposals (r:1 w:1) + fn close_approved(b: u32, m: u32, p: u32, ) -> Weight { + (54_571_000 as Weight) + // Standard Error: 0 + .saturating_add((9_000 as Weight).saturating_mul(b as Weight)) + // Standard Error: 2_000 + .saturating_add((207_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 2_000 + .saturating_add((418_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn disapprove_proposal(p: u32) -> Weight { - (35_489_000 as Weight) - // Standard Error: 4_000 - .saturating_add((830_000 as Weight).saturating_mul(p as Weight)) + // Storage: Council Proposals (r:1 w:1) + // Storage: Council Voting (r:0 w:1) + // Storage: Council ProposalOf (r:0 w:1) + fn disapprove_proposal(p: u32, ) -> Weight { + (25_921_000 as Weight) + // Standard Error: 1_000 + .saturating_add((412_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } diff --git a/runtime/composable/src/weights/democracy.rs b/runtime/composable/src/weights/democracy.rs index 0b528a6d67e..afc2f6a013f 100644 --- a/runtime/composable/src/weights/democracy.rs +++ b/runtime/composable/src/weights/democracy.rs @@ -1,13 +1,14 @@ -//! Autogenerated weights for democracy + +//! Autogenerated weights for `democracy` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-24, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("composable-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=composable-dev // --execution=wasm // --wasm-execution=compiled // --pallet=democracy @@ -15,176 +16,248 @@ // --steps=50 // --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/composable/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for democracy. +/// Weight functions for `democracy`. pub struct WeightInfo(PhantomData); impl democracy::WeightInfo for WeightInfo { + // Storage: Democracy PublicPropCount (r:1 w:1) + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:0) + // Storage: Democracy DepositOf (r:0 w:1) fn propose() -> Weight { - (112_082_000 as Weight) + (74_909_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn second(s: u32) -> Weight { - (56_014_000 as Weight) - // Standard Error: 3_000 - .saturating_add((349_000 as Weight).saturating_mul(s as Weight)) + // Storage: Democracy DepositOf (r:1 w:1) + fn second(s: u32, ) -> Weight { + (38_710_000 as Weight) + // Standard Error: 1_000 + .saturating_add((240_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn vote_new(r: u32) -> Weight { - (62_157_000 as Weight) - // Standard Error: 4_000 - .saturating_add((512_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + fn vote_new(r: u32, ) -> Weight { + (43_131_000 as Weight) + // Standard Error: 1_000 + .saturating_add((246_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn vote_existing(r: u32) -> Weight { - (62_708_000 as Weight) - // Standard Error: 4_000 - .saturating_add((495_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + fn vote_existing(r: u32, ) -> Weight { + (43_407_000 as Weight) + // Standard Error: 1_000 + .saturating_add((225_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy Cancellations (r:1 w:1) fn emergency_cancel() -> Weight { - (38_669_000 as Weight) + (25_856_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn blacklist(p: u32) -> Weight { - (113_805_000 as Weight) - // Standard Error: 9_000 - .saturating_add((998_000 as Weight).saturating_mul(p as Weight)) + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy Blacklist (r:0 w:1) + // Storage: Democracy DepositOf (r:1 w:1) + // Storage: System Account (r:2 w:2) + fn blacklist(p: u32, ) -> Weight { + (89_295_000 as Weight) + // Standard Error: 6_000 + .saturating_add((566_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(6 as Weight)) .saturating_add(T::DbWeight::get().writes(7 as Weight)) } - fn external_propose(v: u32) -> Weight { - (19_088_000 as Weight) + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:0) + fn external_propose(v: u32, ) -> Weight { + (13_453_000 as Weight) // Standard Error: 0 - .saturating_add((113_000 as Weight).saturating_mul(v as Weight)) + .saturating_add((91_000 as Weight).saturating_mul(v as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_majority() -> Weight { - (4_287_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (2_844_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_default() -> Weight { - (4_227_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (2_886_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:1) + // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn fast_track() -> Weight { - (38_917_000 as Weight) + (26_634_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn veto_external(v: u32) -> Weight { - (40_067_000 as Weight) - // Standard Error: 0 - .saturating_add((172_000 as Weight).saturating_mul(v as Weight)) + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:1) + fn veto_external(v: u32, ) -> Weight { + (29_471_000 as Weight) + // Standard Error: 2_000 + .saturating_add((113_000 as Weight).saturating_mul(v as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn cancel_proposal(p: u32) -> Weight { - (69_372_000 as Weight) - // Standard Error: 5_000 - .saturating_add((991_000 as Weight).saturating_mul(p as Weight)) + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy DepositOf (r:1 w:1) + // Storage: System Account (r:2 w:2) + fn cancel_proposal(p: u32, ) -> Weight { + (65_565_000 as Weight) + // Standard Error: 2_000 + .saturating_add((518_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } + // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn cancel_referendum() -> Weight { - (23_073_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (16_176_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn cancel_queued(r: u32) -> Weight { - (36_184_000 as Weight) - // Standard Error: 32_000 - .saturating_add((6_334_000 as Weight).saturating_mul(r as Weight)) + // Storage: Scheduler Lookup (r:1 w:1) + // Storage: Scheduler Agenda (r:1 w:1) + fn cancel_queued(r: u32, ) -> Weight { + (30_608_000 as Weight) + // Standard Error: 2_000 + .saturating_add((1_570_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn on_initialize_base(r: u32) -> Weight { - (0 as Weight) - // Standard Error: 44_000 - .saturating_add((8_834_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) + // Storage: Democracy LowestUnbaked (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:0) + // Storage: Democracy ReferendumInfoOf (r:1 w:0) + fn on_initialize_base(r: u32, ) -> Weight { + (5_773_000 as Weight) + // Standard Error: 5_000 + .saturating_add((5_338_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - - fn on_initialize_base_with_launch_period(_r: u32) -> Weight { - (0 as Weight) + // Storage: Democracy LowestUnbaked (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:0) + // Storage: Democracy LastTabledWasExternal (r:1 w:0) + // Storage: Democracy NextExternal (r:1 w:0) + // Storage: Democracy PublicProps (r:1 w:0) + // Storage: Democracy ReferendumInfoOf (r:1 w:0) + fn on_initialize_base_with_launch_period(r: u32, ) -> Weight { + (14_026_000 as Weight) + // Standard Error: 4_000 + .saturating_add((5_334_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(5 as Weight)) + .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - - fn delegate(r: u32) -> Weight { - (67_447_000 as Weight) - // Standard Error: 64_000 - .saturating_add((11_600_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy VotingOf (r:3 w:3) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + fn delegate(r: u32, ) -> Weight { + (57_660_000 as Weight) + // Standard Error: 4_000 + .saturating_add((7_064_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes(4 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) } - fn undelegate(r: u32) -> Weight { - (37_144_000 as Weight) - // Standard Error: 36_000 - .saturating_add((10_896_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy VotingOf (r:2 w:2) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + fn undelegate(r: u32, ) -> Weight { + (26_308_000 as Weight) + // Standard Error: 6_000 + .saturating_add((7_096_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes(2 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) } + // Storage: Democracy PublicProps (r:0 w:1) fn clear_public_proposals() -> Weight { - (4_006_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_131_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn note_preimage(b: u32) -> Weight { - (61_302_000 as Weight) + // Storage: Democracy Preimages (r:1 w:1) + fn note_preimage(b: u32, ) -> Weight { + (42_010_000 as Weight) // Standard Error: 0 .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn note_imminent_preimage(b: u32) -> Weight { - (39_217_000 as Weight) + // Storage: Democracy Preimages (r:1 w:1) + fn note_imminent_preimage(b: u32, ) -> Weight { + (27_462_000 as Weight) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) + .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn reap_preimage(b: u32) -> Weight { - (53_786_000 as Weight) + // Storage: Democracy Preimages (r:1 w:1) + // Storage: System Account (r:1 w:0) + fn reap_preimage(b: u32, ) -> Weight { + (39_771_000 as Weight) // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) + .saturating_add((1_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn unlock_remove(r: u32) -> Weight { - (54_249_000 as Weight) - // Standard Error: 4_000 - .saturating_add((313_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + // Storage: System Account (r:1 w:1) + fn unlock_remove(r: u32, ) -> Weight { + (37_208_000 as Weight) + // Standard Error: 1_000 + .saturating_add((114_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn unlock_set(r: u32) -> Weight { - (48_885_000 as Weight) - // Standard Error: 4_000 - .saturating_add((486_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + // Storage: System Account (r:1 w:1) + fn unlock_set(r: u32, ) -> Weight { + (36_216_000 as Weight) + // Standard Error: 2_000 + .saturating_add((191_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn remove_vote(r: u32) -> Weight { - (25_483_000 as Weight) - // Standard Error: 3_000 - .saturating_add((508_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + fn remove_vote(r: u32, ) -> Weight { + (20_278_000 as Weight) + // Standard Error: 1_000 + .saturating_add((193_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn remove_other_vote(r: u32) -> Weight { - (26_969_000 as Weight) - // Standard Error: 3_000 - .saturating_add((289_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + fn remove_other_vote(r: u32, ) -> Weight { + (20_174_000 as Weight) + // Standard Error: 2_000 + .saturating_add((193_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/runtime/composable/src/weights/frame_system.rs b/runtime/composable/src/weights/frame_system.rs index 940dabf0cb2..6fbe3abd35d 100644 --- a/runtime/composable/src/weights/frame_system.rs +++ b/runtime/composable/src/weights/frame_system.rs @@ -1,63 +1,69 @@ -//! Autogenerated weights for frame_system + +//! Autogenerated weights for `frame_system` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-22, STEPS: `[5, ]`, REPEAT: 2, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("composable-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=composable-dev // --execution=wasm // --wasm-execution=compiled // --pallet=frame_system // --extrinsic=* -// --steps=5 -// --repeat=2 +// --steps=50 +// --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/composable/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for frame_system. +/// Weight functions for `frame_system`. pub struct WeightInfo(PhantomData); impl frame_system::WeightInfo for WeightInfo { - fn remark(_b: u32) -> Weight { - (1_381_000 as Weight) - } - fn remark_with_event(b: u32) -> Weight { + fn remark(b: u32, ) -> Weight { (0 as Weight) // Standard Error: 0 .saturating_add((1_000 as Weight).saturating_mul(b as Weight)) } - fn set_heap_pages() -> Weight { - (3_000_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + fn remark_with_event(b: u32, ) -> Weight { + (17_383_000 as Weight) + // Standard Error: 0 + .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) } - fn set_changes_trie_config() -> Weight { - (15_000_000 as Weight) + // Storage: System Digest (r:1 w:1) + // Storage: unknown [0x3a686561707061676573] (r:0 w:1) + fn set_heap_pages() -> Weight { + (5_140_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn set_storage(i: u32) -> Weight { - (25_491_000 as Weight) - // Standard Error: 28_000 - .saturating_add((962_000 as Weight).saturating_mul(i as Weight)) + // Storage: Skipped Metadata (r:0 w:0) + fn set_storage(i: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 0 + .saturating_add((845_000 as Weight).saturating_mul(i as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) } - fn kill_storage(i: u32) -> Weight { - (23_657_000 as Weight) - // Standard Error: 55_000 - .saturating_add((676_000 as Weight).saturating_mul(i as Weight)) + // Storage: Skipped Metadata (r:0 w:0) + fn kill_storage(i: u32, ) -> Weight { + (508_000 as Weight) + // Standard Error: 1_000 + .saturating_add((556_000 as Weight).saturating_mul(i as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) } - fn kill_prefix(p: u32) -> Weight { - (13_414_000 as Weight) - // Standard Error: 77_000 - .saturating_add((1_634_000 as Weight).saturating_mul(p as Weight)) + // Storage: Skipped Metadata (r:0 w:0) + fn kill_prefix(p: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 1_000 + .saturating_add((898_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) } } diff --git a/runtime/composable/src/weights/indices.rs b/runtime/composable/src/weights/indices.rs index 912228be72d..64fe48b69c4 100644 --- a/runtime/composable/src/weights/indices.rs +++ b/runtime/composable/src/weights/indices.rs @@ -1,13 +1,14 @@ -//! Autogenerated weights for indices + +//! Autogenerated weights for `indices` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-23, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("composable-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=composable-dev // --execution=wasm // --wasm-execution=compiled // --pallet=indices @@ -15,39 +16,47 @@ // --steps=50 // --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/composable/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for indices. +/// Weight functions for `indices`. pub struct WeightInfo(PhantomData); impl indices::WeightInfo for WeightInfo { + // Storage: Indices Accounts (r:1 w:1) fn claim() -> Weight { - (160_634_000 as Weight) + (37_831_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: Indices Accounts (r:1 w:1) + // Storage: System Account (r:1 w:1) fn transfer() -> Weight { - (192_936_000 as Weight) + (45_343_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } + // Storage: Indices Accounts (r:1 w:1) fn free() -> Weight { - (161_780_000 as Weight) + (38_017_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: Indices Accounts (r:1 w:1) + // Storage: System Account (r:1 w:1) fn force_transfer() -> Weight { - (163_771_000 as Weight) + (39_059_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } + // Storage: Indices Accounts (r:1 w:1) fn freeze() -> Weight { - (150_461_000 as Weight) + (43_452_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } diff --git a/runtime/composable/src/weights/membership.rs b/runtime/composable/src/weights/membership.rs index d8e8bd9a20c..cacb84958c4 100644 --- a/runtime/composable/src/weights/membership.rs +++ b/runtime/composable/src/weights/membership.rs @@ -1,13 +1,14 @@ -//! Autogenerated weights for membership + +//! Autogenerated weights for `membership` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-23, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("composable-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=composable-dev // --execution=wasm // --wasm-execution=compiled // --pallet=membership @@ -15,58 +16,93 @@ // --steps=50 // --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/composable/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for membership. +/// Weight functions for `membership`. pub struct WeightInfo(PhantomData); impl membership::WeightInfo for WeightInfo { - fn add_member(m: u32) -> Weight { - (78_864_000 as Weight) - // Standard Error: 57_000 - .saturating_add((925_000 as Weight).saturating_mul(m as Weight)) + // Storage: CouncilMembership Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: Council Members (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn add_member(m: u32, ) -> Weight { + (22_951_000 as Weight) + // Standard Error: 1_000 + .saturating_add((123_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn remove_member(m: u32) -> Weight { - (81_076_000 as Weight) + // Storage: CouncilMembership Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: CouncilMembership Prime (r:1 w:0) + // Storage: Council Members (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn remove_member(m: u32, ) -> Weight { + (29_232_000 as Weight) // Standard Error: 10_000 - .saturating_add((494_000 as Weight).saturating_mul(m as Weight)) + .saturating_add((412_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn swap_member(m: u32) -> Weight { - (84_930_000 as Weight) - // Standard Error: 16_000 - .saturating_add((612_000 as Weight).saturating_mul(m as Weight)) + // Storage: CouncilMembership Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: CouncilMembership Prime (r:1 w:0) + // Storage: Council Members (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn swap_member(m: u32, ) -> Weight { + (43_962_000 as Weight) + // Standard Error: 7_000 + .saturating_add((261_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn reset_member(m: u32) -> Weight { - (90_093_000 as Weight) - // Standard Error: 9_000 - .saturating_add((1_065_000 as Weight).saturating_mul(m as Weight)) + // Storage: CouncilMembership Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: CouncilMembership Prime (r:1 w:0) + // Storage: Council Members (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn reset_member(m: u32, ) -> Weight { + (50_808_000 as Weight) + // Standard Error: 7_000 + .saturating_add((436_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn change_key(m: u32) -> Weight { - (76_029_000 as Weight) - // Standard Error: 18_000 - .saturating_add((903_000 as Weight).saturating_mul(m as Weight)) + // Storage: CouncilMembership Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: CouncilMembership Prime (r:1 w:1) + // Storage: Council Members (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn change_key(m: u32, ) -> Weight { + (49_406_000 as Weight) + // Standard Error: 6_000 + .saturating_add((231_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } - fn set_prime(_m: u32) -> Weight { - (57_245_000 as Weight) + // Storage: CouncilMembership Members (r:1 w:0) + // Storage: CouncilMembership Prime (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn set_prime(m: u32, ) -> Weight { + (11_766_000 as Weight) + // Standard Error: 4_000 + .saturating_add((148_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn clear_prime(_m: u32) -> Weight { - (12_220_000 as Weight).saturating_add(T::DbWeight::get().writes(2 as Weight)) + // Storage: CouncilMembership Prime (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn clear_prime(m: u32, ) -> Weight { + (5_433_000 as Weight) + // Standard Error: 0 + .saturating_add((7_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) } } diff --git a/runtime/composable/src/weights/scheduler.rs b/runtime/composable/src/weights/scheduler.rs index 52686e5d5d4..192fd7a90ab 100644 --- a/runtime/composable/src/weights/scheduler.rs +++ b/runtime/composable/src/weights/scheduler.rs @@ -1,56 +1,65 @@ -//! Autogenerated weights for scheduler + +//! Autogenerated weights for `scheduler` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-24, STEPS: `[5, ]`, REPEAT: 2, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("composable-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=composable-dev // --execution=wasm // --wasm-execution=compiled // --pallet=scheduler // --extrinsic=* -// --steps=5 -// --repeat=2 +// --steps=50 +// --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/composable/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for scheduler. +/// Weight functions for `scheduler`. pub struct WeightInfo(PhantomData); impl scheduler::WeightInfo for WeightInfo { - fn schedule(s: u32) -> Weight { - (43_832_000 as Weight) - // Standard Error: 181_000 - .saturating_add((7_000 as Weight).saturating_mul(s as Weight)) + // Storage: Scheduler Agenda (r:1 w:1) + fn schedule(s: u32, ) -> Weight { + (49_690_000 as Weight) + // Standard Error: 19_000 + .saturating_add((252_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn cancel(s: u32) -> Weight { - (33_112_000 as Weight) - // Standard Error: 234_000 - .saturating_add((4_865_000 as Weight).saturating_mul(s as Weight)) + // Storage: Scheduler Agenda (r:1 w:1) + // Storage: Scheduler Lookup (r:0 w:1) + fn cancel(s: u32, ) -> Weight { + (45_839_000 as Weight) + // Standard Error: 34_000 + .saturating_add((2_023_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn schedule_named(s: u32) -> Weight { - (45_294_000 as Weight) - // Standard Error: 23_000 - .saturating_add((221_000 as Weight).saturating_mul(s as Weight)) + // Storage: Scheduler Lookup (r:1 w:1) + // Storage: Scheduler Agenda (r:1 w:1) + fn schedule_named(s: u32, ) -> Weight { + (52_119_000 as Weight) + // Standard Error: 26_000 + .saturating_add((249_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn cancel_named(s: u32) -> Weight { - (38_311_000 as Weight) - // Standard Error: 95_000 - .saturating_add((4_575_000 as Weight).saturating_mul(s as Weight)) + // Storage: Scheduler Lookup (r:1 w:1) + // Storage: Scheduler Agenda (r:1 w:1) + fn cancel_named(s: u32, ) -> Weight { + (44_031_000 as Weight) + // Standard Error: 32_000 + .saturating_add((2_483_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/runtime/composable/src/weights/session.rs b/runtime/composable/src/weights/session.rs index 541224d3546..82593ab0aac 100644 --- a/runtime/composable/src/weights/session.rs +++ b/runtime/composable/src/weights/session.rs @@ -20,8 +20,8 @@ #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; /// Weight functions for session. pub struct WeightInfo(PhantomData); diff --git a/runtime/composable/src/weights/timestamp.rs b/runtime/composable/src/weights/timestamp.rs index d49e0618b50..bea80e21db2 100644 --- a/runtime/composable/src/weights/timestamp.rs +++ b/runtime/composable/src/weights/timestamp.rs @@ -1,37 +1,41 @@ -//! Autogenerated weights for timestamp + +//! Autogenerated weights for `timestamp` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-22, STEPS: `[5, ]`, REPEAT: 2, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("composable-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=composable-dev // --execution=wasm // --wasm-execution=compiled // --pallet=timestamp // --extrinsic=* -// --steps=5 -// --repeat=2 +// --steps=50 +// --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/composable/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for timestamp. +/// Weight functions for `timestamp`. pub struct WeightInfo(PhantomData); impl timestamp::WeightInfo for WeightInfo { + // Storage: Timestamp Now (r:1 w:1) + // Storage: Aura CurrentSlot (r:1 w:0) fn set() -> Weight { - (18_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) + (10_133_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn on_finalize() -> Weight { - (7_000_000 as Weight) + (4_673_000 as Weight) } } diff --git a/runtime/composable/src/weights/tokens.rs b/runtime/composable/src/weights/tokens.rs index 161320a6dd3..56806851601 100644 --- a/runtime/composable/src/weights/tokens.rs +++ b/runtime/composable/src/weights/tokens.rs @@ -2,11 +2,11 @@ #![allow(unused_imports)] #![allow(clippy::unnecessary_cast)] -use sp_std::marker::PhantomData; -use support::{ +use frame_support::{ traits::Get, weights::{constants::RocksDbWeight, Weight}, }; +use sp_std::marker::PhantomData; /// Default weights. pub struct WeightInfo(PhantomData); diff --git a/runtime/composable/src/weights/treasury.rs b/runtime/composable/src/weights/treasury.rs index 38a6f2a7ff1..142187c0af6 100644 --- a/runtime/composable/src/weights/treasury.rs +++ b/runtime/composable/src/weights/treasury.rs @@ -1,13 +1,14 @@ -//! Autogenerated weights for treasury + +//! Autogenerated weights for `treasury` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-23, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("composable-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=composable-dev // --execution=wasm // --wasm-execution=compiled // --pallet=treasury @@ -15,38 +16,48 @@ // --steps=50 // --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/composable/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for treasury. +/// Weight functions for `treasury`. pub struct WeightInfo(PhantomData); impl treasury::WeightInfo for WeightInfo { + // Storage: Treasury ProposalCount (r:1 w:1) + // Storage: Treasury Proposals (r:0 w:1) fn propose_spend() -> Weight { - (213_896_000 as Weight) + (71_832_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } + // Storage: Treasury Proposals (r:1 w:1) + // Storage: System Account (r:2 w:2) fn reject_proposal() -> Weight { - (357_257_000 as Weight) + (99_792_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn approve_proposal(p: u32) -> Weight { - (48_959_000 as Weight) - // Standard Error: 58_000 - .saturating_add((139_000 as Weight).saturating_mul(p as Weight)) + // Storage: Treasury Proposals (r:1 w:0) + // Storage: Treasury Approvals (r:1 w:1) + fn approve_proposal(p: u32, ) -> Weight { + (20_117_000 as Weight) + // Standard Error: 21_000 + .saturating_add((851_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn on_initialize_proposals(p: u32) -> Weight { - (180_865_000 as Weight) - // Standard Error: 9_488_000 - .saturating_add((241_148_000 as Weight).saturating_mul(p as Weight)) + // Storage: System Account (r:1 w:0) + // Storage: Treasury Approvals (r:1 w:1) + // Storage: Treasury Proposals (r:1 w:1) + fn on_initialize_proposals(p: u32, ) -> Weight { + (181_391_000 as Weight) + // Standard Error: 2_226_000 + .saturating_add((65_079_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight))) .saturating_add(T::DbWeight::get().writes(2 as Weight)) diff --git a/runtime/composable/src/weights/utility.rs b/runtime/composable/src/weights/utility.rs index bc0d63a7445..e3a1b4c7a6b 100644 --- a/runtime/composable/src/weights/utility.rs +++ b/runtime/composable/src/weights/utility.rs @@ -1,25 +1,47 @@ + +//! Autogenerated weights for `utility` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("composable-dev"), DB CACHE: 128 + +// Executed Command: +// ./target/release/composable +// benchmark +// --chain=composable-dev +// --execution=wasm +// --wasm-execution=compiled +// --pallet=utility +// --extrinsic=* +// --steps=50 +// --repeat=20 +// --raw +// --output=runtime/composable/src/weights + +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; +/// Weight functions for `utility`. pub struct WeightInfo(PhantomData); impl utility::WeightInfo for WeightInfo { - fn batch(c: u32) -> Weight { - (14_618_000 as Weight) - // Standard Error: 0 - .saturating_add((610_000 as Weight).saturating_mul(c as Weight)) + fn batch(c: u32, ) -> Weight { + (28_696_000 as Weight) + // Standard Error: 2_000 + .saturating_add((6_008_000 as Weight).saturating_mul(c as Weight)) } fn as_derivative() -> Weight { - (3_175_000 as Weight) + (3_987_000 as Weight) } - fn batch_all(c: u32) -> Weight { - (14_561_000 as Weight) - // Standard Error: 0 - .saturating_add((1_013_000 as Weight).saturating_mul(c as Weight)) + fn batch_all(c: u32, ) -> Weight { + (17_207_000 as Weight) + // Standard Error: 5_000 + .saturating_add((6_603_000 as Weight).saturating_mul(c as Weight)) } fn dispatch_as() -> Weight { - (10_000_000 as Weight) + (14_969_000 as Weight) } } diff --git a/runtime/composable/src/xcmp.rs b/runtime/composable/src/xcmp.rs index 7b2ada08324..3763ef3fbb5 100644 --- a/runtime/composable/src/xcmp.rs +++ b/runtime/composable/src/xcmp.rs @@ -6,7 +6,7 @@ use super::*; // recursive dependency onto runtime use codec::{Decode, Encode}; use composable_traits::assets::{RemoteAssetRegistry, XcmAssetLocation}; use cumulus_primitives_core::ParaId; -use support::{ +use frame_support::{ construct_runtime, log, match_type, parameter_types, traits::{Contains, Everything, KeyOwnerProofSystem, Nothing, Randomness, StorageInfo}, weights::{ diff --git a/runtime/dali/Cargo.toml b/runtime/dali/Cargo.toml index 9ec36dbff00..2108e83a47d 100644 --- a/runtime/dali/Cargo.toml +++ b/runtime/dali/Cargo.toml @@ -2,7 +2,7 @@ name = "dali-runtime" version = "0.1.0" edition = "2021" -rust-version = "1.56" + description = "Dali, Testnet Parachain Runtime Implementation" authors = ["Seun Lanlege "] @@ -14,7 +14,7 @@ normal = ["pallet-vault", "session-benchmarking", "assets-registry", "currency-f [dependencies] frame-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -support = { package = "frame-support", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } # primitives @@ -58,7 +58,7 @@ assets = { package = "pallet-assets", path = '../../frame/assets', default-featu crowdloan-rewards = { package = "pallet-crowdloan-rewards", path = '../../frame/crowdloan-rewards', default-features = false } bonded-finance = { package = "pallet-bonded-finance", path = "../../frame/bonded-finance", default-features = false } vesting = { package = "pallet-vesting", path = "../../frame/vesting", default-features = false } -dutch-auction = { package = "pallet-dutch-auction", path = "../../frame/dutch-auction", default-features = false } + dutch-auction = { package = "pallet-dutch-auction", path = "../../frame/dutch-auction", default-features = false } common = { path = "../common", default-features = false } primitives = { path = "../primitives", default-features = false } oracle = { package = "pallet-oracle", path = "../../frame/oracle", default-features = false } @@ -119,7 +119,7 @@ std = [ "sp-block-builder/std", "sp-transaction-pool/std", "sp-inherents/std", - "support/std", + "frame-support/std", "executive/std", "frame-system/std", "utility/std", @@ -171,13 +171,14 @@ std = [ "composable-traits/std", "crowdloan-rewards/std", "bonded-finance/std", - "vesting/std" + "dutch-auction/std", + "vesting/std" ] runtime-benchmarks = [ "assets/runtime-benchmarks", "balances/runtime-benchmarks", "benchmarking", - "support/runtime-benchmarks", + "frame-support/runtime-benchmarks", "system-benchmarking", "frame-system/runtime-benchmarks", "hex-literal", @@ -193,7 +194,6 @@ runtime-benchmarks = [ "xcm-builder/runtime-benchmarks", "indices/runtime-benchmarks", "crowdloan-rewards/runtime-benchmarks", - "dutch-auction/runtime-benchmarks", "identity/runtime-benchmarks", "multisig/runtime-benchmarks", "membership/runtime-benchmarks", @@ -206,4 +206,5 @@ runtime-benchmarks = [ "vesting/runtime-benchmarks", "assets/runtime-benchmarks", "bonded-finance/runtime-benchmarks", + "dutch-auction/runtime-benchmarks", ] diff --git a/runtime/dali/src/lib.rs b/runtime/dali/src/lib.rs index e30e22b4b44..102ff87309c 100644 --- a/runtime/dali/src/lib.rs +++ b/runtime/dali/src/lib.rs @@ -42,7 +42,7 @@ use sp_version::NativeVersion; use sp_version::RuntimeVersion; // A few exports that help ease life for downstream crates. -pub use support::{ +pub use frame_support::{ construct_runtime, match_type, parameter_types, traits::{Contains, Everything, KeyOwnerProofSystem, Nothing, Randomness, StorageInfo}, weights::{ @@ -54,11 +54,11 @@ pub use support::{ }; use codec::Encode; +use frame_support::traits::EqualPrivilegeOnly; use frame_system as system; #[cfg(any(feature = "std", test))] pub use sp_runtime::BuildStorage; pub use sp_runtime::{FixedPointNumber, Perbill, Permill, Perquintill}; -use support::traits::EqualPrivilegeOnly; use system::{ limits::{BlockLength, BlockWeights}, EnsureRoot, @@ -1051,10 +1051,10 @@ impl_runtime_apis! { impl benchmarking::Benchmark for Runtime { fn benchmark_metadata(extra: bool) -> ( Vec, - Vec, + Vec, ) { use benchmarking::{list_benchmark, Benchmarking, BenchmarkList}; - use support::traits::StorageInfoTrait; + use frame_support::traits::StorageInfoTrait; use system_benchmarking::Pallet as SystemBench; let mut list = Vec::::new(); diff --git a/runtime/dali/src/weights/balances.rs b/runtime/dali/src/weights/balances.rs index 6e6dd646fbd..300e77dac17 100644 --- a/runtime/dali/src/weights/balances.rs +++ b/runtime/dali/src/weights/balances.rs @@ -1,63 +1,73 @@ -//! Autogenerated weights for balances + +//! Autogenerated weights for `balances` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-22, STEPS: `[5, ]`, REPEAT: 2, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dali-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=dali-dev // --execution=wasm // --wasm-execution=compiled // --pallet=balances // --extrinsic=* -// --steps=5 -// --repeat=2 +// --steps=50 +// --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/dali/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for balances. +/// Weight functions for `balances`. pub struct WeightInfo(PhantomData); impl balances::WeightInfo for WeightInfo { + // Storage: System Account (r:2 w:2) fn transfer() -> Weight { - (139_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + (160_436_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) } + // Storage: System Account (r:1 w:1) fn transfer_keep_alive() -> Weight { - (81_000_000 as Weight) + (95_923_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: System Account (r:1 w:1) fn set_balance_creating() -> Weight { - (47_000_000 as Weight) + (55_369_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: System Account (r:1 w:1) fn set_balance_killing() -> Weight { - (54_000_000 as Weight) + (68_956_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: System Account (r:3 w:3) fn force_transfer() -> Weight { - (110_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + (163_390_000 as Weight) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) } + // Storage: System Account (r:1 w:1) fn transfer_all() -> Weight { - (100_000_000 as Weight) + (115_415_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - + // Storage: System Account (r:1 w:1) fn force_unreserve() -> Weight { - (0 as Weight) + (51_043_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } } diff --git a/runtime/dali/src/weights/collator_selection.rs b/runtime/dali/src/weights/collator_selection.rs index 8e7427027e1..46459b6f76c 100644 --- a/runtime/dali/src/weights/collator_selection.rs +++ b/runtime/dali/src/weights/collator_selection.rs @@ -1,52 +1,93 @@ + +//! Autogenerated weights for `collator_selection` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dali-dev"), DB CACHE: 128 + +// Executed Command: +// ./target/release/composable +// benchmark +// --chain=dali-dev +// --execution=wasm +// --wasm-execution=compiled +// --pallet=collator_selection +// --extrinsic=* +// --steps=50 +// --repeat=20 +// --raw +// --output=runtime/dali/src/weights + +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weights for pallet_collator_selection using the Substrate node and recommended hardware. +/// Weight functions for `collator_selection`. pub struct WeightInfo(PhantomData); impl collator_selection::WeightInfo for WeightInfo { - fn set_invulnerables(b: u32) -> Weight { - (18_563_000 as Weight) + // Storage: CollatorSelection Invulnerables (r:0 w:1) + fn set_invulnerables(b: u32, ) -> Weight { + (17_720_000 as Weight) // Standard Error: 0 - .saturating_add((68_000 as Weight).saturating_mul(b as Weight)) + .saturating_add((41_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: CollatorSelection DesiredCandidates (r:0 w:1) fn set_desired_candidates() -> Weight { - (16_363_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (15_958_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: CollatorSelection CandidacyBond (r:0 w:1) fn set_candidacy_bond() -> Weight { - (16_840_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (16_528_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn register_as_candidate(c: u32) -> Weight { - (71_196_000 as Weight) - // Standard Error: 0 - .saturating_add((198_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) + // Storage: CollatorSelection Candidates (r:1 w:1) + // Storage: CollatorSelection DesiredCandidates (r:1 w:0) + // Storage: CollatorSelection Invulnerables (r:1 w:0) + // Storage: Session NextKeys (r:1 w:0) + // Storage: CollatorSelection CandidacyBond (r:1 w:0) + // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) + fn register_as_candidate(c: u32, ) -> Weight { + (87_409_000 as Weight) + // Standard Error: 1_000 + .saturating_add((176_000 as Weight).saturating_mul(c as Weight)) + .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn leave_intent(c: u32) -> Weight { - (55_336_000 as Weight) - // Standard Error: 0 - .saturating_add((151_000 as Weight).saturating_mul(c as Weight)) + // Storage: CollatorSelection Candidates (r:1 w:1) + // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) + fn leave_intent(c: u32, ) -> Weight { + (5_665_000 as Weight) + // Standard Error: 12_000 + .saturating_add((499_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } + // Storage: System Account (r:2 w:2) + // Storage: System BlockWeight (r:1 w:1) + // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn note_author() -> Weight { - (71_461_000 as Weight) + (109_858_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } - fn new_session(r: u32, c: u32) -> Weight { + // Storage: CollatorSelection Candidates (r:1 w:1) + // Storage: CollatorSelection LastAuthoredBlock (r:1000 w:1) + // Storage: System Account (r:1 w:1) + // Storage: CollatorSelection Invulnerables (r:1 w:0) + // Storage: System BlockWeight (r:1 w:1) + fn new_session(r: u32, c: u32, ) -> Weight { (0 as Weight) - // Standard Error: 1_010_000 - .saturating_add((109_961_000 as Weight).saturating_mul(r as Weight)) - // Standard Error: 1_010_000 - .saturating_add((151_952_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) + // Standard Error: 4_362_000 + .saturating_add((10_263_000 as Weight).saturating_mul(r as Weight)) + // Standard Error: 4_362_000 + .saturating_add((114_349_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight))) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(c as Weight))) + .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(c as Weight))) } } diff --git a/runtime/dali/src/weights/collective.rs b/runtime/dali/src/weights/collective.rs index 6fc9ddebf28..ade46bf478f 100644 --- a/runtime/dali/src/weights/collective.rs +++ b/runtime/dali/src/weights/collective.rs @@ -1,13 +1,14 @@ -//! Autogenerated weights for collective + +//! Autogenerated weights for `collective` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-24, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dali-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=dali-dev // --execution=wasm // --wasm-execution=compiled // --pallet=collective @@ -15,106 +16,146 @@ // --steps=50 // --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/dali/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for collective. +/// Weight functions for `collective`. pub struct WeightInfo(PhantomData); impl collective::WeightInfo for WeightInfo { - fn set_members(m: u32, _n: u32, p: u32) -> Weight { + // Storage: Council Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: Council Voting (r:100 w:100) + // Storage: Council Prime (r:0 w:1) + fn set_members(m: u32, _n: u32, p: u32, ) -> Weight { (0 as Weight) - // Standard Error: 63_000 - .saturating_add((25_207_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 63_000 - .saturating_add((33_546_000 as Weight).saturating_mul(p as Weight)) + // Standard Error: 147_000 + .saturating_add((15_753_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 147_000 + .saturating_add((21_061_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight))) .saturating_add(T::DbWeight::get().writes(2 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) } - fn execute(b: u32, m: u32) -> Weight { - (30_323_000 as Weight) + // Storage: Council Members (r:1 w:0) + // Storage: CallFilter DisabledCalls (r:1 w:0) + fn execute(b: u32, m: u32, ) -> Weight { + (26_304_000 as Weight) // Standard Error: 0 - .saturating_add((5_000 as Weight).saturating_mul(b as Weight)) + .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) // Standard Error: 0 - .saturating_add((127_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add((95_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) } - fn propose_execute(b: u32, m: u32) -> Weight { - (38_575_000 as Weight) + // Storage: Council Members (r:1 w:0) + // Storage: Council ProposalOf (r:1 w:0) + // Storage: CallFilter DisabledCalls (r:1 w:0) + fn propose_execute(b: u32, m: u32, ) -> Weight { + (30_572_000 as Weight) // Standard Error: 0 .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) - // Standard Error: 3_000 - .saturating_add((254_000 as Weight).saturating_mul(m as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) + // Standard Error: 0 + .saturating_add((174_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) } - fn propose_proposed(b: u32, m: u32, p: u32) -> Weight { - (48_131_000 as Weight) + // Storage: Council Members (r:1 w:0) + // Storage: Council ProposalOf (r:1 w:1) + // Storage: Council Proposals (r:1 w:1) + // Storage: Council ProposalCount (r:1 w:1) + // Storage: Council Voting (r:0 w:1) + fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight { + (34_775_000 as Weight) // Standard Error: 0 - .saturating_add((18_000 as Weight).saturating_mul(b as Weight)) - // Standard Error: 7_000 - .saturating_add((147_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 7_000 - .saturating_add((909_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((11_000 as Weight).saturating_mul(b as Weight)) + // Standard Error: 2_000 + .saturating_add((106_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 2_000 + .saturating_add((423_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } - fn vote(m: u32) -> Weight { - (75_974_000 as Weight) - // Standard Error: 4_000 - .saturating_add((370_000 as Weight).saturating_mul(m as Weight)) + // Storage: Council Members (r:1 w:0) + // Storage: Council Voting (r:1 w:1) + fn vote(m: u32, ) -> Weight { + (43_971_000 as Weight) + // Standard Error: 2_000 + .saturating_add((189_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn close_early_disapproved(m: u32, p: u32) -> Weight { - (63_575_000 as Weight) - // Standard Error: 5_000 - .saturating_add((293_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 5_000 - .saturating_add((761_000 as Weight).saturating_mul(p as Weight)) + // Storage: Council Voting (r:1 w:1) + // Storage: Council Members (r:1 w:0) + // Storage: Council Proposals (r:1 w:1) + // Storage: Council ProposalOf (r:0 w:1) + fn close_early_disapproved(m: u32, p: u32, ) -> Weight { + (45_223_000 as Weight) + // Standard Error: 2_000 + .saturating_add((183_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 2_000 + .saturating_add((347_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn close_early_approved(b: u32, m: u32, p: u32) -> Weight { - (86_824_000 as Weight) + // Storage: Council Voting (r:1 w:1) + // Storage: Council Members (r:1 w:0) + // Storage: Council ProposalOf (r:1 w:1) + // Storage: CallFilter DisabledCalls (r:1 w:0) + // Storage: Council Proposals (r:1 w:1) + fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight { + (58_316_000 as Weight) // Standard Error: 0 - .saturating_add((12_000 as Weight).saturating_mul(b as Weight)) - // Standard Error: 8_000 - .saturating_add((321_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 8_000 - .saturating_add((860_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) + .saturating_add((9_000 as Weight).saturating_mul(b as Weight)) + // Standard Error: 2_000 + .saturating_add((197_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 2_000 + .saturating_add((426_000 as Weight).saturating_mul(p as Weight)) + .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn close_disapproved(m: u32, p: u32) -> Weight { - (70_231_000 as Weight) - // Standard Error: 7_000 - .saturating_add((323_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 6_000 - .saturating_add((784_000 as Weight).saturating_mul(p as Weight)) + // Storage: Council Voting (r:1 w:1) + // Storage: Council Members (r:1 w:0) + // Storage: Council Prime (r:1 w:0) + // Storage: Council Proposals (r:1 w:1) + // Storage: Council ProposalOf (r:0 w:1) + fn close_disapproved(m: u32, p: u32, ) -> Weight { + (50_752_000 as Weight) + // Standard Error: 2_000 + .saturating_add((178_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 2_000 + .saturating_add((339_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn close_approved(b: u32, m: u32, p: u32) -> Weight { - (92_370_000 as Weight) - // Standard Error: 1_000 - .saturating_add((11_000 as Weight).saturating_mul(b as Weight)) - // Standard Error: 10_000 - .saturating_add((327_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 9_000 - .saturating_add((899_000 as Weight).saturating_mul(p as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) + // Storage: Council Voting (r:1 w:1) + // Storage: Council Members (r:1 w:0) + // Storage: Council Prime (r:1 w:0) + // Storage: Council ProposalOf (r:1 w:1) + // Storage: CallFilter DisabledCalls (r:1 w:0) + // Storage: Council Proposals (r:1 w:1) + fn close_approved(b: u32, m: u32, p: u32, ) -> Weight { + (63_225_000 as Weight) + // Standard Error: 0 + .saturating_add((8_000 as Weight).saturating_mul(b as Weight)) + // Standard Error: 2_000 + .saturating_add((201_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 2_000 + .saturating_add((427_000 as Weight).saturating_mul(p as Weight)) + .saturating_add(T::DbWeight::get().reads(6 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn disapprove_proposal(p: u32) -> Weight { - (35_489_000 as Weight) - // Standard Error: 4_000 - .saturating_add((830_000 as Weight).saturating_mul(p as Weight)) + // Storage: Council Proposals (r:1 w:1) + // Storage: Council Voting (r:0 w:1) + // Storage: Council ProposalOf (r:0 w:1) + fn disapprove_proposal(p: u32, ) -> Weight { + (27_181_000 as Weight) + // Standard Error: 1_000 + .saturating_add((408_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } diff --git a/runtime/dali/src/weights/crowdloan_rewards.rs b/runtime/dali/src/weights/crowdloan_rewards.rs index d755d08a755..f3e846912d4 100644 --- a/runtime/dali/src/weights/crowdloan_rewards.rs +++ b/runtime/dali/src/weights/crowdloan_rewards.rs @@ -1,4 +1,3 @@ - //! Autogenerated weights for `crowdloan_rewards` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev @@ -22,7 +21,7 @@ #![allow(unused_parens)] #![allow(unused_imports)] -use support::{traits::Get, weights::Weight}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; /// Weight functions for `crowdloan_rewards`. diff --git a/runtime/dali/src/weights/democracy.rs b/runtime/dali/src/weights/democracy.rs index 0b528a6d67e..79253495cfb 100644 --- a/runtime/dali/src/weights/democracy.rs +++ b/runtime/dali/src/weights/democracy.rs @@ -1,13 +1,14 @@ -//! Autogenerated weights for democracy + +//! Autogenerated weights for `democracy` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-24, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dali-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=dali-dev // --execution=wasm // --wasm-execution=compiled // --pallet=democracy @@ -15,176 +16,248 @@ // --steps=50 // --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/dali/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for democracy. +/// Weight functions for `democracy`. pub struct WeightInfo(PhantomData); impl democracy::WeightInfo for WeightInfo { + // Storage: Democracy PublicPropCount (r:1 w:1) + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:0) + // Storage: Democracy DepositOf (r:0 w:1) fn propose() -> Weight { - (112_082_000 as Weight) + (78_147_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn second(s: u32) -> Weight { - (56_014_000 as Weight) - // Standard Error: 3_000 - .saturating_add((349_000 as Weight).saturating_mul(s as Weight)) + // Storage: Democracy DepositOf (r:1 w:1) + fn second(s: u32, ) -> Weight { + (40_901_000 as Weight) + // Standard Error: 1_000 + .saturating_add((247_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn vote_new(r: u32) -> Weight { - (62_157_000 as Weight) - // Standard Error: 4_000 - .saturating_add((512_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + fn vote_new(r: u32, ) -> Weight { + (44_497_000 as Weight) + // Standard Error: 1_000 + .saturating_add((237_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn vote_existing(r: u32) -> Weight { - (62_708_000 as Weight) - // Standard Error: 4_000 - .saturating_add((495_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + fn vote_existing(r: u32, ) -> Weight { + (44_328_000 as Weight) + // Standard Error: 1_000 + .saturating_add((224_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy Cancellations (r:1 w:1) fn emergency_cancel() -> Weight { - (38_669_000 as Weight) + (27_961_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn blacklist(p: u32) -> Weight { - (113_805_000 as Weight) - // Standard Error: 9_000 - .saturating_add((998_000 as Weight).saturating_mul(p as Weight)) + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy Blacklist (r:0 w:1) + // Storage: Democracy DepositOf (r:1 w:1) + // Storage: System Account (r:2 w:2) + fn blacklist(p: u32, ) -> Weight { + (95_296_000 as Weight) + // Standard Error: 6_000 + .saturating_add((566_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(6 as Weight)) .saturating_add(T::DbWeight::get().writes(7 as Weight)) } - fn external_propose(v: u32) -> Weight { - (19_088_000 as Weight) + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:0) + fn external_propose(v: u32, ) -> Weight { + (13_838_000 as Weight) // Standard Error: 0 - .saturating_add((113_000 as Weight).saturating_mul(v as Weight)) + .saturating_add((88_000 as Weight).saturating_mul(v as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_majority() -> Weight { - (4_287_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (2_993_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_default() -> Weight { - (4_227_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (2_876_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:1) + // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn fast_track() -> Weight { - (38_917_000 as Weight) + (29_139_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn veto_external(v: u32) -> Weight { - (40_067_000 as Weight) + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:1) + fn veto_external(v: u32, ) -> Weight { + (30_300_000 as Weight) // Standard Error: 0 - .saturating_add((172_000 as Weight).saturating_mul(v as Weight)) + .saturating_add((115_000 as Weight).saturating_mul(v as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn cancel_proposal(p: u32) -> Weight { - (69_372_000 as Weight) - // Standard Error: 5_000 - .saturating_add((991_000 as Weight).saturating_mul(p as Weight)) + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy DepositOf (r:1 w:1) + // Storage: System Account (r:2 w:2) + fn cancel_proposal(p: u32, ) -> Weight { + (70_582_000 as Weight) + // Standard Error: 2_000 + .saturating_add((499_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } + // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn cancel_referendum() -> Weight { - (23_073_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (18_194_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn cancel_queued(r: u32) -> Weight { - (36_184_000 as Weight) - // Standard Error: 32_000 - .saturating_add((6_334_000 as Weight).saturating_mul(r as Weight)) + // Storage: Scheduler Lookup (r:1 w:1) + // Storage: Scheduler Agenda (r:1 w:1) + fn cancel_queued(r: u32, ) -> Weight { + (31_439_000 as Weight) + // Standard Error: 3_000 + .saturating_add((1_990_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn on_initialize_base(r: u32) -> Weight { - (0 as Weight) - // Standard Error: 44_000 - .saturating_add((8_834_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) + // Storage: Democracy LowestUnbaked (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:0) + // Storage: Democracy ReferendumInfoOf (r:1 w:0) + fn on_initialize_base(r: u32, ) -> Weight { + (6_091_000 as Weight) + // Standard Error: 4_000 + .saturating_add((5_373_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - - fn on_initialize_base_with_launch_period(_r: u32) -> Weight { - (0 as Weight) + // Storage: Democracy LowestUnbaked (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:0) + // Storage: Democracy LastTabledWasExternal (r:1 w:0) + // Storage: Democracy NextExternal (r:1 w:0) + // Storage: Democracy PublicProps (r:1 w:0) + // Storage: Democracy ReferendumInfoOf (r:1 w:0) + fn on_initialize_base_with_launch_period(r: u32, ) -> Weight { + (14_522_000 as Weight) + // Standard Error: 4_000 + .saturating_add((5_383_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(5 as Weight)) + .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - - fn delegate(r: u32) -> Weight { - (67_447_000 as Weight) - // Standard Error: 64_000 - .saturating_add((11_600_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy VotingOf (r:3 w:3) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + fn delegate(r: u32, ) -> Weight { + (60_787_000 as Weight) + // Standard Error: 5_000 + .saturating_add((7_105_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes(4 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) } - fn undelegate(r: u32) -> Weight { - (37_144_000 as Weight) - // Standard Error: 36_000 - .saturating_add((10_896_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy VotingOf (r:2 w:2) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + fn undelegate(r: u32, ) -> Weight { + (28_718_000 as Weight) + // Standard Error: 5_000 + .saturating_add((7_101_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes(2 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) } + // Storage: Democracy PublicProps (r:0 w:1) fn clear_public_proposals() -> Weight { - (4_006_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_294_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn note_preimage(b: u32) -> Weight { - (61_302_000 as Weight) + // Storage: Democracy Preimages (r:1 w:1) + fn note_preimage(b: u32, ) -> Weight { + (44_503_000 as Weight) // Standard Error: 0 .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn note_imminent_preimage(b: u32) -> Weight { - (39_217_000 as Weight) + // Storage: Democracy Preimages (r:1 w:1) + fn note_imminent_preimage(b: u32, ) -> Weight { + (30_171_000 as Weight) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) + .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn reap_preimage(b: u32) -> Weight { - (53_786_000 as Weight) + // Storage: Democracy Preimages (r:1 w:1) + // Storage: System Account (r:1 w:0) + fn reap_preimage(b: u32, ) -> Weight { + (41_252_000 as Weight) // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) + .saturating_add((1_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn unlock_remove(r: u32) -> Weight { - (54_249_000 as Weight) - // Standard Error: 4_000 - .saturating_add((313_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + // Storage: System Account (r:1 w:1) + fn unlock_remove(r: u32, ) -> Weight { + (38_156_000 as Weight) + // Standard Error: 1_000 + .saturating_add((119_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn unlock_set(r: u32) -> Weight { - (48_885_000 as Weight) - // Standard Error: 4_000 - .saturating_add((486_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + // Storage: System Account (r:1 w:1) + fn unlock_set(r: u32, ) -> Weight { + (36_213_000 as Weight) + // Standard Error: 1_000 + .saturating_add((209_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn remove_vote(r: u32) -> Weight { - (25_483_000 as Weight) - // Standard Error: 3_000 - .saturating_add((508_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + fn remove_vote(r: u32, ) -> Weight { + (20_612_000 as Weight) + // Standard Error: 1_000 + .saturating_add((201_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn remove_other_vote(r: u32) -> Weight { - (26_969_000 as Weight) - // Standard Error: 3_000 - .saturating_add((289_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + fn remove_other_vote(r: u32, ) -> Weight { + (20_752_000 as Weight) + // Standard Error: 1_000 + .saturating_add((203_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/runtime/dali/src/weights/dutch_auction.rs b/runtime/dali/src/weights/dutch_auction.rs index 0008eec0644..49055412d43 100644 --- a/runtime/dali/src/weights/dutch_auction.rs +++ b/runtime/dali/src/weights/dutch_auction.rs @@ -22,7 +22,7 @@ #![allow(unused_imports)] use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; +use frame_support::{traits::Get, weights::Weight}; /// Weight functions for `dutch_auction`. pub struct WeightInfo(PhantomData); diff --git a/runtime/dali/src/weights/frame_system.rs b/runtime/dali/src/weights/frame_system.rs index 940dabf0cb2..5ef4c87e683 100644 --- a/runtime/dali/src/weights/frame_system.rs +++ b/runtime/dali/src/weights/frame_system.rs @@ -1,63 +1,69 @@ -//! Autogenerated weights for frame_system + +//! Autogenerated weights for `frame_system` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-22, STEPS: `[5, ]`, REPEAT: 2, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dali-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=dali-dev // --execution=wasm // --wasm-execution=compiled // --pallet=frame_system // --extrinsic=* -// --steps=5 -// --repeat=2 +// --steps=50 +// --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/dali/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for frame_system. +/// Weight functions for `frame_system`. pub struct WeightInfo(PhantomData); impl frame_system::WeightInfo for WeightInfo { - fn remark(_b: u32) -> Weight { - (1_381_000 as Weight) - } - fn remark_with_event(b: u32) -> Weight { + fn remark(b: u32, ) -> Weight { (0 as Weight) // Standard Error: 0 .saturating_add((1_000 as Weight).saturating_mul(b as Weight)) } - fn set_heap_pages() -> Weight { - (3_000_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + fn remark_with_event(b: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 0 + .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) } - fn set_changes_trie_config() -> Weight { - (15_000_000 as Weight) + // Storage: System Digest (r:1 w:1) + // Storage: unknown [0x3a686561707061676573] (r:0 w:1) + fn set_heap_pages() -> Weight { + (5_224_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn set_storage(i: u32) -> Weight { - (25_491_000 as Weight) - // Standard Error: 28_000 - .saturating_add((962_000 as Weight).saturating_mul(i as Weight)) + // Storage: Skipped Metadata (r:0 w:0) + fn set_storage(i: u32, ) -> Weight { + (94_631_000 as Weight) + // Standard Error: 27_000 + .saturating_add((1_016_000 as Weight).saturating_mul(i as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) } - fn kill_storage(i: u32) -> Weight { - (23_657_000 as Weight) - // Standard Error: 55_000 - .saturating_add((676_000 as Weight).saturating_mul(i as Weight)) + // Storage: Skipped Metadata (r:0 w:0) + fn kill_storage(i: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 16_000 + .saturating_add((1_112_000 as Weight).saturating_mul(i as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) } - fn kill_prefix(p: u32) -> Weight { - (13_414_000 as Weight) - // Standard Error: 77_000 - .saturating_add((1_634_000 as Weight).saturating_mul(p as Weight)) + // Storage: Skipped Metadata (r:0 w:0) + fn kill_prefix(p: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 16_000 + .saturating_add((1_829_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) } } diff --git a/runtime/dali/src/weights/identity.rs b/runtime/dali/src/weights/identity.rs index ba2aac5bff3..e338838aae5 100644 --- a/runtime/dali/src/weights/identity.rs +++ b/runtime/dali/src/weights/identity.rs @@ -1,4 +1,3 @@ - //! Autogenerated weights for `identity` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev @@ -23,7 +22,7 @@ #![allow(unused_parens)] #![allow(unused_imports)] -use support::{traits::Get, weights::Weight}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; /// Weight functions for `identity`. diff --git a/runtime/dali/src/weights/indices.rs b/runtime/dali/src/weights/indices.rs index 912228be72d..d91878670a3 100644 --- a/runtime/dali/src/weights/indices.rs +++ b/runtime/dali/src/weights/indices.rs @@ -1,13 +1,14 @@ -//! Autogenerated weights for indices + +//! Autogenerated weights for `indices` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-23, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dali-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=dali-dev // --execution=wasm // --wasm-execution=compiled // --pallet=indices @@ -15,39 +16,47 @@ // --steps=50 // --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/dali/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for indices. +/// Weight functions for `indices`. pub struct WeightInfo(PhantomData); impl indices::WeightInfo for WeightInfo { + // Storage: Indices Accounts (r:1 w:1) fn claim() -> Weight { - (160_634_000 as Weight) + (67_998_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: Indices Accounts (r:1 w:1) + // Storage: System Account (r:1 w:1) fn transfer() -> Weight { - (192_936_000 as Weight) + (82_134_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } + // Storage: Indices Accounts (r:1 w:1) fn free() -> Weight { - (161_780_000 as Weight) + (72_248_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: Indices Accounts (r:1 w:1) + // Storage: System Account (r:1 w:1) fn force_transfer() -> Weight { - (163_771_000 as Weight) + (45_055_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } + // Storage: Indices Accounts (r:1 w:1) fn freeze() -> Weight { - (150_461_000 as Weight) + (82_402_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } diff --git a/runtime/dali/src/weights/membership.rs b/runtime/dali/src/weights/membership.rs index d8e8bd9a20c..c89cce501e4 100644 --- a/runtime/dali/src/weights/membership.rs +++ b/runtime/dali/src/weights/membership.rs @@ -1,13 +1,14 @@ -//! Autogenerated weights for membership + +//! Autogenerated weights for `membership` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-23, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dali-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=dali-dev // --execution=wasm // --wasm-execution=compiled // --pallet=membership @@ -15,58 +16,93 @@ // --steps=50 // --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/dali/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for membership. +/// Weight functions for `membership`. pub struct WeightInfo(PhantomData); impl membership::WeightInfo for WeightInfo { - fn add_member(m: u32) -> Weight { - (78_864_000 as Weight) - // Standard Error: 57_000 - .saturating_add((925_000 as Weight).saturating_mul(m as Weight)) + // Storage: CouncilMembership Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: Council Members (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn add_member(m: u32, ) -> Weight { + (41_977_000 as Weight) + // Standard Error: 10_000 + .saturating_add((257_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn remove_member(m: u32) -> Weight { - (81_076_000 as Weight) - // Standard Error: 10_000 - .saturating_add((494_000 as Weight).saturating_mul(m as Weight)) + // Storage: CouncilMembership Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: CouncilMembership Prime (r:1 w:0) + // Storage: Council Members (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn remove_member(m: u32, ) -> Weight { + (57_502_000 as Weight) + // Standard Error: 9_000 + .saturating_add((113_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn swap_member(m: u32) -> Weight { - (84_930_000 as Weight) - // Standard Error: 16_000 - .saturating_add((612_000 as Weight).saturating_mul(m as Weight)) + // Storage: CouncilMembership Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: CouncilMembership Prime (r:1 w:0) + // Storage: Council Members (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn swap_member(m: u32, ) -> Weight { + (53_945_000 as Weight) + // Standard Error: 6_000 + .saturating_add((212_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn reset_member(m: u32) -> Weight { - (90_093_000 as Weight) - // Standard Error: 9_000 - .saturating_add((1_065_000 as Weight).saturating_mul(m as Weight)) + // Storage: CouncilMembership Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: CouncilMembership Prime (r:1 w:0) + // Storage: Council Members (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn reset_member(m: u32, ) -> Weight { + (57_806_000 as Weight) + // Standard Error: 16_000 + .saturating_add((132_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn change_key(m: u32) -> Weight { - (76_029_000 as Weight) - // Standard Error: 18_000 - .saturating_add((903_000 as Weight).saturating_mul(m as Weight)) + // Storage: CouncilMembership Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: CouncilMembership Prime (r:1 w:1) + // Storage: Council Members (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn change_key(m: u32, ) -> Weight { + (40_024_000 as Weight) + // Standard Error: 12_000 + .saturating_add((444_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } - fn set_prime(_m: u32) -> Weight { - (57_245_000 as Weight) + // Storage: CouncilMembership Members (r:1 w:0) + // Storage: CouncilMembership Prime (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn set_prime(m: u32, ) -> Weight { + (12_745_000 as Weight) + // Standard Error: 5_000 + .saturating_add((73_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn clear_prime(_m: u32) -> Weight { - (12_220_000 as Weight).saturating_add(T::DbWeight::get().writes(2 as Weight)) + // Storage: CouncilMembership Prime (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn clear_prime(m: u32, ) -> Weight { + (3_127_000 as Weight) + // Standard Error: 1_000 + .saturating_add((44_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) } } diff --git a/runtime/dali/src/weights/multisig.rs b/runtime/dali/src/weights/multisig.rs index 2923b8248d1..0bee6ac7f84 100644 --- a/runtime/dali/src/weights/multisig.rs +++ b/runtime/dali/src/weights/multisig.rs @@ -1,4 +1,3 @@ - //! Autogenerated weights for `multisig` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev @@ -23,7 +22,7 @@ #![allow(unused_parens)] #![allow(unused_imports)] -use support::{traits::Get, weights::Weight}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; /// Weight functions for `multisig`. diff --git a/runtime/dali/src/weights/oracle.rs b/runtime/dali/src/weights/oracle.rs index b646dc791ae..095ac7dc6ce 100644 --- a/runtime/dali/src/weights/oracle.rs +++ b/runtime/dali/src/weights/oracle.rs @@ -20,8 +20,8 @@ #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; /// Weight functions for oracle. pub struct WeightInfo(PhantomData); diff --git a/runtime/dali/src/weights/scheduler.rs b/runtime/dali/src/weights/scheduler.rs index 52686e5d5d4..ec7eadb3c6c 100644 --- a/runtime/dali/src/weights/scheduler.rs +++ b/runtime/dali/src/weights/scheduler.rs @@ -1,56 +1,65 @@ -//! Autogenerated weights for scheduler + +//! Autogenerated weights for `scheduler` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-24, STEPS: `[5, ]`, REPEAT: 2, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dali-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=dali-dev // --execution=wasm // --wasm-execution=compiled // --pallet=scheduler // --extrinsic=* -// --steps=5 -// --repeat=2 +// --steps=50 +// --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/dali/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for scheduler. +/// Weight functions for `scheduler`. pub struct WeightInfo(PhantomData); impl scheduler::WeightInfo for WeightInfo { - fn schedule(s: u32) -> Weight { - (43_832_000 as Weight) - // Standard Error: 181_000 - .saturating_add((7_000 as Weight).saturating_mul(s as Weight)) + // Storage: Scheduler Agenda (r:1 w:1) + fn schedule(s: u32, ) -> Weight { + (26_133_000 as Weight) + // Standard Error: 3_000 + .saturating_add((121_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn cancel(s: u32) -> Weight { - (33_112_000 as Weight) - // Standard Error: 234_000 - .saturating_add((4_865_000 as Weight).saturating_mul(s as Weight)) + // Storage: Scheduler Agenda (r:1 w:1) + // Storage: Scheduler Lookup (r:0 w:1) + fn cancel(s: u32, ) -> Weight { + (25_861_000 as Weight) + // Standard Error: 26_000 + .saturating_add((1_700_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn schedule_named(s: u32) -> Weight { - (45_294_000 as Weight) - // Standard Error: 23_000 - .saturating_add((221_000 as Weight).saturating_mul(s as Weight)) + // Storage: Scheduler Lookup (r:1 w:1) + // Storage: Scheduler Agenda (r:1 w:1) + fn schedule_named(s: u32, ) -> Weight { + (31_526_000 as Weight) + // Standard Error: 1_000 + .saturating_add((147_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn cancel_named(s: u32) -> Weight { - (38_311_000 as Weight) - // Standard Error: 95_000 - .saturating_add((4_575_000 as Weight).saturating_mul(s as Weight)) + // Storage: Scheduler Lookup (r:1 w:1) + // Storage: Scheduler Agenda (r:1 w:1) + fn cancel_named(s: u32, ) -> Weight { + (26_934_000 as Weight) + // Standard Error: 6_000 + .saturating_add((1_733_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/runtime/dali/src/weights/session.rs b/runtime/dali/src/weights/session.rs index 541224d3546..82593ab0aac 100644 --- a/runtime/dali/src/weights/session.rs +++ b/runtime/dali/src/weights/session.rs @@ -20,8 +20,8 @@ #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; /// Weight functions for session. pub struct WeightInfo(PhantomData); diff --git a/runtime/dali/src/weights/timestamp.rs b/runtime/dali/src/weights/timestamp.rs index d49e0618b50..f8ba18938d6 100644 --- a/runtime/dali/src/weights/timestamp.rs +++ b/runtime/dali/src/weights/timestamp.rs @@ -1,37 +1,41 @@ -//! Autogenerated weights for timestamp + +//! Autogenerated weights for `timestamp` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-22, STEPS: `[5, ]`, REPEAT: 2, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dali-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=dali-dev // --execution=wasm // --wasm-execution=compiled // --pallet=timestamp // --extrinsic=* -// --steps=5 -// --repeat=2 +// --steps=50 +// --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/dali/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for timestamp. +/// Weight functions for `timestamp`. pub struct WeightInfo(PhantomData); impl timestamp::WeightInfo for WeightInfo { + // Storage: Timestamp Now (r:1 w:1) + // Storage: Aura CurrentSlot (r:1 w:0) fn set() -> Weight { - (18_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) + (18_977_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn on_finalize() -> Weight { - (7_000_000 as Weight) + (8_350_000 as Weight) } } diff --git a/runtime/dali/src/weights/tokens.rs b/runtime/dali/src/weights/tokens.rs index 161320a6dd3..56806851601 100644 --- a/runtime/dali/src/weights/tokens.rs +++ b/runtime/dali/src/weights/tokens.rs @@ -2,11 +2,11 @@ #![allow(unused_imports)] #![allow(clippy::unnecessary_cast)] -use sp_std::marker::PhantomData; -use support::{ +use frame_support::{ traits::Get, weights::{constants::RocksDbWeight, Weight}, }; +use sp_std::marker::PhantomData; /// Default weights. pub struct WeightInfo(PhantomData); diff --git a/runtime/dali/src/weights/treasury.rs b/runtime/dali/src/weights/treasury.rs index 38a6f2a7ff1..f893b42bcba 100644 --- a/runtime/dali/src/weights/treasury.rs +++ b/runtime/dali/src/weights/treasury.rs @@ -1,13 +1,14 @@ -//! Autogenerated weights for treasury + +//! Autogenerated weights for `treasury` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-23, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dali-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=dali-dev // --execution=wasm // --wasm-execution=compiled // --pallet=treasury @@ -15,38 +16,48 @@ // --steps=50 // --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/dali/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for treasury. +/// Weight functions for `treasury`. pub struct WeightInfo(PhantomData); impl treasury::WeightInfo for WeightInfo { + // Storage: Treasury ProposalCount (r:1 w:1) + // Storage: Treasury Proposals (r:0 w:1) fn propose_spend() -> Weight { - (213_896_000 as Weight) + (67_339_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } + // Storage: Treasury Proposals (r:1 w:1) + // Storage: System Account (r:2 w:2) fn reject_proposal() -> Weight { - (357_257_000 as Weight) + (89_248_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn approve_proposal(p: u32) -> Weight { - (48_959_000 as Weight) - // Standard Error: 58_000 - .saturating_add((139_000 as Weight).saturating_mul(p as Weight)) + // Storage: Treasury Proposals (r:1 w:0) + // Storage: Treasury Approvals (r:1 w:1) + fn approve_proposal(p: u32, ) -> Weight { + (15_617_000 as Weight) + // Standard Error: 50_000 + .saturating_add((297_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn on_initialize_proposals(p: u32) -> Weight { - (180_865_000 as Weight) - // Standard Error: 9_488_000 - .saturating_add((241_148_000 as Weight).saturating_mul(p as Weight)) + // Storage: System Account (r:1 w:0) + // Storage: Treasury Approvals (r:1 w:1) + // Storage: Treasury Proposals (r:1 w:1) + fn on_initialize_proposals(p: u32, ) -> Weight { + (50_253_000 as Weight) + // Standard Error: 1_061_000 + .saturating_add((65_655_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight))) .saturating_add(T::DbWeight::get().writes(2 as Weight)) diff --git a/runtime/dali/src/weights/utility.rs b/runtime/dali/src/weights/utility.rs index b136ab71700..ec86559933e 100644 --- a/runtime/dali/src/weights/utility.rs +++ b/runtime/dali/src/weights/utility.rs @@ -1,13 +1,14 @@ + //! Autogenerated weights for `utility` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2021-12-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 +//! DATE: 2022-01-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dali-dev"), DB CACHE: 128 // Executed Command: // ./target/release/composable // benchmark -// --chain=picasso-dev +// --chain=dali-dev // --execution=wasm // --wasm-execution=compiled // --pallet=utility @@ -15,32 +16,38 @@ // --steps=50 // --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/dali/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -use support::{traits::Get, weights::Weight}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; /// Weight functions for `utility`. pub struct WeightInfo(PhantomData); impl utility::WeightInfo for WeightInfo { + // Storage: CallFilter DisabledCalls (r:1 w:0) fn batch(c: u32, ) -> Weight { - (277_000 as Weight) + (31_182_000 as Weight) // Standard Error: 2_000 - .saturating_add((4_110_000 as Weight).saturating_mul(c as Weight)) + .saturating_add((9_073_000 as Weight).saturating_mul(c as Weight)) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) } + // Storage: CallFilter DisabledCalls (r:1 w:0) fn as_derivative() -> Weight { - (3_000_000 as Weight) + (8_550_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) } + // Storage: CallFilter DisabledCalls (r:1 w:0) fn batch_all(c: u32, ) -> Weight { - (0 as Weight) + (15_732_000 as Weight) // Standard Error: 5_000 - .saturating_add((4_491_000 as Weight).saturating_mul(c as Weight)) + .saturating_add((9_666_000 as Weight).saturating_mul(c as Weight)) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) } fn dispatch_as() -> Weight { - (10_000_000 as Weight) + (17_050_000 as Weight) } } diff --git a/runtime/dali/src/weights/vault.rs b/runtime/dali/src/weights/vault.rs index 7d518623b96..179cd304bdb 100644 --- a/runtime/dali/src/weights/vault.rs +++ b/runtime/dali/src/weights/vault.rs @@ -23,7 +23,7 @@ #![allow(unused_parens)] #![allow(unused_imports)] -use support::{traits::Get, weights::Weight}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; /// Weight functions for `vault`. diff --git a/runtime/dali/src/xcmp.rs b/runtime/dali/src/xcmp.rs index 6ea37eeb342..e2297a1564b 100644 --- a/runtime/dali/src/xcmp.rs +++ b/runtime/dali/src/xcmp.rs @@ -7,7 +7,7 @@ use super::*; // recursive dependency onto runtime use codec::{Decode, Encode}; use composable_traits::assets::{RemoteAssetRegistry, XcmAssetLocation}; use cumulus_primitives_core::ParaId; -use support::{ +use frame_support::{ construct_runtime, log, match_type, parameter_types, traits::{Contains, Everything, KeyOwnerProofSystem, Nothing, Randomness, StorageInfo}, weights::{ diff --git a/runtime/picasso/Cargo.toml b/runtime/picasso/Cargo.toml index 00968ab44d1..fda5fc2386b 100644 --- a/runtime/picasso/Cargo.toml +++ b/runtime/picasso/Cargo.toml @@ -2,7 +2,7 @@ name = "picasso-runtime" version = "0.1.0" edition = "2021" -rust-version = "1.56" + description = "Picasso, Kusama Parachain Runtime Implementation" authors = ["Seun Lanlege "] @@ -23,12 +23,11 @@ normal = [ "pallet-vault", "session-benchmarking", "vault", - "pallet-dutch-auction", ] [dependencies] frame-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -support = { package = "frame-support", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } # primitives @@ -130,7 +129,7 @@ std = [ "sp-block-builder/std", "sp-transaction-pool/std", "sp-inherents/std", - "support/std", + "frame-support/std", "executive/std", "frame-system/std", "utility/std", @@ -172,18 +171,18 @@ std = [ "orml-xcm-support/std", "orml-unknown-tokens/std", "composable-traits/std", - "governance-registry/std", - "currency-factory/std", - "assets/std", - "vesting/std", - "bonded-finance/std", - "crowdloan-rewards/std", + "governance-registry/std", + "currency-factory/std", + "assets/std", + "vesting/std", + "bonded-finance/std", + "crowdloan-rewards/std", ] runtime-benchmarks = [ "balances/runtime-benchmarks", "benchmarking", - "support/runtime-benchmarks", + "frame-support/runtime-benchmarks", "system-benchmarking", "frame-system/runtime-benchmarks", "hex-literal", @@ -204,10 +203,10 @@ runtime-benchmarks = [ "collective/runtime-benchmarks", "democracy/runtime-benchmarks", "utility/runtime-benchmarks", - "crowdloan-rewards/runtime-benchmarks", - "currency-factory/runtime-benchmarks", - "assets/runtime-benchmarks", - "vesting/runtime-benchmarks", - "bonded-finance/runtime-benchmarks", + "crowdloan-rewards/runtime-benchmarks", + "currency-factory/runtime-benchmarks", + "assets/runtime-benchmarks", + "vesting/runtime-benchmarks", + "bonded-finance/runtime-benchmarks", ] diff --git a/runtime/picasso/src/lib.rs b/runtime/picasso/src/lib.rs index 93f97451132..699c1d9440f 100644 --- a/runtime/picasso/src/lib.rs +++ b/runtime/picasso/src/lib.rs @@ -43,7 +43,7 @@ use sp_version::NativeVersion; use sp_version::RuntimeVersion; // A few exports that help ease life for downstream crates. -pub use support::{ +pub use frame_support::{ construct_runtime, match_type, parameter_types, traits::{Contains, Everything, KeyOwnerProofSystem, Nothing, Randomness, StorageInfo}, weights::{ @@ -55,11 +55,11 @@ pub use support::{ }; use codec::Encode; +use frame_support::traits::EqualPrivilegeOnly; use frame_system as system; #[cfg(any(feature = "std", test))] pub use sp_runtime::BuildStorage; pub use sp_runtime::{FixedPointNumber, Perbill, Permill, Perquintill}; -use support::traits::EqualPrivilegeOnly; use system::{ limits::{BlockLength, BlockWeights}, EnsureRoot, @@ -953,10 +953,10 @@ impl_runtime_apis! { impl benchmarking::Benchmark for Runtime { fn benchmark_metadata(extra: bool) -> ( Vec, - Vec, + Vec, ) { use benchmarking::{list_benchmark, Benchmarking, BenchmarkList}; - use support::traits::StorageInfoTrait; + use frame_support::traits::StorageInfoTrait; use system_benchmarking::Pallet as SystemBench; let mut list = Vec::::new(); diff --git a/runtime/picasso/src/weights/balances.rs b/runtime/picasso/src/weights/balances.rs index cc8d784f857..b5627b30bf7 100644 --- a/runtime/picasso/src/weights/balances.rs +++ b/runtime/picasso/src/weights/balances.rs @@ -1,7 +1,8 @@ -//! Autogenerated weights for balances + +//! Autogenerated weights for `balances` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-22, STEPS: `[5, ]`, REPEAT: 2, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-19, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 // Executed Command: @@ -12,52 +13,61 @@ // --wasm-execution=compiled // --pallet=balances // --extrinsic=* -// --steps=5 -// --repeat=2 +// --steps=50 +// --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/picasso/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for balances. +/// Weight functions for `balances`. pub struct WeightInfo(PhantomData); impl balances::WeightInfo for WeightInfo { + // Storage: System Account (r:2 w:2) fn transfer() -> Weight { - (139_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) + (91_710_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) } + // Storage: System Account (r:1 w:1) fn transfer_keep_alive() -> Weight { - (81_000_000 as Weight) + (55_210_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: System Account (r:1 w:1) fn set_balance_creating() -> Weight { - (47_000_000 as Weight) + (31_990_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: System Account (r:1 w:1) fn set_balance_killing() -> Weight { - (54_000_000 as Weight) + (38_394_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: System Account (r:3 w:3) fn force_transfer() -> Weight { - (110_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) + (91_815_000 as Weight) + .saturating_add(T::DbWeight::get().reads(3 as Weight)) + .saturating_add(T::DbWeight::get().writes(3 as Weight)) } + // Storage: System Account (r:1 w:1) fn transfer_all() -> Weight { - (100_000_000 as Weight) + (67_669_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - + // Storage: System Account (r:1 w:1) fn force_unreserve() -> Weight { - (100_000_000 as Weight) + (29_533_000 as Weight) + .saturating_add(T::DbWeight::get().reads(1 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } } diff --git a/runtime/picasso/src/weights/collator_selection.rs b/runtime/picasso/src/weights/collator_selection.rs index 8e7427027e1..6b32796b2bc 100644 --- a/runtime/picasso/src/weights/collator_selection.rs +++ b/runtime/picasso/src/weights/collator_selection.rs @@ -1,52 +1,93 @@ + +//! Autogenerated weights for `collator_selection` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-19, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 + +// Executed Command: +// ./target/release/composable +// benchmark +// --chain=picasso-dev +// --execution=wasm +// --wasm-execution=compiled +// --pallet=collator_selection +// --extrinsic=* +// --steps=50 +// --repeat=20 +// --raw +// --output=runtime/picasso/src/weights + +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weights for pallet_collator_selection using the Substrate node and recommended hardware. +/// Weight functions for `collator_selection`. pub struct WeightInfo(PhantomData); impl collator_selection::WeightInfo for WeightInfo { - fn set_invulnerables(b: u32) -> Weight { - (18_563_000 as Weight) + // Storage: CollatorSelection Invulnerables (r:0 w:1) + fn set_invulnerables(b: u32, ) -> Weight { + (16_722_000 as Weight) // Standard Error: 0 - .saturating_add((68_000 as Weight).saturating_mul(b as Weight)) + .saturating_add((36_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: CollatorSelection DesiredCandidates (r:0 w:1) fn set_desired_candidates() -> Weight { - (16_363_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (14_820_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: CollatorSelection CandidacyBond (r:0 w:1) fn set_candidacy_bond() -> Weight { - (16_840_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (15_362_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn register_as_candidate(c: u32) -> Weight { - (71_196_000 as Weight) - // Standard Error: 0 - .saturating_add((198_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) + // Storage: CollatorSelection Candidates (r:1 w:1) + // Storage: CollatorSelection DesiredCandidates (r:1 w:0) + // Storage: CollatorSelection Invulnerables (r:1 w:0) + // Storage: Session NextKeys (r:1 w:0) + // Storage: CollatorSelection CandidacyBond (r:1 w:0) + // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) + fn register_as_candidate(c: u32, ) -> Weight { + (90_368_000 as Weight) + // Standard Error: 1_000 + .saturating_add((157_000 as Weight).saturating_mul(c as Weight)) + .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn leave_intent(c: u32) -> Weight { - (55_336_000 as Weight) - // Standard Error: 0 - .saturating_add((151_000 as Weight).saturating_mul(c as Weight)) + // Storage: CollatorSelection Candidates (r:1 w:1) + // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) + fn leave_intent(c: u32, ) -> Weight { + (84_260_000 as Weight) + // Standard Error: 1_000 + .saturating_add((225_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } + // Storage: System Account (r:2 w:2) + // Storage: System BlockWeight (r:1 w:1) + // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn note_author() -> Weight { - (71_461_000 as Weight) + (62_756_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } - fn new_session(r: u32, c: u32) -> Weight { + // Storage: CollatorSelection Candidates (r:1 w:1) + // Storage: CollatorSelection LastAuthoredBlock (r:1000 w:1) + // Storage: System Account (r:1 w:1) + // Storage: CollatorSelection Invulnerables (r:1 w:0) + // Storage: System BlockWeight (r:1 w:1) + fn new_session(r: u32, c: u32, ) -> Weight { (0 as Weight) - // Standard Error: 1_010_000 - .saturating_add((109_961_000 as Weight).saturating_mul(r as Weight)) - // Standard Error: 1_010_000 - .saturating_add((151_952_000 as Weight).saturating_mul(c as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) + // Standard Error: 4_172_000 + .saturating_add((21_918_000 as Weight).saturating_mul(r as Weight)) + // Standard Error: 4_172_000 + .saturating_add((110_284_000 as Weight).saturating_mul(c as Weight)) .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight))) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(r as Weight))) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(c as Weight))) + .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(c as Weight))) } } diff --git a/runtime/picasso/src/weights/collective.rs b/runtime/picasso/src/weights/collective.rs index 6fc9ddebf28..f65986b4a49 100644 --- a/runtime/picasso/src/weights/collective.rs +++ b/runtime/picasso/src/weights/collective.rs @@ -1,7 +1,8 @@ -//! Autogenerated weights for collective + +//! Autogenerated weights for `collective` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-24, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-19, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 // Executed Command: @@ -15,106 +16,144 @@ // --steps=50 // --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/picasso/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for collective. +/// Weight functions for `collective`. pub struct WeightInfo(PhantomData); impl collective::WeightInfo for WeightInfo { - fn set_members(m: u32, _n: u32, p: u32) -> Weight { + // Storage: Council Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: Council Voting (r:100 w:100) + // Storage: Council Prime (r:0 w:1) + fn set_members(m: u32, n: u32, p: u32, ) -> Weight { (0 as Weight) - // Standard Error: 63_000 - .saturating_add((25_207_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 63_000 - .saturating_add((33_546_000 as Weight).saturating_mul(p as Weight)) + // Standard Error: 7_000 + .saturating_add((15_474_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 7_000 + .saturating_add((229_000 as Weight).saturating_mul(n as Weight)) + // Standard Error: 7_000 + .saturating_add((20_595_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(p as Weight))) .saturating_add(T::DbWeight::get().writes(2 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) } - fn execute(b: u32, m: u32) -> Weight { - (30_323_000 as Weight) + // Storage: Council Members (r:1 w:0) + fn execute(b: u32, m: u32, ) -> Weight { + (22_076_000 as Weight) // Standard Error: 0 - .saturating_add((5_000 as Weight).saturating_mul(b as Weight)) + .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) // Standard Error: 0 - .saturating_add((127_000 as Weight).saturating_mul(m as Weight)) + .saturating_add((85_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) } - fn propose_execute(b: u32, m: u32) -> Weight { - (38_575_000 as Weight) + // Storage: Council Members (r:1 w:0) + // Storage: Council ProposalOf (r:1 w:0) + fn propose_execute(b: u32, m: u32, ) -> Weight { + (26_094_000 as Weight) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) - // Standard Error: 3_000 - .saturating_add((254_000 as Weight).saturating_mul(m as Weight)) + .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) + // Standard Error: 0 + .saturating_add((164_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) } - fn propose_proposed(b: u32, m: u32, p: u32) -> Weight { - (48_131_000 as Weight) + // Storage: Council Members (r:1 w:0) + // Storage: Council ProposalOf (r:1 w:1) + // Storage: Council Proposals (r:1 w:1) + // Storage: Council ProposalCount (r:1 w:1) + // Storage: Council Voting (r:0 w:1) + fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight { + (35_005_000 as Weight) // Standard Error: 0 - .saturating_add((18_000 as Weight).saturating_mul(b as Weight)) - // Standard Error: 7_000 - .saturating_add((147_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 7_000 - .saturating_add((909_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((9_000 as Weight).saturating_mul(b as Weight)) + // Standard Error: 2_000 + .saturating_add((105_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 2_000 + .saturating_add((407_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } - fn vote(m: u32) -> Weight { - (75_974_000 as Weight) - // Standard Error: 4_000 - .saturating_add((370_000 as Weight).saturating_mul(m as Weight)) + // Storage: Council Members (r:1 w:0) + // Storage: Council Voting (r:1 w:1) + fn vote(m: u32, ) -> Weight { + (43_185_000 as Weight) + // Standard Error: 3_000 + .saturating_add((184_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn close_early_disapproved(m: u32, p: u32) -> Weight { - (63_575_000 as Weight) - // Standard Error: 5_000 - .saturating_add((293_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 5_000 - .saturating_add((761_000 as Weight).saturating_mul(p as Weight)) + // Storage: Council Voting (r:1 w:1) + // Storage: Council Members (r:1 w:0) + // Storage: Council Proposals (r:1 w:1) + // Storage: Council ProposalOf (r:0 w:1) + fn close_early_disapproved(m: u32, p: u32, ) -> Weight { + (44_456_000 as Weight) + // Standard Error: 2_000 + .saturating_add((171_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 2_000 + .saturating_add((341_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn close_early_approved(b: u32, m: u32, p: u32) -> Weight { - (86_824_000 as Weight) + // Storage: Council Voting (r:1 w:1) + // Storage: Council Members (r:1 w:0) + // Storage: Council ProposalOf (r:1 w:1) + // Storage: Council Proposals (r:1 w:1) + fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight { + (50_303_000 as Weight) // Standard Error: 0 - .saturating_add((12_000 as Weight).saturating_mul(b as Weight)) - // Standard Error: 8_000 - .saturating_add((321_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 8_000 - .saturating_add((860_000 as Weight).saturating_mul(p as Weight)) + .saturating_add((8_000 as Weight).saturating_mul(b as Weight)) + // Standard Error: 2_000 + .saturating_add((194_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 2_000 + .saturating_add((420_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn close_disapproved(m: u32, p: u32) -> Weight { - (70_231_000 as Weight) - // Standard Error: 7_000 - .saturating_add((323_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 6_000 - .saturating_add((784_000 as Weight).saturating_mul(p as Weight)) + // Storage: Council Voting (r:1 w:1) + // Storage: Council Members (r:1 w:0) + // Storage: Council Prime (r:1 w:0) + // Storage: Council Proposals (r:1 w:1) + // Storage: Council ProposalOf (r:0 w:1) + fn close_disapproved(m: u32, p: u32, ) -> Weight { + (48_479_000 as Weight) + // Standard Error: 2_000 + .saturating_add((180_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 1_000 + .saturating_add((341_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn close_approved(b: u32, m: u32, p: u32) -> Weight { - (92_370_000 as Weight) - // Standard Error: 1_000 - .saturating_add((11_000 as Weight).saturating_mul(b as Weight)) - // Standard Error: 10_000 - .saturating_add((327_000 as Weight).saturating_mul(m as Weight)) - // Standard Error: 9_000 - .saturating_add((899_000 as Weight).saturating_mul(p as Weight)) + // Storage: Council Voting (r:1 w:1) + // Storage: Council Members (r:1 w:0) + // Storage: Council Prime (r:1 w:0) + // Storage: Council ProposalOf (r:1 w:1) + // Storage: Council Proposals (r:1 w:1) + fn close_approved(b: u32, m: u32, p: u32, ) -> Weight { + (51_672_000 as Weight) + // Standard Error: 0 + .saturating_add((9_000 as Weight).saturating_mul(b as Weight)) + // Standard Error: 2_000 + .saturating_add((208_000 as Weight).saturating_mul(m as Weight)) + // Standard Error: 2_000 + .saturating_add((427_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn disapprove_proposal(p: u32) -> Weight { - (35_489_000 as Weight) - // Standard Error: 4_000 - .saturating_add((830_000 as Weight).saturating_mul(p as Weight)) + // Storage: Council Proposals (r:1 w:1) + // Storage: Council Voting (r:0 w:1) + // Storage: Council ProposalOf (r:0 w:1) + fn disapprove_proposal(p: u32, ) -> Weight { + (26_984_000 as Weight) + // Standard Error: 1_000 + .saturating_add((398_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } diff --git a/runtime/picasso/src/weights/crowdloan_rewards.rs b/runtime/picasso/src/weights/crowdloan_rewards.rs index d755d08a755..f3e846912d4 100644 --- a/runtime/picasso/src/weights/crowdloan_rewards.rs +++ b/runtime/picasso/src/weights/crowdloan_rewards.rs @@ -1,4 +1,3 @@ - //! Autogenerated weights for `crowdloan_rewards` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev @@ -22,7 +21,7 @@ #![allow(unused_parens)] #![allow(unused_imports)] -use support::{traits::Get, weights::Weight}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; /// Weight functions for `crowdloan_rewards`. diff --git a/runtime/picasso/src/weights/democracy.rs b/runtime/picasso/src/weights/democracy.rs index 0b528a6d67e..f41582fd4bd 100644 --- a/runtime/picasso/src/weights/democracy.rs +++ b/runtime/picasso/src/weights/democracy.rs @@ -1,7 +1,8 @@ -//! Autogenerated weights for democracy + +//! Autogenerated weights for `democracy` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-24, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-19, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 // Executed Command: @@ -15,176 +16,248 @@ // --steps=50 // --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/picasso/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for democracy. +/// Weight functions for `democracy`. pub struct WeightInfo(PhantomData); impl democracy::WeightInfo for WeightInfo { + // Storage: Democracy PublicPropCount (r:1 w:1) + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:0) + // Storage: Democracy DepositOf (r:0 w:1) fn propose() -> Weight { - (112_082_000 as Weight) + (76_230_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn second(s: u32) -> Weight { - (56_014_000 as Weight) - // Standard Error: 3_000 - .saturating_add((349_000 as Weight).saturating_mul(s as Weight)) + // Storage: Democracy DepositOf (r:1 w:1) + fn second(s: u32, ) -> Weight { + (39_494_000 as Weight) + // Standard Error: 1_000 + .saturating_add((235_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn vote_new(r: u32) -> Weight { - (62_157_000 as Weight) - // Standard Error: 4_000 - .saturating_add((512_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + fn vote_new(r: u32, ) -> Weight { + (43_207_000 as Weight) + // Standard Error: 0 + .saturating_add((232_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn vote_existing(r: u32) -> Weight { - (62_708_000 as Weight) - // Standard Error: 4_000 - .saturating_add((495_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + fn vote_existing(r: u32, ) -> Weight { + (43_457_000 as Weight) + // Standard Error: 1_000 + .saturating_add((211_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy Cancellations (r:1 w:1) fn emergency_cancel() -> Weight { - (38_669_000 as Weight) + (26_370_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn blacklist(p: u32) -> Weight { - (113_805_000 as Weight) - // Standard Error: 9_000 - .saturating_add((998_000 as Weight).saturating_mul(p as Weight)) + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy Blacklist (r:0 w:1) + // Storage: Democracy DepositOf (r:1 w:1) + // Storage: System Account (r:2 w:2) + fn blacklist(p: u32, ) -> Weight { + (89_730_000 as Weight) + // Standard Error: 6_000 + .saturating_add((567_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(6 as Weight)) .saturating_add(T::DbWeight::get().writes(7 as Weight)) } - fn external_propose(v: u32) -> Weight { - (19_088_000 as Weight) + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:0) + fn external_propose(v: u32, ) -> Weight { + (13_491_000 as Weight) // Standard Error: 0 - .saturating_add((113_000 as Weight).saturating_mul(v as Weight)) + .saturating_add((77_000 as Weight).saturating_mul(v as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_majority() -> Weight { - (4_287_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (2_913_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: Democracy NextExternal (r:0 w:1) fn external_propose_default() -> Weight { - (4_227_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (2_941_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:1) + // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn fast_track() -> Weight { - (38_917_000 as Weight) + (27_424_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn veto_external(v: u32) -> Weight { - (40_067_000 as Weight) + // Storage: Democracy NextExternal (r:1 w:1) + // Storage: Democracy Blacklist (r:1 w:1) + fn veto_external(v: u32, ) -> Weight { + (28_681_000 as Weight) // Standard Error: 0 - .saturating_add((172_000 as Weight).saturating_mul(v as Weight)) + .saturating_add((109_000 as Weight).saturating_mul(v as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn cancel_proposal(p: u32) -> Weight { - (69_372_000 as Weight) - // Standard Error: 5_000 - .saturating_add((991_000 as Weight).saturating_mul(p as Weight)) + // Storage: Democracy PublicProps (r:1 w:1) + // Storage: Democracy DepositOf (r:1 w:1) + // Storage: System Account (r:2 w:2) + fn cancel_proposal(p: u32, ) -> Weight { + (66_475_000 as Weight) + // Standard Error: 2_000 + .saturating_add((513_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } + // Storage: Democracy ReferendumInfoOf (r:0 w:1) fn cancel_referendum() -> Weight { - (23_073_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (17_019_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn cancel_queued(r: u32) -> Weight { - (36_184_000 as Weight) - // Standard Error: 32_000 - .saturating_add((6_334_000 as Weight).saturating_mul(r as Weight)) + // Storage: Scheduler Lookup (r:1 w:1) + // Storage: Scheduler Agenda (r:1 w:1) + fn cancel_queued(r: u32, ) -> Weight { + (30_511_000 as Weight) + // Standard Error: 2_000 + .saturating_add((1_399_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn on_initialize_base(r: u32) -> Weight { - (0 as Weight) - // Standard Error: 44_000 - .saturating_add((8_834_000 as Weight).saturating_mul(r as Weight)) - .saturating_add(T::DbWeight::get().reads(5 as Weight)) + // Storage: Democracy LowestUnbaked (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:0) + // Storage: Democracy ReferendumInfoOf (r:1 w:0) + fn on_initialize_base(r: u32, ) -> Weight { + (5_850_000 as Weight) + // Standard Error: 4_000 + .saturating_add((5_240_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - - fn on_initialize_base_with_launch_period(_r: u32) -> Weight { - (0 as Weight) + // Storage: Democracy LowestUnbaked (r:1 w:1) + // Storage: Democracy ReferendumCount (r:1 w:0) + // Storage: Democracy LastTabledWasExternal (r:1 w:0) + // Storage: Democracy NextExternal (r:1 w:0) + // Storage: Democracy PublicProps (r:1 w:0) + // Storage: Democracy ReferendumInfoOf (r:1 w:0) + fn on_initialize_base_with_launch_period(r: u32, ) -> Weight { + (13_175_000 as Weight) + // Standard Error: 4_000 + .saturating_add((5_263_000 as Weight).saturating_mul(r as Weight)) + .saturating_add(T::DbWeight::get().reads(5 as Weight)) + .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - - fn delegate(r: u32) -> Weight { - (67_447_000 as Weight) - // Standard Error: 64_000 - .saturating_add((11_600_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy VotingOf (r:3 w:3) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + fn delegate(r: u32, ) -> Weight { + (58_838_000 as Weight) + // Standard Error: 5_000 + .saturating_add((6_950_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes(4 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) } - fn undelegate(r: u32) -> Weight { - (37_144_000 as Weight) - // Standard Error: 36_000 - .saturating_add((10_896_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy VotingOf (r:2 w:2) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + fn undelegate(r: u32, ) -> Weight { + (27_174_000 as Weight) + // Standard Error: 4_000 + .saturating_add((7_016_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(r as Weight))) .saturating_add(T::DbWeight::get().writes(2 as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(r as Weight))) } + // Storage: Democracy PublicProps (r:0 w:1) fn clear_public_proposals() -> Weight { - (4_006_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) + (3_298_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn note_preimage(b: u32) -> Weight { - (61_302_000 as Weight) + // Storage: Democracy Preimages (r:1 w:1) + fn note_preimage(b: u32, ) -> Weight { + (42_172_000 as Weight) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) + .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn note_imminent_preimage(b: u32) -> Weight { - (39_217_000 as Weight) + // Storage: Democracy Preimages (r:1 w:1) + fn note_imminent_preimage(b: u32, ) -> Weight { + (28_049_000 as Weight) // Standard Error: 0 - .saturating_add((3_000 as Weight).saturating_mul(b as Weight)) + .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn reap_preimage(b: u32) -> Weight { - (53_786_000 as Weight) + // Storage: Democracy Preimages (r:1 w:1) + // Storage: System Account (r:1 w:0) + fn reap_preimage(b: u32, ) -> Weight { + (40_301_000 as Weight) // Standard Error: 0 - .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) + .saturating_add((1_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn unlock_remove(r: u32) -> Weight { - (54_249_000 as Weight) - // Standard Error: 4_000 - .saturating_add((313_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + // Storage: System Account (r:1 w:1) + fn unlock_remove(r: u32, ) -> Weight { + (37_625_000 as Weight) + // Standard Error: 1_000 + .saturating_add((104_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn unlock_set(r: u32) -> Weight { - (48_885_000 as Weight) - // Standard Error: 4_000 - .saturating_add((486_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy VotingOf (r:1 w:1) + // Storage: Balances Locks (r:1 w:1) + // Storage: System Account (r:1 w:1) + fn unlock_set(r: u32, ) -> Weight { + (35_585_000 as Weight) + // Standard Error: 2_000 + .saturating_add((190_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn remove_vote(r: u32) -> Weight { - (25_483_000 as Weight) - // Standard Error: 3_000 - .saturating_add((508_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + fn remove_vote(r: u32, ) -> Weight { + (20_515_000 as Weight) + // Standard Error: 2_000 + .saturating_add((177_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn remove_other_vote(r: u32) -> Weight { - (26_969_000 as Weight) - // Standard Error: 3_000 - .saturating_add((289_000 as Weight).saturating_mul(r as Weight)) + // Storage: Democracy ReferendumInfoOf (r:1 w:1) + // Storage: Democracy VotingOf (r:1 w:1) + fn remove_other_vote(r: u32, ) -> Weight { + (20_196_000 as Weight) + // Standard Error: 1_000 + .saturating_add((192_000 as Weight).saturating_mul(r as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/runtime/picasso/src/weights/frame_system.rs b/runtime/picasso/src/weights/frame_system.rs index 940dabf0cb2..599cf555d91 100644 --- a/runtime/picasso/src/weights/frame_system.rs +++ b/runtime/picasso/src/weights/frame_system.rs @@ -1,7 +1,8 @@ -//! Autogenerated weights for frame_system + +//! Autogenerated weights for `frame_system` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-22, STEPS: `[5, ]`, REPEAT: 2, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-19, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 // Executed Command: @@ -12,52 +13,55 @@ // --wasm-execution=compiled // --pallet=frame_system // --extrinsic=* -// --steps=5 -// --repeat=2 +// --steps=50 +// --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/picasso/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for frame_system. +/// Weight functions for `frame_system`. pub struct WeightInfo(PhantomData); impl frame_system::WeightInfo for WeightInfo { - fn remark(_b: u32) -> Weight { - (1_381_000 as Weight) + fn remark(_b: u32, ) -> Weight { + (0 as Weight) } - fn remark_with_event(b: u32) -> Weight { + fn remark_with_event(b: u32, ) -> Weight { (0 as Weight) // Standard Error: 0 - .saturating_add((1_000 as Weight).saturating_mul(b as Weight)) + .saturating_add((2_000 as Weight).saturating_mul(b as Weight)) } + // Storage: System Digest (r:1 w:1) + // Storage: unknown [0x3a686561707061676573] (r:0 w:1) fn set_heap_pages() -> Weight { - (3_000_000 as Weight).saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn set_changes_trie_config() -> Weight { - (15_000_000 as Weight) + (5_351_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn set_storage(i: u32) -> Weight { - (25_491_000 as Weight) - // Standard Error: 28_000 - .saturating_add((962_000 as Weight).saturating_mul(i as Weight)) + // Storage: Skipped Metadata (r:0 w:0) + fn set_storage(i: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 0 + .saturating_add((849_000 as Weight).saturating_mul(i as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) } - fn kill_storage(i: u32) -> Weight { - (23_657_000 as Weight) - // Standard Error: 55_000 - .saturating_add((676_000 as Weight).saturating_mul(i as Weight)) + // Storage: Skipped Metadata (r:0 w:0) + fn kill_storage(i: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 1_000 + .saturating_add((564_000 as Weight).saturating_mul(i as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight))) } - fn kill_prefix(p: u32) -> Weight { - (13_414_000 as Weight) - // Standard Error: 77_000 - .saturating_add((1_634_000 as Weight).saturating_mul(p as Weight)) + // Storage: Skipped Metadata (r:0 w:0) + fn kill_prefix(p: u32, ) -> Weight { + (0 as Weight) + // Standard Error: 1_000 + .saturating_add((900_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight))) } } diff --git a/runtime/picasso/src/weights/identity.rs b/runtime/picasso/src/weights/identity.rs index ba2aac5bff3..e338838aae5 100644 --- a/runtime/picasso/src/weights/identity.rs +++ b/runtime/picasso/src/weights/identity.rs @@ -1,4 +1,3 @@ - //! Autogenerated weights for `identity` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev @@ -23,7 +22,7 @@ #![allow(unused_parens)] #![allow(unused_imports)] -use support::{traits::Get, weights::Weight}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; /// Weight functions for `identity`. diff --git a/runtime/picasso/src/weights/indices.rs b/runtime/picasso/src/weights/indices.rs index 912228be72d..0454f4906d9 100644 --- a/runtime/picasso/src/weights/indices.rs +++ b/runtime/picasso/src/weights/indices.rs @@ -1,7 +1,8 @@ -//! Autogenerated weights for indices + +//! Autogenerated weights for `indices` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-23, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-19, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 // Executed Command: @@ -15,39 +16,47 @@ // --steps=50 // --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/picasso/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for indices. +/// Weight functions for `indices`. pub struct WeightInfo(PhantomData); impl indices::WeightInfo for WeightInfo { + // Storage: Indices Accounts (r:1 w:1) fn claim() -> Weight { - (160_634_000 as Weight) + (37_680_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: Indices Accounts (r:1 w:1) + // Storage: System Account (r:1 w:1) fn transfer() -> Weight { - (192_936_000 as Weight) + (45_888_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } + // Storage: Indices Accounts (r:1 w:1) fn free() -> Weight { - (161_780_000 as Weight) + (38_314_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } + // Storage: Indices Accounts (r:1 w:1) + // Storage: System Account (r:1 w:1) fn force_transfer() -> Weight { - (163_771_000 as Weight) + (39_179_000 as Weight) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } + // Storage: Indices Accounts (r:1 w:1) fn freeze() -> Weight { - (150_461_000 as Weight) + (43_602_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } diff --git a/runtime/picasso/src/weights/membership.rs b/runtime/picasso/src/weights/membership.rs index d8e8bd9a20c..ceeaabb7589 100644 --- a/runtime/picasso/src/weights/membership.rs +++ b/runtime/picasso/src/weights/membership.rs @@ -1,7 +1,8 @@ -//! Autogenerated weights for membership + +//! Autogenerated weights for `membership` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-23, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-19, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 // Executed Command: @@ -15,58 +16,93 @@ // --steps=50 // --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/picasso/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for membership. +/// Weight functions for `membership`. pub struct WeightInfo(PhantomData); impl membership::WeightInfo for WeightInfo { - fn add_member(m: u32) -> Weight { - (78_864_000 as Weight) - // Standard Error: 57_000 - .saturating_add((925_000 as Weight).saturating_mul(m as Weight)) + // Storage: CouncilMembership Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: Council Members (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn add_member(m: u32, ) -> Weight { + (23_947_000 as Weight) + // Standard Error: 2_000 + .saturating_add((115_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn remove_member(m: u32) -> Weight { - (81_076_000 as Weight) - // Standard Error: 10_000 - .saturating_add((494_000 as Weight).saturating_mul(m as Weight)) + // Storage: CouncilMembership Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: CouncilMembership Prime (r:1 w:0) + // Storage: Council Members (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn remove_member(m: u32, ) -> Weight { + (28_875_000 as Weight) + // Standard Error: 0 + .saturating_add((105_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn swap_member(m: u32) -> Weight { - (84_930_000 as Weight) - // Standard Error: 16_000 - .saturating_add((612_000 as Weight).saturating_mul(m as Weight)) + // Storage: CouncilMembership Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: CouncilMembership Prime (r:1 w:0) + // Storage: Council Members (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn swap_member(m: u32, ) -> Weight { + (29_055_000 as Weight) + // Standard Error: 1_000 + .saturating_add((119_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn reset_member(m: u32) -> Weight { - (90_093_000 as Weight) - // Standard Error: 9_000 - .saturating_add((1_065_000 as Weight).saturating_mul(m as Weight)) + // Storage: CouncilMembership Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: CouncilMembership Prime (r:1 w:0) + // Storage: Council Members (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn reset_member(m: u32, ) -> Weight { + (29_788_000 as Weight) + // Standard Error: 0 + .saturating_add((244_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn change_key(m: u32) -> Weight { - (76_029_000 as Weight) - // Standard Error: 18_000 - .saturating_add((903_000 as Weight).saturating_mul(m as Weight)) + // Storage: CouncilMembership Members (r:1 w:1) + // Storage: Council Proposals (r:1 w:0) + // Storage: CouncilMembership Prime (r:1 w:1) + // Storage: Council Members (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn change_key(m: u32, ) -> Weight { + (30_605_000 as Weight) + // Standard Error: 0 + .saturating_add((112_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } - fn set_prime(_m: u32) -> Weight { - (57_245_000 as Weight) + // Storage: CouncilMembership Members (r:1 w:0) + // Storage: CouncilMembership Prime (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn set_prime(m: u32, ) -> Weight { + (7_883_000 as Weight) + // Standard Error: 0 + .saturating_add((84_000 as Weight).saturating_mul(m as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn clear_prime(_m: u32) -> Weight { - (12_220_000 as Weight).saturating_add(T::DbWeight::get().writes(2 as Weight)) + // Storage: CouncilMembership Prime (r:0 w:1) + // Storage: Council Prime (r:0 w:1) + fn clear_prime(m: u32, ) -> Weight { + (3_272_000 as Weight) + // Standard Error: 0 + .saturating_add((2_000 as Weight).saturating_mul(m as Weight)) + .saturating_add(T::DbWeight::get().writes(2 as Weight)) } } diff --git a/runtime/picasso/src/weights/multisig.rs b/runtime/picasso/src/weights/multisig.rs index 2923b8248d1..0bee6ac7f84 100644 --- a/runtime/picasso/src/weights/multisig.rs +++ b/runtime/picasso/src/weights/multisig.rs @@ -1,4 +1,3 @@ - //! Autogenerated weights for `multisig` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev @@ -23,7 +22,7 @@ #![allow(unused_parens)] #![allow(unused_imports)] -use support::{traits::Get, weights::Weight}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; /// Weight functions for `multisig`. diff --git a/runtime/picasso/src/weights/scheduler.rs b/runtime/picasso/src/weights/scheduler.rs index 52686e5d5d4..ff815b92c7b 100644 --- a/runtime/picasso/src/weights/scheduler.rs +++ b/runtime/picasso/src/weights/scheduler.rs @@ -1,7 +1,8 @@ -//! Autogenerated weights for scheduler + +//! Autogenerated weights for `scheduler` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-24, STEPS: `[5, ]`, REPEAT: 2, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-19, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 // Executed Command: @@ -12,45 +13,53 @@ // --wasm-execution=compiled // --pallet=scheduler // --extrinsic=* -// --steps=5 -// --repeat=2 +// --steps=50 +// --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/picasso/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for scheduler. +/// Weight functions for `scheduler`. pub struct WeightInfo(PhantomData); impl scheduler::WeightInfo for WeightInfo { - fn schedule(s: u32) -> Weight { - (43_832_000 as Weight) - // Standard Error: 181_000 - .saturating_add((7_000 as Weight).saturating_mul(s as Weight)) + // Storage: Scheduler Agenda (r:1 w:1) + fn schedule(s: u32, ) -> Weight { + (24_885_000 as Weight) + // Standard Error: 1_000 + .saturating_add((129_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn cancel(s: u32) -> Weight { - (33_112_000 as Weight) - // Standard Error: 234_000 - .saturating_add((4_865_000 as Weight).saturating_mul(s as Weight)) + // Storage: Scheduler Agenda (r:1 w:1) + // Storage: Scheduler Lookup (r:0 w:1) + fn cancel(s: u32, ) -> Weight { + (24_004_000 as Weight) + // Standard Error: 2_000 + .saturating_add((1_082_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn schedule_named(s: u32) -> Weight { - (45_294_000 as Weight) - // Standard Error: 23_000 - .saturating_add((221_000 as Weight).saturating_mul(s as Weight)) + // Storage: Scheduler Lookup (r:1 w:1) + // Storage: Scheduler Agenda (r:1 w:1) + fn schedule_named(s: u32, ) -> Weight { + (31_128_000 as Weight) + // Standard Error: 2_000 + .saturating_add((133_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn cancel_named(s: u32) -> Weight { - (38_311_000 as Weight) - // Standard Error: 95_000 - .saturating_add((4_575_000 as Weight).saturating_mul(s as Weight)) + // Storage: Scheduler Lookup (r:1 w:1) + // Storage: Scheduler Agenda (r:1 w:1) + fn cancel_named(s: u32, ) -> Weight { + (27_288_000 as Weight) + // Standard Error: 3_000 + .saturating_add((1_103_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } diff --git a/runtime/picasso/src/weights/session.rs b/runtime/picasso/src/weights/session.rs index 541224d3546..82593ab0aac 100644 --- a/runtime/picasso/src/weights/session.rs +++ b/runtime/picasso/src/weights/session.rs @@ -20,8 +20,8 @@ #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; /// Weight functions for session. pub struct WeightInfo(PhantomData); diff --git a/runtime/picasso/src/weights/timestamp.rs b/runtime/picasso/src/weights/timestamp.rs index d49e0618b50..70775415a3c 100644 --- a/runtime/picasso/src/weights/timestamp.rs +++ b/runtime/picasso/src/weights/timestamp.rs @@ -1,7 +1,8 @@ -//! Autogenerated weights for timestamp + +//! Autogenerated weights for `timestamp` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-22, STEPS: `[5, ]`, REPEAT: 2, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-19, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 // Executed Command: @@ -12,26 +13,29 @@ // --wasm-execution=compiled // --pallet=timestamp // --extrinsic=* -// --steps=5 -// --repeat=2 +// --steps=50 +// --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/picasso/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for timestamp. +/// Weight functions for `timestamp`. pub struct WeightInfo(PhantomData); impl timestamp::WeightInfo for WeightInfo { + // Storage: Timestamp Now (r:1 w:1) + // Storage: Aura CurrentSlot (r:1 w:0) fn set() -> Weight { - (18_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) + (10_081_000 as Weight) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } fn on_finalize() -> Weight { - (7_000_000 as Weight) + (4_540_000 as Weight) } } diff --git a/runtime/picasso/src/weights/tokens.rs b/runtime/picasso/src/weights/tokens.rs index 161320a6dd3..56806851601 100644 --- a/runtime/picasso/src/weights/tokens.rs +++ b/runtime/picasso/src/weights/tokens.rs @@ -2,11 +2,11 @@ #![allow(unused_imports)] #![allow(clippy::unnecessary_cast)] -use sp_std::marker::PhantomData; -use support::{ +use frame_support::{ traits::Get, weights::{constants::RocksDbWeight, Weight}, }; +use sp_std::marker::PhantomData; /// Default weights. pub struct WeightInfo(PhantomData); diff --git a/runtime/picasso/src/weights/treasury.rs b/runtime/picasso/src/weights/treasury.rs index 38a6f2a7ff1..49d4a45f9a4 100644 --- a/runtime/picasso/src/weights/treasury.rs +++ b/runtime/picasso/src/weights/treasury.rs @@ -1,7 +1,8 @@ -//! Autogenerated weights for treasury + +//! Autogenerated weights for `treasury` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-08-23, STEPS: `[50, ]`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-01-19, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 // Executed Command: @@ -15,38 +16,48 @@ // --steps=50 // --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/picasso/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; -use support::{traits::Get, weights::Weight}; -/// Weight functions for treasury. +/// Weight functions for `treasury`. pub struct WeightInfo(PhantomData); impl treasury::WeightInfo for WeightInfo { + // Storage: Treasury ProposalCount (r:1 w:1) + // Storage: Treasury Proposals (r:0 w:1) fn propose_spend() -> Weight { - (213_896_000 as Weight) + (39_340_000 as Weight) .saturating_add(T::DbWeight::get().reads(1 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } + // Storage: Treasury Proposals (r:1 w:1) + // Storage: System Account (r:2 w:2) fn reject_proposal() -> Weight { - (357_257_000 as Weight) + (61_069_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn approve_proposal(p: u32) -> Weight { - (48_959_000 as Weight) - // Standard Error: 58_000 - .saturating_add((139_000 as Weight).saturating_mul(p as Weight)) + // Storage: Treasury Proposals (r:1 w:0) + // Storage: Treasury Approvals (r:1 w:1) + fn approve_proposal(p: u32, ) -> Weight { + (11_635_000 as Weight) + // Standard Error: 3_000 + .saturating_add((205_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } - fn on_initialize_proposals(p: u32) -> Weight { - (180_865_000 as Weight) - // Standard Error: 9_488_000 - .saturating_add((241_148_000 as Weight).saturating_mul(p as Weight)) + // Storage: System Account (r:1 w:0) + // Storage: Treasury Approvals (r:1 w:1) + // Storage: Treasury Proposals (r:1 w:1) + fn on_initialize_proposals(p: u32, ) -> Weight { + (54_796_000 as Weight) + // Standard Error: 38_000 + .saturating_add((59_096_000 as Weight).saturating_mul(p as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight))) .saturating_add(T::DbWeight::get().writes(2 as Weight)) diff --git a/runtime/picasso/src/weights/utility.rs b/runtime/picasso/src/weights/utility.rs index b136ab71700..254b5ad0e7a 100644 --- a/runtime/picasso/src/weights/utility.rs +++ b/runtime/picasso/src/weights/utility.rs @@ -1,7 +1,8 @@ + //! Autogenerated weights for `utility` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2021-12-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-01-19, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("picasso-dev"), DB CACHE: 128 // Executed Command: @@ -15,32 +16,32 @@ // --steps=50 // --repeat=20 // --raw -// --output=./runtime/picasso/src/weights +// --output=runtime/picasso/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -use support::{traits::Get, weights::Weight}; +use frame_support::{traits::Get, weights::Weight}; use sp_std::marker::PhantomData; /// Weight functions for `utility`. pub struct WeightInfo(PhantomData); impl utility::WeightInfo for WeightInfo { fn batch(c: u32, ) -> Weight { - (277_000 as Weight) - // Standard Error: 2_000 - .saturating_add((4_110_000 as Weight).saturating_mul(c as Weight)) + (24_741_000 as Weight) + // Standard Error: 1_000 + .saturating_add((5_724_000 as Weight).saturating_mul(c as Weight)) } fn as_derivative() -> Weight { - (3_000_000 as Weight) + (3_740_000 as Weight) } fn batch_all(c: u32, ) -> Weight { - (0 as Weight) - // Standard Error: 5_000 - .saturating_add((4_491_000 as Weight).saturating_mul(c as Weight)) + (23_323_000 as Weight) + // Standard Error: 1_000 + .saturating_add((6_241_000 as Weight).saturating_mul(c as Weight)) } fn dispatch_as() -> Weight { - (10_000_000 as Weight) + (15_849_000 as Weight) } } diff --git a/runtime/picasso/src/xcmp.rs b/runtime/picasso/src/xcmp.rs index 4bf84fc7584..c5e0690e6fc 100644 --- a/runtime/picasso/src/xcmp.rs +++ b/runtime/picasso/src/xcmp.rs @@ -7,7 +7,7 @@ use super::*; // recursive dependency onto runtime use codec::{Decode, Encode}; use composable_traits::assets::{RemoteAssetRegistry, XcmAssetLocation}; use cumulus_primitives_core::ParaId; -use support::{ +use frame_support::{ construct_runtime, log, match_type, parameter_types, traits::{Contains, Everything, KeyOwnerProofSystem, Nothing, Randomness, StorageInfo}, weights::{ diff --git a/runtime/primitives/Cargo.toml b/runtime/primitives/Cargo.toml index 1bdd57f05a3..ebf9ed231c2 100644 --- a/runtime/primitives/Cargo.toml +++ b/runtime/primitives/Cargo.toml @@ -3,7 +3,7 @@ name = "primitives" version = "0.1.0" authors = ["Composable Developers "] edition = "2021" -rust-version = "1.56" + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/rust-toolchain.toml b/rust-toolchain.toml deleted file mode 100644 index e07af34e7d3..00000000000 --- a/rust-toolchain.toml +++ /dev/null @@ -1,5 +0,0 @@ -[toolchain] -channel = "nightly-2021-11-29" -components = [ "rustfmt", "rustc", "rust-std", "cargo", "clippy", "llvm-tools-preview"] -targets = [ "wasm32-unknown-unknown" ] -profile = "minimal" \ No newline at end of file diff --git a/utils/price-feed/Cargo.toml b/utils/price-feed/Cargo.toml index 4d1c922cbac..427f972fc35 100644 --- a/utils/price-feed/Cargo.toml +++ b/utils/price-feed/Cargo.toml @@ -2,7 +2,7 @@ name = "price-feed" version = "0.1.0" edition = "2021" -rust-version = "1.56" + [dependencies] enum_derive = "0.1.7"