diff --git a/.github/workflows/integration_test_manta.yml b/.github/workflows/integration_test_manta.yml
new file mode 100644
index 000000000..9bf28f2a2
--- /dev/null
+++ b/.github/workflows/integration_test_manta.yml
@@ -0,0 +1,569 @@
+name: manta integration test
+on:
+  push:
+    branches: [manta]
+  pull_request:
+    branches: [manta]
+    types: [opened, reopened, synchronize, labeled]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+env:
+  AWS_INSTANCE_SSH_PUBLIC_KEY: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPb24HEQ++aNFWaqVyMtIs6GotUB8R+q61XOoI2z6uMj
+  AWS_REGION: us-east-1
+  AWS_SUBNET_ID: subnet-08c26caf0a52b7c19
+  AWS_SECURITY_GROUP_ID: sg-0315bffea9042ac9b
+  AWS_INSTANCE_TYPE: c5d.metal
+  AWS_INSTANCE_ROOT_VOLUME_SIZE: 32
+  AWS_IMAGE_SEARCH_PATTERN: ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*
+  AWS_IMAGE_SEARCH_OWNERS: '["099720109477"]'
+  POLKADOT_BINARY: https://github.com/paritytech/polkadot/releases/download/v0.9.41/polkadot
+jobs:
+  print-rust-versions:
+    if: contains(github.event.pull_request.labels.*.name, 'A-manta' || github.ref == 'refs/heads/manta')
+    runs-on: ubuntu-20.04
+    container:
+      image: paritytech/ci-linux:production
+    outputs:
+      rustc-stable: ${{ steps.get-rust-versions.outputs.stable }}
+      rustc-nightly: ${{ steps.get-rust-versions.outputs.nightly }}
+    env:
+      CARGO_TERM_COLOR: always
+    steps:
+      - id: get-rust-versions
+        run: |
+          echo "::set-output name=stable::$(rustc +stable --version)"
+          echo "::set-output name=nightly::$(rustc +nightly --version)"
+  build-node-current:
+    if: contains(github.event.pull_request.labels.*.name, 'A-manta' || github.ref == 'refs/heads/manta')
+    needs: start-node-builder-current
+    runs-on: ${{ needs.start-node-builder-current.outputs.runner-label }}
+    env:
+      CARGO_TERM_COLOR: always
+    steps:
+      - uses: actions/checkout@v2
+      - name: install sccache
+        env:
+          SCCACHE_RELEASE_URL: https://github.com/mozilla/sccache/releases/download
+          SCCACHE_VERSION: v0.2.15
+        run: |
+          SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl
+          mkdir -p $HOME/.local/bin
+          curl -L "$SCCACHE_RELEASE_URL/$SCCACHE_VERSION/$SCCACHE_FILE.tar.gz" | tar xz
+          mv -f $SCCACHE_FILE/sccache $HOME/.local/bin/sccache
+          chmod +x $HOME/.local/bin/sccache
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+      - name: cache cargo registry
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+          key: cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            cargo-
+      - name: cache sccache
+        uses: actions/cache@v2
+        continue-on-error: false
+        with:
+          path: /home/runner/.cache/sccache
+          key: sccache-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            sccache-
+      - name: start sccache server
+        run: sccache --start-server
+      - name: init
+        run: |
+          sudo apt update
+          sudo apt install -y pkg-config libssl-dev yarn
+          curl -s https://sh.rustup.rs -sSf | sh -s -- -y
+          source ${HOME}/.cargo/env
+          rustup toolchain install stable
+          rustup default stable
+          rustup update
+          rustup target add wasm32-unknown-unknown
+      - name: build
+        env:
+          RUST_BACKTRACE: full
+          RUSTC_WRAPPER: sccache
+          SCCACHE_CACHE_SIZE: 2G
+          SCCACHE_DIR: /home/runner/.cache/sccache
+        run: |
+          source ${HOME}/.cargo/env
+          RUSTC_BOOTSTRAP=1 cargo build --profile production --verbose
+      - name: stop sccache server
+        run: sccache --stop-server || true
+      - if: always()
+        name: upload
+        uses: actions/upload-artifact@v2
+        with:
+          name: manta
+          path: target/production/manta
+      - if: always()
+        name: upload
+        uses: actions/upload-artifact@v2
+        with:
+          name: config-for-integration-test
+          path: .github/resources/config-for-integration-test.json
+  manta-integration-test:
+    if: contains(github.event.pull_request.labels.*.name, 'A-manta' || github.ref == 'refs/heads/manta')
+    needs: [build-node-current, start-manta-integration-tester]
+    runs-on: ${{ needs.start-manta-integration-tester.outputs.runner-label }}
+    timeout-minutes: 180
+    strategy:
+      fail-fast: false
+      matrix:
+        chain-spec:
+          - id: manta-local
+            expected:
+              block-count:
+                relay: 15
+                para: 6
+              peer-count:
+                relay: 7
+                para: 4
+    steps:
+      - run: |
+          mkdir -p $HOME/.local/share/calamari-pc
+          mkdir -p $HOME/.local/bin
+          echo "${HOME}/.nvm/versions/node/v16.3.0/bin" >> $GITHUB_PATH
+          echo "${HOME}/.local/bin" >> $GITHUB_PATH
+      - name: fetch manta
+        uses: actions/download-artifact@v2
+        with:
+          name: manta
+      - name: mv and chmod manta
+        run: |
+          mv ${{ github.workspace }}/manta $HOME/.local/bin/
+          chmod +x $HOME/.local/bin/manta
+          ls -ahl ${{ github.workspace }}/
+          ls -ahl $HOME/.local/bin/
+      - name: fetch and chmod polkadot
+        run: |
+          curl -L -o $HOME/.local/bin/polkadot ${{ env.POLKADOT_BINARY }}
+          chmod +x $HOME/.local/bin/polkadot
+          ls -ahl $HOME/.local/bin/
+      - id: create-chainspec
+        run: |
+          manta build-spec --chain ${{ matrix.chain-spec.id }} --disable-default-bootnode --raw > $HOME/.local/share/calamari-pc/${{ matrix.chain-spec.id }}-spec.json
+          jq \
+            --sort-keys \
+            --arg name "manta testnet ${GITHUB_SHA:0:7}" \
+            --arg id ${{ matrix.chain-spec.id }}-${GITHUB_SHA:0:7} \
+            --arg relay_chain rococo-local-${GITHUB_SHA:0:7} \
+            '. |
+              .name = $name |
+              .id = $id |
+              .relay_chain = $relay_chain |
+              .telemetryEndpoints = [["/dns/api.telemetry.manta.systems/tcp/443/x-parity-wss/%2Fsubmit%2F", 0]]
+            ' $HOME/.local/share/calamari-pc/${{ matrix.chain-spec.id }}-spec.json > $HOME/.local/share/calamari-pc/${{ matrix.chain-spec.id }}-${GITHUB_SHA:0:7}-spec.json
+          ls -ahl $HOME/.local/share/calamari-pc/
+          echo "::set-output name=short-sha::${GITHUB_SHA:0:7}"
+          manta export-state --chain $HOME/.local/share/calamari-pc/${{ matrix.chain-spec.id }}-${GITHUB_SHA:0:7}-spec.json > $HOME/.local/share/calamari-pc/${{ matrix.chain-spec.id }}-state.json || true
+      - uses: actions/checkout@v2
+        with:
+          repository: Manta-Network/Manta
+          path: Manta
+      - if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ matrix.chain-spec.id }}-state.json
+          path: /home/runner/.local/share/calamari-pc/${{ matrix.chain-spec.id }}-state.json
+      - if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ matrix.chain-spec.id }}-spec.json
+          path: /home/runner/.local/share/calamari-pc/${{ matrix.chain-spec.id }}-spec.json
+      - if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ matrix.chain-spec.id }}-${{ steps.create-chainspec.outputs.short-sha }}-spec.json
+          path: /home/runner/.local/share/calamari-pc/${{ matrix.chain-spec.id }}-${{ steps.create-chainspec.outputs.short-sha }}-spec.json
+      - name: fetch config-for-integration-test
+        uses: actions/download-artifact@v2
+        with:
+          name: config-for-integration-test
+      - name: create launch config
+        run: |
+          cat config-for-integration-test.json | \
+          jq \
+            --arg relaychain_bin $HOME/.local/bin/polkadot \
+            --arg relaychain_id rococo-local-${GITHUB_SHA:0:7} \
+            --arg relaychain_name "rococo local ${GITHUB_SHA:0:7}" \
+            --arg parachains_bin $HOME/.local/bin/manta \
+            --arg parachains_spec $HOME/.local/share/calamari-pc/${{ matrix.chain-spec.id }}-${GITHUB_SHA:0:7}-spec.json \
+            '.
+              | .relaychain.bin = $relaychain_bin
+              | .relaychain.mutation.id = $relaychain_id
+              | .relaychain.mutation.name = $relaychain_name
+              | .parachains[].bin = $parachains_bin
+              | .parachains[].chain = $parachains_spec
+            ' > $HOME/.local/share/calamari-pc/${{ matrix.chain-spec.id }}-${GITHUB_SHA:0:7}-launch-config.json
+          jq . $HOME/.local/share/calamari-pc/${{ matrix.chain-spec.id }}-${GITHUB_SHA:0:7}-launch-config.json
+          ls -ahl $HOME/.local/share/calamari-pc/
+      - if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ matrix.chain-spec.id }}-${{ steps.create-chainspec.outputs.short-sha }}-launch-config.json
+          path: /home/runner/.local/share/calamari-pc/${{ matrix.chain-spec.id }}-${{ steps.create-chainspec.outputs.short-sha }}-launch-config.json
+      - uses: actions/checkout@v2
+        with:
+          repository: paritytech/polkadot-launch
+          path: polkadot-launch
+      - uses: actions/checkout@v2
+        with:
+          repository: Manta-Network/Dev-Tools
+          path: dev-tools-rococo
+      - uses: actions/checkout@v2
+        with:
+          repository: Manta-Network/Dev-Tools
+          path: dev-tools-manta
+      - name: launch testnet
+        run: |
+          cd ${{ github.workspace }}/polkadot-launch
+          yarn install
+          yarn build
+          pm2 start dist/cli.js \
+            --name polkadot-launch \
+            --output ${{ github.workspace }}/polkadot-launch-for-${{ matrix.chain-spec.id }}-stdout.log \
+            --error ${{ github.workspace }}/polkadot-launch-for-${{ matrix.chain-spec.id }}-stderr.log \
+            --no-autorestart \
+            -- $HOME/.local/share/calamari-pc/${{ matrix.chain-spec.id }}-${GITHUB_SHA:0:7}-launch-config.json
+      - name: init measure-block-time rococo
+        run: |
+          cd ${{ github.workspace }}/dev-tools-rococo/measure-block-time
+          yarn install
+          pm2 start index.js \
+            --name measure-block-time-rococo-relay-for-${{ matrix.chain-spec.id }} \
+            --output ${{ github.workspace }}/measure-block-time-rococo-relay-for-${{ matrix.chain-spec.id }}-stdout.log \
+            --error ${{ github.workspace }}/measure-block-time-rococo-relay-for-${{ matrix.chain-spec.id }}-stderr.log \
+            --no-autorestart \
+            -- \
+            --address=ws://127.0.0.1:9911
+      - name: init measure-block-time manta
+        run: |
+          cd ${{ github.workspace }}/dev-tools-manta/measure-block-time
+          yarn install
+          pm2 start index.js \
+            --name measure-block-time-${{ matrix.chain-spec.id }} \
+            --output ${{ github.workspace }}/measure-block-time-${{ matrix.chain-spec.id }}-stdout.log \
+            --error ${{ github.workspace }}/measure-block-time-${{ matrix.chain-spec.id }}-stderr.log \
+            --no-autorestart \
+            -- \
+            --address=ws://127.0.0.1:9921
+      - uses: actions/checkout@v2
+        with:
+          repository: Manta-Network/Manta
+          path: Manta
+      # - name: run test suites
+      #   run: |
+      #     sleep 120
+      #     cd ${{ github.workspace }}/Manta/tests
+      #     yarn install
+      #     yarn
+      #     yarn correctness_test --address=ws://127.0.0.1:9921 --exit
+      #     yarn performance_test --address=ws://127.0.0.1:9921 --exit
+      - name: check if target block is finalized
+        run: |
+          cd ${{ github.workspace }}/dev-tools-manta/check-finalized-block
+          yarn install
+          yarn
+          node index.js --para_address=ws://127.0.0.1:9921 --relay_address=ws://127.0.0.1:9911 --target_block=${{ matrix.chain-spec.expected.block-count.para }}
+          if [ $? == 1 ]; then echo "Failed to finalize the target block - ${{ matrix.chain-spec.expected.block-count.para }}"; exit 1; fi
+      - name: stop testnet
+        run: |
+          cd ${{ github.workspace }}/polkadot-launch
+          pm2 stop measure-block-time-rococo-relay-for-${{ matrix.chain-spec.id }}
+          pm2 stop measure-block-time-${{ matrix.chain-spec.id }}
+          pm2 stop polkadot-launch
+      - if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: polkadot-launch-for-${{ matrix.chain-spec.id }}-stdout.log
+          path: ${{ github.workspace }}/polkadot-launch-for-${{ matrix.chain-spec.id }}-stdout.log
+      - if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: polkadot-launch-for-${{ matrix.chain-spec.id }}-stderr.log
+          path: ${{ github.workspace }}/polkadot-launch-for-${{ matrix.chain-spec.id }}-stderr.log
+      - if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: measure-block-time-rococo-relay-for-${{ matrix.chain-spec.id }}-stdout.log
+          path: ${{ github.workspace }}/measure-block-time-rococo-relay-for-${{ matrix.chain-spec.id }}-stdout.log
+      - if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: measure-block-time-rococo-relay-for-${{ matrix.chain-spec.id }}-stderr.log
+          path: ${{ github.workspace }}/measure-block-time-rococo-relay-for-${{ matrix.chain-spec.id }}-stderr.log
+      - if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: measure-block-time-${{ matrix.chain-spec.id }}-stdout.log
+          path: ${{ github.workspace }}/measure-block-time-${{ matrix.chain-spec.id }}-stdout.log
+      - if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: measure-block-time-${{ matrix.chain-spec.id }}-stderr.log
+          path: ${{ github.workspace }}/measure-block-time-${{ matrix.chain-spec.id }}-stderr.log
+      - if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: rococo-alice-relay-for-${{ matrix.chain-spec.id }}.log
+          path: ${{ github.workspace }}/polkadot-launch/alice.log
+      - if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: rococo-bob-relay-for-${{ matrix.chain-spec.id }}.log
+          path: ${{ github.workspace }}/polkadot-launch/bob.log
+      - if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ matrix.chain-spec.id }}-alice.log
+          path: ${{ github.workspace }}/polkadot-launch/9921.log
+      - if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ matrix.chain-spec.id }}-bob.log
+          path: ${{ github.workspace }}/polkadot-launch/9922.log
+      - name: parse rococo block times
+        run: |
+          grep '#.*' ${{ github.workspace }}/measure-block-time-rococo-relay-for-${{ matrix.chain-spec.id }}-stdout.log | while read -r line; do words=($line); echo ${words[6]},${words[10]} | tee ${{ github.workspace }}/block-time-rococo.csv; done
+          if [ ! -f ${{ github.workspace }}/block-time-rococo.csv ]; then echo "block times not detected"; exit 1; fi
+          jq -s -R '[split("\n") | .[] | select(length > 0) | split(",") | {block:.[0]|tonumber, time:.[1]|tonumber} ]' ${{ github.workspace }}/block-time-rococo.csv > ${{ github.workspace }}/block-time-rococo.json
+      - if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: block-time-rococo-relay-for-${{ matrix.chain-spec.id }}.json
+          path: ${{ github.workspace }}/block-time-rococo.json
+      # - if: always()
+      # - name: parse manta block times
+      #   run: |
+      #     grep '#.*' ${{ github.workspace }}/measure-block-time-${{ matrix.chain-spec.id }}-stdout.log | while read -r line; do words=($line); echo ${words[6]},${words[10]} | tee ${{ github.workspace }}/block-time-${{ matrix.chain-spec.id }}.csv; done
+      #     if [ ! -f ${{ github.workspace }}/block-time-${{ matrix.chain-spec.id }}.csv ]; then echo "block times not detected"; exit 1; fi
+      #     jq -s -R '[split("\n") | .[] | select(length > 0) | split(",") | {block:.[0]|tonumber, time:.[1]|tonumber} ]' ${{ github.workspace }}/block-time-${{ matrix.chain-spec.id }}.csv > ${{ github.workspace }}/block-time-${{ matrix.chain-spec.id }}.json
+      # - if: always()
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: block-time-${{ matrix.chain-spec.id }}.json
+      #     path: ${{ github.workspace }}/block-time-${{ matrix.chain-spec.id }}.json
+      - if: always()
+        name: test - rococo alice peered successfully
+        run: |
+          grep '💤 Idle (${{ matrix.chain-spec.expected.peer-count.relay }} peers)' ${{ github.workspace }}/polkadot-launch/alice.log
+      - if: always()
+        name: test - rococo alice imported block ${{ matrix.chain-spec.expected.block-count.relay }}
+        run: |
+          grep ' Imported #${{ matrix.chain-spec.expected.block-count.relay }} ' ${{ github.workspace }}/polkadot-launch/alice.log
+      - if: always()
+        name: test - manta alice peered successfully
+        run: |
+          grep '\[Parachain\] 💤 Idle (${{ matrix.chain-spec.expected.peer-count.para }} peers)' ${{ github.workspace }}/polkadot-launch/9921.log
+      # - name: append manta-pay storage
+      #   run: |
+      #     wget -P ${{ github.workspace }}/Manta/tests/data https://manta-ops.s3.amazonaws.com/integration-tests-data/storage.json
+      #     mv $HOME/.local/share/calamari-pc/${{ matrix.chain-spec.id }}-${GITHUB_SHA:0:7}-spec.json ${{ github.workspace }}/Manta/tests/data/fork.json
+      #     cd ${{ github.workspace }}/Manta/tests
+      #     yarn install
+      #     yarn
+      #     node append_storage.js
+      #     cd ../../
+      #     mv ${{ github.workspace }}/Manta/tests/data/fork.json $HOME/.local/share/calamari-pc/${{ matrix.chain-spec.id }}-${GITHUB_SHA:0:7}-spec.json
+      # - name: launch testnet
+      #   run: |
+      #     cd ${{ github.workspace }}/polkadot-launch
+      #     yarn install
+      #     yarn build
+      #     pm2 start dist/cli.js \
+      #       --name polkadot-launch \
+      #       --output ${{ github.workspace }}/polkadot-launch-for-${{ matrix.chain-spec.id }}-stdout.log \
+      #       --error ${{ github.workspace }}/polkadot-launch-for-${{ matrix.chain-spec.id }}-stderr.log \
+      #       --no-autorestart \
+      #       -- $HOME/.local/share/calamari-pc/${{ matrix.chain-spec.id }}-${GITHUB_SHA:0:7}-launch-config.json
+      # - name: run stress test
+      #   run: |
+      #     sleep 720
+      #     cd ${{ github.workspace }}/Manta/tests
+      #     yarn install
+      #     yarn
+      #     yarn stress_benchmark_test --address=ws://127.0.0.1:9921 --exit
+      # - name: stop testnet
+      #   run: |
+      #     cd ${{ github.workspace }}/polkadot-launch
+      #     pm2 stop polkadot-launch
+      # - if: always()
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: ${{ matrix.chain-spec.id }}-alice-stress.log
+      #     path: ${{ github.workspace }}/polkadot-launch/9921.log
+  docker-image-test:
+    if: contains(github.event.pull_request.labels.*.name, 'A-manta' || github.ref == 'refs/heads/manta')
+    needs: [build-node-current, start-docker-image-tester]
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        runtime:
+          - name: manta
+    steps:
+      - uses: actions/checkout@v2
+      - name: fetch manta
+        uses: actions/download-artifact@v2
+        with:
+          name: manta
+      - name: build docker image
+        run: |
+          mv manta docker/manta
+          cd docker/
+          chmod +x manta
+          GIT_TAG=${{ github.event.release.tag_name }}
+          BINARY_NAME=manta
+          ln -s ${{ matrix.runtime.name }}.Dockerfile Dockerfile
+          docker build \
+            --build-arg PARA_BINARY_REF=${GIT_TAG} \
+            --build-arg PARA_BINARY_URL=manta \
+            --tag ${{ matrix.runtime.name }}   ./
+      - name: run docker image
+        run: |
+          sudo docker run -p 9944:9944 -p 9945:9945 -d ${{ matrix.runtime.name }} --unsafe-ws-external -- --unsafe-ws-external > docker_id.log
+          sleep 60
+      - name: Show log
+        run: |
+          echo "Get the docker container ID:"
+          image_id=`cat docker_id.log`
+          echo $image_id
+          echo "Adjusting permissions so we can access docker logs..."
+          sudo chmod -R +x /var/lib/docker/
+          sudo cat /var/lib/docker/containers/${image_id}/${image_id}-json.log
+      - uses: actions/checkout@v2
+        with:
+          repository: Manta-Network/Dev-Tools
+          path: dev-tools
+      - name: check if target block is finalized
+        run: |
+          cd dev-tools/check-finalized-block
+          yarn install
+          yarn
+          node index.js --para_address=ws://127.0.0.1:9944 --relay_address=ws://127.0.0.1:9945 --target_block=6
+          if [ $? == 1 ]; then echo "Failed to finalize the target block - 6"; exit 1; fi
+  # HELPER JOBS BELOW
+  start-node-builder-current:
+    if: contains(github.event.pull_request.labels.*.name, 'A-manta' || github.ref == 'refs/heads/manta')
+    runs-on: ubuntu-20.04
+    outputs:
+      runner-label: ${{ steps.start-self-hosted-runner.outputs.runner-label }}
+      aws-region: ${{ steps.start-self-hosted-runner.outputs.aws-region }}
+      aws-instance-id: ${{ steps.start-self-hosted-runner.outputs.aws-instance-id }}
+    steps:
+      - id: start-self-hosted-runner
+        uses: audacious-network/aws-github-runner@v1.0.33
+        with:
+          mode: start
+          github-token: ${{ secrets.SELF_HOSTED_RUNNER_TOKEN }}
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-instance-ssh-public-key: ${{ env.AWS_INSTANCE_SSH_PUBLIC_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+          aws-subnet-id: ${{ env.AWS_SUBNET_ID }}
+          aws-security-group-id: ${{ env.AWS_SECURITY_GROUP_ID }}
+          aws-instance-type: ${{ env.AWS_INSTANCE_TYPE }}
+          aws-instance-root-volume-size: 32
+          aws-image-search-pattern: ${{ env.AWS_IMAGE_SEARCH_PATTERN }}
+          aws-image-search-owners: ${{ env.AWS_IMAGE_SEARCH_OWNERS }}
+  stop-node-builder-current:
+    if: ${{ always() }}
+    needs: [start-node-builder-current, build-node-current]
+    runs-on: ubuntu-20.04
+    steps:
+      - continue-on-error: true
+        uses: audacious-network/aws-github-runner@v1.0.33
+        with:
+          mode: stop
+          github-token: ${{ secrets.SELF_HOSTED_RUNNER_TOKEN }}
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ needs.start-node-builder-current.outputs.aws-region }}
+          runner-label: ${{ needs.start-node-builder-current.outputs.runner-label }}
+          aws-instance-id: ${{ needs.start-node-builder-current.outputs.aws-instance-id }}
+      - name: discard stopper success/failure
+        run: true
+  start-manta-integration-tester:
+    if: contains(github.event.pull_request.labels.*.name, 'A-manta' || github.ref == 'refs/heads/manta')
+    runs-on: ubuntu-20.04
+    outputs:
+      runner-label: ${{ steps.start-self-hosted-runner.outputs.runner-label }}
+      aws-region: ${{ steps.start-self-hosted-runner.outputs.aws-region }}
+      aws-instance-id: ${{ steps.start-self-hosted-runner.outputs.aws-instance-id }}
+    steps:
+      - id: start-self-hosted-runner
+        uses: audacious-network/aws-github-runner@v1.0.33
+        with:
+          mode: start
+          github-token: ${{ secrets.SELF_HOSTED_RUNNER_TOKEN }}
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-instance-ssh-public-key: ${{ env.AWS_INSTANCE_SSH_PUBLIC_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+          aws-subnet-id: ${{ env.AWS_SUBNET_ID }}
+          aws-security-group-id: ${{ env.AWS_SECURITY_GROUP_ID }}
+          aws-instance-type: ${{ env.AWS_INSTANCE_TYPE }}
+          aws-instance-root-volume-size: 64
+          aws-image-search-pattern: ${{ env.AWS_IMAGE_SEARCH_PATTERN }}
+          aws-image-search-owners: ${{ env.AWS_IMAGE_SEARCH_OWNERS }}
+  stop-manta-integration-tester:
+    if: ${{ always() }}
+    needs: [start-manta-integration-tester, manta-integration-test]
+    runs-on: ubuntu-20.04
+    steps:
+      - continue-on-error: true
+        uses: audacious-network/aws-github-runner@v1.0.33
+        with:
+          mode: stop
+          github-token: ${{ secrets.SELF_HOSTED_RUNNER_TOKEN }}
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ needs.start-manta-integration-tester.outputs.aws-region }}
+          runner-label: ${{ needs.start-manta-integration-tester.outputs.runner-label }}
+          aws-instance-id: ${{ needs.start-manta-integration-tester.outputs.aws-instance-id }}
+      - name: discard stopper success/failure
+        run: true
+  start-docker-image-tester:
+    if: contains(github.event.pull_request.labels.*.name, 'A-manta' || github.ref == 'refs/heads/manta')
+    runs-on: ubuntu-20.04
+    outputs:
+      runner-label: ${{ steps.start-self-hosted-runner.outputs.runner-label }}
+      aws-region: ${{ steps.start-self-hosted-runner.outputs.aws-region }}
+      aws-instance-id: ${{ steps.start-self-hosted-runner.outputs.aws-instance-id }}
+    steps:
+      - id: start-self-hosted-runner
+        uses: audacious-network/aws-github-runner@v1.0.33
+        with:
+          mode: start
+          github-token: ${{ secrets.SELF_HOSTED_RUNNER_TOKEN }}
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-instance-ssh-public-key: ${{ env.AWS_INSTANCE_SSH_PUBLIC_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+          aws-subnet-id: ${{ env.AWS_SUBNET_ID }}
+          aws-security-group-id: ${{ env.AWS_SECURITY_GROUP_ID }}
+          aws-instance-type: ${{ env.AWS_INSTANCE_TYPE }}
+          aws-instance-root-volume-size: 64
+          aws-image-search-pattern: ${{ env.AWS_IMAGE_SEARCH_PATTERN }}
+          aws-image-search-owners: ${{ env.AWS_IMAGE_SEARCH_OWNERS }}
+  stop-docker-image-tester:
+    if: ${{ always() }}
+    needs: [start-docker-image-tester, docker-image-test]
+    runs-on: ubuntu-20.04
+    steps:
+      - continue-on-error: true
+        uses: audacious-network/aws-github-runner@v1.0.33
+        with:
+          mode: stop
+          github-token: ${{ secrets.SELF_HOSTED_RUNNER_TOKEN }}
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ needs.start-docker-image-tester.outputs.aws-region }}
+          runner-label: ${{ needs.start-docker-image-tester.outputs.runner-label }}
+          aws-instance-id: ${{ needs.start-docker-image-tester.outputs.aws-instance-id }}
+      - name: discard stopper success/failure
+        run: true
diff --git a/.github/workflows/metadata_diff.yml b/.github/workflows/metadata_diff.yml
index b482ff764..66d89fdd4 100644
--- a/.github/workflows/metadata_diff.yml
+++ b/.github/workflows/metadata_diff.yml
@@ -4,7 +4,7 @@ on:
     inputs:
       reference_binary:
         description: The link to the reference binary, which should be the previous release.
-        default: https://github.com/Manta-Network/Manta/releases/download/v4.0.4/manta
+        default: https://github.com/Manta-Network/Manta/releases/download/v4.0.5/manta
         required: true
       chain:
         description: The name of the chain under test. Usually, you would pass a local chain
@@ -98,11 +98,11 @@ jobs:
       - name: Start old node
         run: |
           echo Running on $CHAIN
-          $HOME/manta-old --chain=$CHAIN --port 30444 --ws-port 9944 -- --chain kusama &
+          $HOME/manta-old --chain=$CHAIN --port 30444 --base-path ./temp1 --ws-port 9944 -- --chain kusama &
       - name: Start new node
         run: |
           echo Running on $CHAIN
-          target/release/manta --chain=$CHAIN --port 30555 --ws-port 9955 -- --chain kusama &
+          target/release/manta --chain=$CHAIN --port 30555 --base-path ./temp2 --ws-port 9955 -- --chain kusama &
       - name: Prepare output
         run: |
           VERSION=$(./target/release/manta --version)
diff --git a/.github/workflows/runtime_upgrade_test.yml b/.github/workflows/runtime_upgrade_test.yml
index 9ed5f9a9a..ef9c5e2a8 100644
--- a/.github/workflows/runtime_upgrade_test.yml
+++ b/.github/workflows/runtime_upgrade_test.yml
@@ -1,9 +1,15 @@
 name: runtime upgrade test
 on:
-  push:
-    branches: [manta, release-**]
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+*'
+  workflow_dispatch:
+    inputs:
+      manta_base_url:
+        description: The base manta binary url, that will be upgraded
+        default: https://github.com/Manta-Network/Manta/releases/download/v4.0.5/manta
+        required: true
+      polkadot_url:
+        description: The polkadot binary url to be used for the relay chain
+        default: https://github.com/paritytech/polkadot/releases/download/v0.9.41/polkadot
+        required: true
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
@@ -16,11 +22,10 @@ env:
   AWS_INSTANCE_ROOT_VOLUME_SIZE: 32
   AWS_IMAGE_SEARCH_PATTERN: ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*
   AWS_IMAGE_SEARCH_OWNERS: '["099720109477"]'
-  POLKADOT_BINARY: https://github.com/paritytech/polkadot/releases/download/v0.9.41/polkadot
-  MANTA_BINARY: https://github.com/Manta-Network/Manta/releases/download/v4.0.4/manta
+  POLKADOT_BINARY: ${{github.event.inputs.polkadot_url}}
+  MANTA_BINARY: ${{github.event.inputs.manta_base_url}}
 jobs:
   print-rust-versions:
-    if: ${{ startsWith(github.ref, 'refs/tags') || startsWith(github.ref, 'refs/heads/release-') || github.ref == 'refs/heads/manta' }}
     runs-on: ubuntu-20.04
     container:
       image: paritytech/ci-linux:production
@@ -35,7 +40,6 @@ jobs:
           echo "::set-output name=stable::$(rustc +stable --version)"
           echo "::set-output name=nightly::$(rustc +nightly --version)"
   build-runtimes:
-    if: ${{ startsWith(github.ref, 'refs/tags') || startsWith(github.ref, 'refs/heads/release-') || github.ref == 'refs/heads/manta' }}
     needs: check-for-runtime-upgrade
     runs-on: ubuntu-20.04
     env:
@@ -86,7 +90,6 @@ jobs:
           name: config-for-runtime-upgrade-test
           path: .github/resources/config-for-runtime-upgrade-test.json
   runtime-upgrade-test:
-    if: ${{ startsWith(github.ref, 'refs/tags') || startsWith(github.ref, 'refs/heads/release-') || github.ref == 'refs/heads/manta' }}
     needs: [build-runtimes, start-runtime-upgrade-tester, check-for-runtime-upgrade, parse-runtimes]
     runs-on: ${{ needs.start-runtime-upgrade-tester.outputs.runner-label }}
     timeout-minutes: 90
@@ -94,20 +97,20 @@ jobs:
       fail-fast: false
       matrix:
         runtime:
+          - name: manta
+            chain-spec: manta-local
           - name: calamari
             chain-spec: calamari-local
           - name: dolphin
             chain-spec: dolphin-local
     steps:
-      - if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
-        run: |
+      - run: |
           ls -ahl ${{ github.workspace }}/
           mkdir -p $HOME/.local/share/${{ matrix.runtime.name }}-pc
           mkdir -p $HOME/.local/bin
           echo "${HOME}/.nvm/versions/node/v16.3.0/bin" >> $GITHUB_PATH
           echo "${HOME}/.local/bin" >> $GITHUB_PATH
-      - if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
-        name: fetch, mv and chmod manta-base
+      - name: fetch, mv and chmod manta-base
         run: |
           wget ${{ env.MANTA_BINARY }}
           ls -ahl ${{ github.workspace }}/
@@ -115,14 +118,12 @@ jobs:
           chmod +x $HOME/.local/bin/manta-base
           ls -ahl ${{ github.workspace }}/
           ls -ahl $HOME/.local/bin/
-      - if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
-        name: fetch and chmod polkadot
+      - name: fetch and chmod polkadot
         run: |
           curl -L -o $HOME/.local/bin/polkadot ${{ env.POLKADOT_BINARY }}
           chmod +x $HOME/.local/bin/polkadot
           ls -ahl $HOME/.local/bin/
-      - if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
-        id: create-chainspec
+      - id: create-chainspec
         run: |
           manta-base build-spec --chain ${{ matrix.runtime.chain-spec }} --disable-default-bootnode --raw > $HOME/.local/share/${{ matrix.runtime.name }}-pc/${{ matrix.runtime.chain-spec }}-spec.json
           jq \
@@ -138,13 +139,11 @@ jobs:
             ' $HOME/.local/share/${{ matrix.runtime.name }}-pc/${{ matrix.runtime.chain-spec }}-spec.json > $HOME/.local/share/${{ matrix.runtime.name }}-pc/${{ matrix.runtime.chain-spec }}-base-spec.json
           ls -ahl $HOME/.local/share/${{ matrix.runtime.name }}-pc/
           manta-base export-state --chain $HOME/.local/share/${{ matrix.runtime.name }}-pc/${{ matrix.runtime.chain-spec }}-base-spec.json > $HOME/.local/share/${{ matrix.runtime.name }}-pc/${{ matrix.runtime.chain-spec }}-state.json || true
-      - if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
-        name: fetch config-for-runtime-upgrade-test
+      - name: fetch config-for-runtime-upgrade-test
         uses: actions/download-artifact@v2
         with:
           name: config-for-runtime-upgrade-test
-      - if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
-        name: create launch config
+      - name: create launch config
         run: |
           ls -a
           cat config-for-runtime-upgrade-test.json | \
@@ -163,18 +162,15 @@ jobs:
             ' > $HOME/.local/share/${{ matrix.runtime.name }}-pc/${{ matrix.runtime.chain-spec }}-base-launch-config.json
           jq . $HOME/.local/share/${{ matrix.runtime.name }}-pc/${{ matrix.runtime.chain-spec }}-base-launch-config.json
           ls -ahl $HOME/.local/share/${{ matrix.runtime.name }}-pc/
-      - if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v2
         with:
           repository: paritytech/polkadot-launch
           path: polkadot-launch
-      - if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v2
         with:
           repository: Manta-Network/Dev-Tools
           path: dev-tools
-      - if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
-        name: launch testnet
+      - name: launch testnet
         run: |
           cd ${{ github.workspace }}/polkadot-launch
           yarn install
@@ -185,8 +181,7 @@ jobs:
             --error ${{ github.workspace }}/polkadot-launch-for-${{ matrix.runtime.chain-spec }}-stderr.log \
             --no-autorestart \
             -- $HOME/.local/share/${{ matrix.runtime.name }}-pc/${{ matrix.runtime.chain-spec }}-base-launch-config.json
-      - if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
-        name: fetch new ${{ matrix.runtime.name }}_runtime.compact.compressed.wasm
+      - name: fetch new ${{ matrix.runtime.name }}_runtime.compact.compressed.wasm
         uses: actions/download-artifact@v2
         with:
           name: ${{ matrix.runtime.name }}-runtime
@@ -194,8 +189,7 @@ jobs:
         with:
           repository: Manta-Network/Manta
           path: Manta
-      - if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
-        name: run test suites
+      - name: run test suites
         run: |
           sleep 120
           cp ${{ github.workspace }}/${{ matrix.runtime.name }}_runtime.compact.compressed.wasm ${{ github.workspace }}/Manta/tests/calamari.wasm
@@ -204,71 +198,12 @@ jobs:
           yarn
           yarn runtime_upgrade_test --address=ws://127.0.0.1:9921 --exit
           if [ $? != 0 ]; then echo "Runtime upgrade failed!"; exit 1; fi
-      - if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
-        uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v2
         with:
           name: ${{ matrix.chain-spec.id }}-alice.log
           path: ${{ github.workspace }}/polkadot-launch/9921.log
-  parse-runtimes:
-    if: ${{ startsWith(github.ref, 'refs/tags') || startsWith(github.ref, 'refs/heads/release-') || github.ref == 'refs/heads/manta' }}
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        runtime:
-          - name: calamari
-          - name: manta
-    outputs:
-      calamari-runtime-current: ${{ steps.get-runtime-current.outputs.calamari-runtime-current }}
-      calamari-runtime-base: ${{ steps.get-runtime-base.outputs.calamari-runtime-base }}
-      manta-runtime-current: ${{ steps.get-runtime-current.outputs.manta-runtime-current }}
-      manta-runtime-base: ${{ steps.get-runtime-base.outputs.manta-runtime-base }}
-    steps:
-      - uses: actions/checkout@v2
-      - name: ruby setup
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.7
-      - name: get ${{ matrix.runtime.name }} runtime version current
-        id: get-runtime-current
-        run: |
-          runtime_current="$(ruby -e '
-            require "./scripts/github/lib.rb";
-            puts get_runtime("${{ matrix.runtime.name }}")
-          ')"
-          echo "::set-output name=${{ matrix.runtime.name }}-runtime-current::$runtime_current"
-          echo ....................
-      - name: get ${{ matrix.runtime.name }} runtime version base
-        id: get-runtime-base
-        run: |
-          mkdir temp_for_run
-          cd temp_for_run
-          git clone -b manta https://github.com/Manta-Network/Manta.git
-          cd Manta
-          runtime_base="$(ruby -e '
-            require "./scripts/github/lib.rb";
-            puts get_runtime("${{ matrix.runtime.name }}")
-          ')"
-          echo "::set-output name=${{ matrix.runtime.name }}-runtime-base::$runtime_base"
-          echo ....................
-  check-for-runtime-upgrade:
-    if: ${{ startsWith(github.ref, 'refs/tags') || startsWith(github.ref, 'refs/heads/release-') || github.ref == 'refs/heads/manta' }}
-    needs: parse-runtimes
-    runs-on: ubuntu-20.04
-    outputs:
-      do-versions-match: ${{ steps.check-match.outputs.match }}
-    steps:
-      - name: check if runtime versions match
-        id: check-match
-        run: |
-          echo "::set-output name=match::true"
-          if [[ ${{ needs.parse-runtimes.outputs.manta-runtime-base }} != ${{ needs.parse-runtimes.outputs.manta-runtime-current }} ]]; then echo "::set-output name=match::false"; fi
-          if [[ ${{ needs.parse-runtimes.outputs.calamari-runtime-base }} != ${{ needs.parse-runtimes.outputs.calamari-runtime-current }} ]]; then echo "::set-output name=match::false"; fi
-      - name: force fail if new versions don't match
-        run: |
-          if [[  ${{ needs.parse-runtimes.outputs.manta-runtime-current }} != ${{ needs.parse-runtimes.outputs.calamari-runtime-current }} ]]; then exit 1; fi
   # HELPER JOBS BELOW
   start-runtime-upgrade-tester:
-    if: ${{ startsWith(github.ref, 'refs/tags') || startsWith(github.ref, 'refs/heads/release-') || github.ref == 'refs/heads/manta' }}
     runs-on: ubuntu-20.04
     outputs:
       runner-label: ${{ steps.start-self-hosted-runner.outputs.runner-label }}
diff --git a/.github/workflows/try-runtime-calamari-mainnet.yml b/.github/workflows/try-runtime-mainnet.yml
similarity index 91%
rename from .github/workflows/try-runtime-calamari-mainnet.yml
rename to .github/workflows/try-runtime-mainnet.yml
index 0b8ab2d2f..328950cb9 100644
--- a/.github/workflows/try-runtime-calamari-mainnet.yml
+++ b/.github/workflows/try-runtime-mainnet.yml
@@ -1,13 +1,17 @@
-name: Try-runtime check against latest Calamari mainnet state
+name: Try-runtime check against latest mainnet state
 on:
   # NOTE: The try-runtime tool expects your local chain's runtime version to match the version of the chain that
-  # you're testing against. In this case Calamari mainnet. That's why this CI workflow has a manual trigger.
+  # you're testing against. In the default case Calamari mainnet. That's why this CI workflow has a manual trigger.
   workflow_dispatch:
     inputs:
       prod_url:
         description: The WebSocket url of the reference node
         default: wss://ws.calamari.systems:443
         required: true
+      chain_spec:
+        description: The chain spec of the local node
+        default: calamari-dev
+        required: true
 env:
   AWS_INSTANCE_SSH_PUBLIC_KEY: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPb24HEQ++aNFWaqVyMtIs6GotUB8R+q61XOoI2z6uMj
   AWS_REGION: us-east-1
@@ -18,6 +22,7 @@ env:
   AWS_IMAGE_SEARCH_PATTERN: ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*
   AWS_IMAGE_SEARCH_OWNERS: '["099720109477"]'
   PROD_URL: ${{github.event.inputs.prod_url}}
+  CHAIN_SPEC: ${{github.event.inputs.chain_spec}}
 jobs:
   start-checks:
     runs-on: ubuntu-20.04
@@ -104,7 +109,7 @@ jobs:
           yarn install
           yarn
           latest_hash=$(node get-latest-block-hash --address=$PROD_URL)
-          $HOME/.local/bin/manta try-runtime --chain calamari-dev on-runtime-upgrade live --at $latest_hash --uri $PROD_URL
+          $HOME/.local/bin/manta try-runtime --chain $CHAIN_SPEC on-runtime-upgrade live --at $latest_hash --uri $PROD_URL
       - name: stop sccache server
         run: sccache --stop-server || true
   stop-checks:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d5fdbf4a..9503d409b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## v4.0.6
+### Added
+- [\#1067](https://github.com/Manta-Network/Manta/pull/1067) Refactor manta genesis files, add `manta-testnet` [MA]
+
+### Changed
+- [\#1071](https://github.com/Manta-Network/Manta/pull/1071) Charge 0-asset XCM instructions as if they were 1-asset [MACADO]
+
+### Fixed
+- [\#1068](https://github.com/Manta-Network/Manta/pull/1068) Do not skip integration tests [CA]
+- [\#1069](https://github.com/Manta-Network/Manta/pull/1069) Enable manta runtime xcm tests [MA]
+
 ## v4.0.5
 ### Added
 - [\#1012](https://github.com/Manta-Network/Manta/pull/1012) Add zkSBTs [MACADO]
diff --git a/Cargo.lock b/Cargo.lock
index 3cd036239..d96274fdb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1040,7 +1040,7 @@ dependencies = [
 
 [[package]]
 name = "calamari-runtime"
-version = "4.0.5"
+version = "4.0.6"
 dependencies = [
  "calamari-vesting",
  "cumulus-pallet-dmp-queue",
@@ -1131,7 +1131,7 @@ dependencies = [
 
 [[package]]
 name = "calamari-vesting"
-version = "4.0.5"
+version = "4.0.6"
 dependencies = [
  "chrono",
  "frame-benchmarking",
@@ -2436,7 +2436,7 @@ dependencies = [
 
 [[package]]
 name = "dolphin-runtime"
-version = "4.0.5"
+version = "4.0.6"
 dependencies = [
  "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
@@ -5076,7 +5076,7 @@ dependencies = [
 
 [[package]]
 name = "manta"
-version = "4.0.5"
+version = "4.0.6"
 dependencies = [
  "async-trait",
  "calamari-runtime",
@@ -5175,7 +5175,7 @@ dependencies = [
 
 [[package]]
 name = "manta-collator-selection"
-version = "4.0.5"
+version = "4.0.6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5262,7 +5262,7 @@ dependencies = [
 
 [[package]]
 name = "manta-primitives"
-version = "4.0.5"
+version = "4.0.6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5282,7 +5282,7 @@ dependencies = [
 
 [[package]]
 name = "manta-runtime"
-version = "4.0.5"
+version = "4.0.6"
 dependencies = [
  "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
@@ -6146,7 +6146,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-asset-manager"
-version = "4.0.5"
+version = "4.0.6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6578,7 +6578,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-manta-pay"
-version = "4.0.5"
+version = "4.0.6"
 dependencies = [
  "anyhow",
  "base64 0.20.0",
@@ -6613,7 +6613,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-manta-sbt"
-version = "4.0.5"
+version = "4.0.6"
 dependencies = [
  "anyhow",
  "base64 0.20.0",
@@ -6652,7 +6652,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-manta-support"
-version = "4.0.5"
+version = "4.0.6"
 dependencies = [
  "anyhow",
  "base64 0.20.0",
@@ -6828,7 +6828,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-parachain-staking"
-version = "4.0.5"
+version = "4.0.6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7119,7 +7119,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-tx-pause"
-version = "4.0.5"
+version = "4.0.6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9359,7 +9359,7 @@ dependencies = [
 
 [[package]]
 name = "runtime-common"
-version = "4.0.5"
+version = "4.0.6"
 dependencies = [
  "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
@@ -10865,7 +10865,7 @@ dependencies = [
 
 [[package]]
 name = "session-key-primitives"
-version = "4.0.5"
+version = "4.0.6"
 dependencies = [
  "manta-primitives",
  "nimbus-primitives",
diff --git a/docker/manta.Dockerfile b/docker/manta.Dockerfile
index b3d04d861..8486f622f 100644
--- a/docker/manta.Dockerfile
+++ b/docker/manta.Dockerfile
@@ -5,7 +5,7 @@ ARG PARA_BINARY_REF
 
 ARG PARA_GENESIS_REF=manta
 ARG PARA_BINARY_URL=https://github.com/Manta-Network/Manta/releases/download/$PARA_BINARY_REF/manta
-ARG PARA_BINARY_PATH=/usr/local/bin/parachain
+ARG PARA_BINARY_PATH=/usr/local/bin/manta
 
 ARG PARA_GENESIS_URL=https://raw.githubusercontent.com/Manta-Network/Manta/$PARA_GENESIS_REF/genesis/manta-genesis.json
 ARG PARA_GENESIS_PATH=/usr/share/manta.json
@@ -13,19 +13,6 @@ ARG PARA_GENESIS_PATH=/usr/share/manta.json
 ARG RELAY_GENESIS_URL=https://raw.githubusercontent.com/paritytech/polkadot/master/node/service/chain-specs/polkadot.json
 ARG RELAY_GENESIS_PATH=/usr/share/polkadot.json
 
-ARG SUBSTRATE_BASE_PATH=/var/lib/substrate
-ARG SUBSTRATE_PORT=30333
-ARG SUBSTRATE_RPC_PORT=9933
-ARG SUBSTRATE_RPC_CORS=all
-ARG SUBSTRATE_RPC_METHODS=safe
-ARG SUBSTRATE_WS_PORT=9944
-ARG SUBSTRATE_WS_MAX_CONNECTIONS=100
-ARG SUBSTRATE_BOOTNODE_0=/dns/alfredi.manta.systems/tcp/30333/p2p/12D3KooWKMw84HHuEbjHep6FVqUM2sss6TCzqehfXKw3PGoB4HoG
-ARG SUBSTRATE_BOOTNODE_1=/dns/birostris.manta.systems/tcp/30333/p2p/12D3KooWP5ASruuz1BEnD5M1QMSS7GiiFTnXMNoDUDn7o9GmcRyZ
-ARG SUBSTRATE_BOOTNODE_2=/dns/eregoodootenkey.manta.systems/tcp/30333/p2p/12D3KooWCKgXKVYbpxkmouHBrCyaPGr7NJSHVAgncUPVzH9fTB5e
-ARG SUBSTRATE_BOOTNODE_3=/dns/hypostoma.manta.systems/tcp/30333/p2p/12D3KooWHF462NFNuhPAK3cmqZ6c9jD85GnknsFT43n8TFdWcxJY
-ARG SUBSTRATE_BOOTNODE_4=/dns/japanica.manta.systems/tcp/30333/p2p/12D3KooWQvvB62n2dEWEYxUCcqzU6dxzVgi8ACPA6X7VeWzxAFMF
-
 # install deps
 RUN apt-get update
 RUN apt-get upgrade -y
@@ -35,52 +22,20 @@ RUN apt-get install -yq libssl-dev
 
 RUN mkdir -p /usr/local/bin
 RUN mkdir -p /usr/share
-RUN mkdir -p $SUBSTRATE_BASE_PATH
 
 ADD $PARA_BINARY_URL $PARA_BINARY_PATH
 RUN chmod +x $PARA_BINARY_PATH
 RUN ldd $PARA_BINARY_PATH
 RUN $PARA_BINARY_PATH --version
 
+# Get manta and kusama genesis file
 ADD $PARA_GENESIS_URL $PARA_GENESIS_PATH
 ADD $RELAY_GENESIS_URL $RELAY_GENESIS_PATH
 
-EXPOSE $SUBSTRATE_PORT
-EXPOSE $SUBSTRATE_RPC_PORT
-EXPOSE $SUBSTRATE_WS_PORT
-
-ENV PARA_BINARY_PATH=$PARA_BINARY_PATH
-ENV PARA_GENESIS_PATH=$PARA_GENESIS_PATH
-ENV SUBSTRATE_BASE_PATH=$SUBSTRATE_BASE_PATH
-ENV SUBSTRATE_PORT=$SUBSTRATE_PORT
-ENV SUBSTRATE_RPC_PORT=$SUBSTRATE_RPC_PORT
-ENV SUBSTRATE_WS_PORT=$SUBSTRATE_WS_PORT
-ENV SUBSTRATE_RPC_CORS=$SUBSTRATE_RPC_CORS
-ENV SUBSTRATE_RPC_METHODS=$SUBSTRATE_RPC_METHODS
-ENV SUBSTRATE_WS_MAX_CONNECTIONS=$SUBSTRATE_WS_MAX_CONNECTIONS
-ENV SUBSTRATE_BOOTNODE_0=$SUBSTRATE_BOOTNODE_0
-ENV SUBSTRATE_BOOTNODE_1=$SUBSTRATE_BOOTNODE_1
-ENV SUBSTRATE_BOOTNODE_2=$SUBSTRATE_BOOTNODE_2
-ENV SUBSTRATE_BOOTNODE_3=$SUBSTRATE_BOOTNODE_3
-ENV SUBSTRATE_BOOTNODE_4=$SUBSTRATE_BOOTNODE_4
-ENV RELAY_GENESIS_PATH=$RELAY_GENESIS_PATH
-
-ENTRYPOINT $PARA_BINARY_PATH \
-  --chain $PARA_GENESIS_PATH \
-  --base-path $SUBSTRATE_BASE_PATH \
-  --port $SUBSTRATE_PORT \
-  --ws-port $SUBSTRATE_WS_PORT \
-  --ws-external \
-  --rpc-port $SUBSTRATE_RPC_PORT \
-  --rpc-external \
-  --rpc-cors $SUBSTRATE_RPC_CORS \
-  --rpc-methods $SUBSTRATE_RPC_METHODS \
-  --ws-max-connections $SUBSTRATE_WS_MAX_CONNECTIONS \
-  --bootnodes \
-    $SUBSTRATE_BOOTNODE_0 \
-    $SUBSTRATE_BOOTNODE_1 \
-    $SUBSTRATE_BOOTNODE_2 \
-    $SUBSTRATE_BOOTNODE_3 \
-    $SUBSTRATE_BOOTNODE_4 \
-  -- \
-  --chain $RELAY_GENESIS_PATH
+# Expose 5 ports by default
+EXPOSE 30333 30334 9933 9944 9615 9945
+ENTRYPOINT [\
+  "/usr/local/bin/manta",\
+  "--chain",\
+  "/usr/share/manta.json"\
+]
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 2d5234ac0..39daf151d 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -9,7 +9,7 @@ license = 'GPL-3.0'
 name = 'manta'
 repository = 'https://github.com/Manta-Network/Manta/'
 rust-version = '1.62'
-version = '4.0.5'
+version = '4.0.6'
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']
diff --git a/pallets/asset-manager/Cargo.toml b/pallets/asset-manager/Cargo.toml
index aa340b39d..9a0444b22 100644
--- a/pallets/asset-manager/Cargo.toml
+++ b/pallets/asset-manager/Cargo.toml
@@ -5,7 +5,7 @@ homepage = "https://manta.network"
 license = "GPL-3.0"
 name = "pallet-asset-manager"
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.0.5'
+version = '4.0.6'
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false }
diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml
index eee6396ae..334c1ea87 100644
--- a/pallets/collator-selection/Cargo.toml
+++ b/pallets/collator-selection/Cargo.toml
@@ -7,7 +7,7 @@ license = 'GPL-3.0'
 name = 'manta-collator-selection'
 readme = 'README.md'
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.0.5'
+version = '4.0.6'
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']
diff --git a/pallets/manta-pay/Cargo.toml b/pallets/manta-pay/Cargo.toml
index 6cbb50111..2d1ddb5e1 100644
--- a/pallets/manta-pay/Cargo.toml
+++ b/pallets/manta-pay/Cargo.toml
@@ -7,7 +7,7 @@ license = 'GPL-3.0'
 name = 'pallet-manta-pay'
 readme = 'README.md'
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.0.5'
+version = '4.0.6'
 
 [package.metadata.docs.rs]
 # To build locally:
diff --git a/pallets/manta-sbt/Cargo.toml b/pallets/manta-sbt/Cargo.toml
index da090eaef..f5e6a25a1 100644
--- a/pallets/manta-sbt/Cargo.toml
+++ b/pallets/manta-sbt/Cargo.toml
@@ -7,7 +7,7 @@ license = 'GPL-3.0'
 name = 'pallet-manta-sbt'
 readme = 'README.md'
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.0.5'
+version = '4.0.6'
 
 [[bin]]
 name = "precompute_coins"
diff --git a/pallets/manta-support/Cargo.toml b/pallets/manta-support/Cargo.toml
index 091813c1a..a69d6452c 100644
--- a/pallets/manta-support/Cargo.toml
+++ b/pallets/manta-support/Cargo.toml
@@ -7,7 +7,7 @@ license = 'GPL-3.0'
 name = 'pallet-manta-support'
 readme = 'README.md'
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.0.5'
+version = '4.0.6'
 
 [dependencies]
 # utils
diff --git a/pallets/parachain-staking/Cargo.toml b/pallets/parachain-staking/Cargo.toml
index 13c0ddadf..01da6f5fc 100644
--- a/pallets/parachain-staking/Cargo.toml
+++ b/pallets/parachain-staking/Cargo.toml
@@ -6,7 +6,7 @@ homepage = 'https://manta.network'
 license = 'GPL-3.0'
 name = "pallet-parachain-staking"
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.0.5'
+version = '4.0.6'
 
 [dependencies]
 log = { version = "0.4", default-features = false }
diff --git a/pallets/tx-pause/Cargo.toml b/pallets/tx-pause/Cargo.toml
index f929f7f4d..8dc0a9d97 100644
--- a/pallets/tx-pause/Cargo.toml
+++ b/pallets/tx-pause/Cargo.toml
@@ -5,7 +5,7 @@ homepage = 'https://manta.network'
 license = 'GPL-3.0'
 name = "pallet-tx-pause"
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.0.5'
+version = '4.0.6'
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = '3.1.2', default-features = false }
diff --git a/pallets/vesting/Cargo.toml b/pallets/vesting/Cargo.toml
index d1d4def22..1ab877403 100644
--- a/pallets/vesting/Cargo.toml
+++ b/pallets/vesting/Cargo.toml
@@ -5,7 +5,7 @@ homepage = 'https://manta.network'
 license = 'GPL-3.0'
 name = "calamari-vesting"
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.0.5'
+version = '4.0.6'
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = '3.1.2', default-features = false, features = ["derive", "max-encoded-len"] }
diff --git a/primitives/manta/Cargo.toml b/primitives/manta/Cargo.toml
index 4e18184a2..f3f25af27 100644
--- a/primitives/manta/Cargo.toml
+++ b/primitives/manta/Cargo.toml
@@ -5,7 +5,7 @@ homepage = 'https://manta.network'
 license = 'GPL-3.0'
 name = "manta-primitives"
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.0.5'
+version = '4.0.6'
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']
diff --git a/primitives/session-keys/Cargo.toml b/primitives/session-keys/Cargo.toml
index d793438a3..860d5b81f 100644
--- a/primitives/session-keys/Cargo.toml
+++ b/primitives/session-keys/Cargo.toml
@@ -4,7 +4,7 @@ description = "Primitives for session keys"
 edition = "2021"
 license = "GPL-3.0"
 name = "session-key-primitives"
-version = '4.0.5'
+version = '4.0.6'
 
 [dependencies]
 manta-primitives = { path = "../manta", default-features = false }
diff --git a/runtime/calamari/Cargo.toml b/runtime/calamari/Cargo.toml
index 14a1ab2c9..01cbdd2cb 100644
--- a/runtime/calamari/Cargo.toml
+++ b/runtime/calamari/Cargo.toml
@@ -5,7 +5,7 @@ homepage = 'https://manta.network'
 license = 'GPL-3.0'
 name = 'calamari-runtime'
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.0.5'
+version = '4.0.6'
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = '3.1.2', default-features = false, features = ["derive", "max-encoded-len"] }
diff --git a/runtime/calamari/src/lib.rs b/runtime/calamari/src/lib.rs
index fb39b57cc..ed35857f1 100644
--- a/runtime/calamari/src/lib.rs
+++ b/runtime/calamari/src/lib.rs
@@ -130,7 +130,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("calamari"),
     impl_name: create_runtime_str!("calamari"),
     authoring_version: 2,
-    spec_version: 4050,
+    spec_version: 4060,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 11,
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index 51b08c3f9..d5b47add2 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -5,7 +5,7 @@ homepage = 'https://manta.network'
 license = 'GPL-3.0'
 name = "runtime-common"
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.0.5'
+version = '4.0.6'
 
 [dependencies]
 # Substrate dependencies
diff --git a/runtime/dolphin/Cargo.toml b/runtime/dolphin/Cargo.toml
index 5db0195cf..82f4480b6 100644
--- a/runtime/dolphin/Cargo.toml
+++ b/runtime/dolphin/Cargo.toml
@@ -5,7 +5,7 @@ homepage = 'https://manta.network'
 license = 'GPL-3.0'
 name = 'dolphin-runtime'
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.0.5'
+version = '4.0.6'
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = '3.1.2', default-features = false, features = ["derive", "max-encoded-len"] }
diff --git a/runtime/dolphin/src/lib.rs b/runtime/dolphin/src/lib.rs
index a04b7681a..657476798 100644
--- a/runtime/dolphin/src/lib.rs
+++ b/runtime/dolphin/src/lib.rs
@@ -125,7 +125,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("dolphin"),
     impl_name: create_runtime_str!("dolphin"),
     authoring_version: 2,
-    spec_version: 4050,
+    spec_version: 4060,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 6,
diff --git a/runtime/manta/Cargo.toml b/runtime/manta/Cargo.toml
index a2541faa8..c4502c5ff 100644
--- a/runtime/manta/Cargo.toml
+++ b/runtime/manta/Cargo.toml
@@ -5,7 +5,7 @@ homepage = 'https://manta.network'
 license = 'GPL-3.0'
 name = 'manta-runtime'
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.0.5'
+version = '4.0.6'
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = '3.1.2', default-features = false, features = ["derive", "max-encoded-len"] }
diff --git a/runtime/manta/src/lib.rs b/runtime/manta/src/lib.rs
index 1ec806f94..2ed3e7b04 100644
--- a/runtime/manta/src/lib.rs
+++ b/runtime/manta/src/lib.rs
@@ -130,7 +130,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("manta"),
     impl_name: create_runtime_str!("manta"),
     authoring_version: 1,
-    spec_version: 4050,
+    spec_version: 4060,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,
diff --git a/runtime/manta/src/weights/cumulus_pallet_xcmp_queue.rs b/runtime/manta/src/weights/cumulus_pallet_xcmp_queue.rs
index 15f19a5d0..4c1852424 100644
--- a/runtime/manta/src/weights/cumulus_pallet_xcmp_queue.rs
+++ b/runtime/manta/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -17,7 +17,7 @@
 //! Autogenerated weights for cumulus_pallet_xcmp_queue
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta-dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -55,13 +55,13 @@ pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for SubstrateWeight<T> {
     // Storage: XcmpQueue QueueConfig (r:1 w:1)
     fn set_config_with_u32() -> Weight {
-        (5_874_000 as Weight)
+        (5_824_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: XcmpQueue QueueConfig (r:1 w:1)
     fn set_config_with_weight() -> Weight {
-        (5_767_000 as Weight)
+        (5_603_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
@@ -71,13 +71,13 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for Substrat
 impl WeightInfo for () {
     // Storage: XcmpQueue QueueConfig (r:1 w:1)
     fn set_config_with_u32() -> Weight {
-        (5_874_000 as Weight)
+        (5_824_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: XcmpQueue QueueConfig (r:1 w:1)
     fn set_config_with_weight() -> Weight {
-        (5_767_000 as Weight)
+        (5_603_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
diff --git a/runtime/manta/src/weights/frame_system.rs b/runtime/manta/src/weights/frame_system.rs
index 7151e9417..e351730a3 100644
--- a/runtime/manta/src/weights/frame_system.rs
+++ b/runtime/manta/src/weights/frame_system.rs
@@ -17,14 +17,14 @@
 //! Autogenerated weights for frame_system
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-02-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta"), DB CACHE: 1024
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta-dev"), DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/manta
 // benchmark
 // pallet
-// --chain=manta
+// --chain=manta-dev
 // --steps=50
 // --repeat=20
 // --pallet=frame_system
@@ -57,20 +57,18 @@ pub trait WeightInfo {
 /// Weights for frame_system using the Substrate node and recommended hardware.
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> frame_system::WeightInfo for SubstrateWeight<T> {
-    fn remark(b: u32, ) -> Weight {
-        (11_364_000 as Weight)
-            // Standard Error: 0
-            .saturating_add((1_000 as Weight).saturating_mul(b as Weight))
+    fn remark(_b: u32, ) -> Weight {
+        (8_700_000 as Weight)
     }
     fn remark_with_event(b: u32, ) -> Weight {
-        (0 as Weight)
+        (6_500_000 as Weight)
             // Standard Error: 0
             .saturating_add((2_000 as Weight).saturating_mul(b as Weight))
     }
     // Storage: System Digest (r:1 w:1)
     // Storage: unknown [0x3a686561707061676573] (r:0 w:1)
     fn set_heap_pages() -> Weight {
-        (5_617_000 as Weight)
+        (5_516_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
@@ -78,41 +76,39 @@ impl<T: frame_system::Config> frame_system::WeightInfo for SubstrateWeight<T> {
     fn set_storage(i: u32, ) -> Weight {
         (0 as Weight)
             // Standard Error: 1_000
-            .saturating_add((707_000 as Weight).saturating_mul(i as Weight))
+            .saturating_add((705_000 as Weight).saturating_mul(i as Weight))
             .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
     }
     // Storage: Skipped Metadata (r:0 w:0)
     fn kill_storage(i: u32, ) -> Weight {
-        (0 as Weight)
+        (898_000 as Weight)
             // Standard Error: 1_000
-            .saturating_add((595_000 as Weight).saturating_mul(i as Weight))
+            .saturating_add((587_000 as Weight).saturating_mul(i as Weight))
             .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
     }
     // Storage: Skipped Metadata (r:0 w:0)
     fn kill_prefix(p: u32, ) -> Weight {
         (0 as Weight)
             // Standard Error: 2_000
-            .saturating_add((1_228_000 as Weight).saturating_mul(p as Weight))
+            .saturating_add((1_217_000 as Weight).saturating_mul(p as Weight))
             .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
     }
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
-    fn remark(b: u32, ) -> Weight {
-        (11_364_000 as Weight)
-            // Standard Error: 0
-            .saturating_add((1_000 as Weight).saturating_mul(b as Weight))
+    fn remark(_b: u32, ) -> Weight {
+        (8_700_000 as Weight)
     }
     fn remark_with_event(b: u32, ) -> Weight {
-        (0 as Weight)
+        (6_500_000 as Weight)
             // Standard Error: 0
             .saturating_add((2_000 as Weight).saturating_mul(b as Weight))
     }
     // Storage: System Digest (r:1 w:1)
     // Storage: unknown [0x3a686561707061676573] (r:0 w:1)
     fn set_heap_pages() -> Weight {
-        (5_617_000 as Weight)
+        (5_516_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
@@ -120,21 +116,21 @@ impl WeightInfo for () {
     fn set_storage(i: u32, ) -> Weight {
         (0 as Weight)
             // Standard Error: 1_000
-            .saturating_add((707_000 as Weight).saturating_mul(i as Weight))
+            .saturating_add((705_000 as Weight).saturating_mul(i as Weight))
             .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
     }
     // Storage: Skipped Metadata (r:0 w:0)
     fn kill_storage(i: u32, ) -> Weight {
-        (0 as Weight)
+        (898_000 as Weight)
             // Standard Error: 1_000
-            .saturating_add((595_000 as Weight).saturating_mul(i as Weight))
+            .saturating_add((587_000 as Weight).saturating_mul(i as Weight))
             .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
     }
     // Storage: Skipped Metadata (r:0 w:0)
     fn kill_prefix(p: u32, ) -> Weight {
         (0 as Weight)
             // Standard Error: 2_000
-            .saturating_add((1_228_000 as Weight).saturating_mul(p as Weight))
+            .saturating_add((1_217_000 as Weight).saturating_mul(p as Weight))
             .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
     }
 }
diff --git a/runtime/manta/src/weights/manta_collator_selection.rs b/runtime/manta/src/weights/manta_collator_selection.rs
index 2aaa63d4e..f80cb95a3 100644
--- a/runtime/manta/src/weights/manta_collator_selection.rs
+++ b/runtime/manta/src/weights/manta_collator_selection.rs
@@ -17,14 +17,14 @@
 //! Autogenerated weights for manta_collator_selection
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-02-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta"), DB CACHE: 1024
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta-dev"), DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/manta
 // benchmark
 // pallet
-// --chain=manta
+// --chain=manta-dev
 // --steps=50
 // --repeat=20
 // --pallet=manta_collator_selection
@@ -64,29 +64,29 @@ pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> manta_collator_selection::WeightInfo for SubstrateWeight<T> {
     // Storage: CollatorSelection Invulnerables (r:0 w:1)
     fn set_invulnerables(b: u32, ) -> Weight {
-        (12_497_000 as Weight)
+        (13_093_000 as Weight)
             // Standard Error: 6_000
-            .saturating_add((67_000 as Weight).saturating_mul(b as Weight))
+            .saturating_add((140_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 {
-        (14_270_000 as Weight)
+        (14_962_000 as Weight)
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: CollatorSelection CandidacyBond (r:0 w:1)
     fn set_candidacy_bond() -> Weight {
-        (12_212_000 as Weight)
+        (12_688_000 as Weight)
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: CollatorSelection EvictionBaseline (r:0 w:1)
     fn set_eviction_baseline() -> Weight {
-        (11_593_000 as Weight)
+        (12_400_000 as Weight)
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: CollatorSelection EvictionTolerance (r:0 w:1)
     fn set_eviction_tolerance() -> Weight {
-        (11_680_000 as Weight)
+        (12_220_000 as Weight)
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: CollatorSelection Candidates (r:1 w:1)
@@ -95,26 +95,26 @@ impl<T: frame_system::Config> manta_collator_selection::WeightInfo for Substrate
     // Storage: Session NextKeys (r:1 w:0)
     // Storage: CollatorSelection CandidacyBond (r:1 w:0)
     fn register_as_candidate(c: u32, ) -> Weight {
-        (42_406_000 as Weight)
+        (43_147_000 as Weight)
             // Standard Error: 3_000
-            .saturating_add((379_000 as Weight).saturating_mul(c as Weight))
+            .saturating_add((365_000 as Weight).saturating_mul(c as Weight))
             .saturating_add(T::DbWeight::get().reads(5 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: CollatorSelection Candidates (r:1 w:1)
     fn leave_intent(c: u32, ) -> Weight {
-        (30_786_000 as Weight)
-            // Standard Error: 5_000
-            .saturating_add((277_000 as Weight).saturating_mul(c as Weight))
+        (31_968_000 as Weight)
+            // Standard Error: 6_000
+            .saturating_add((251_000 as Weight).saturating_mul(c as Weight))
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: CollatorSelection Invulnerables (r:1 w:0)
     // Storage: CollatorSelection Candidates (r:1 w:1)
     fn remove_collator(c: u32, ) -> Weight {
-        (32_496_000 as Weight)
-            // Standard Error: 5_000
-            .saturating_add((295_000 as Weight).saturating_mul(c as Weight))
+        (34_203_000 as Weight)
+            // Standard Error: 6_000
+            .saturating_add((223_000 as Weight).saturating_mul(c as Weight))
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
@@ -124,9 +124,9 @@ impl<T: frame_system::Config> manta_collator_selection::WeightInfo for Substrate
     // Storage: Session NextKeys (r:1 w:0)
     // Storage: CollatorSelection CandidacyBond (r:1 w:0)
     fn register_candidate(c: u32, ) -> Weight {
-        (43_521_000 as Weight)
+        (44_805_000 as Weight)
             // Standard Error: 7_000
-            .saturating_add((266_000 as Weight).saturating_mul(c as Weight))
+            .saturating_add((220_000 as Weight).saturating_mul(c as Weight))
             .saturating_add(T::DbWeight::get().reads(5 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
@@ -134,25 +134,25 @@ impl<T: frame_system::Config> manta_collator_selection::WeightInfo for Substrate
     // Storage: CollatorSelection BlocksPerCollatorThisSession (r:1 w:1)
     // Storage: System BlockWeight (r:1 w:1)
     fn note_author() -> Weight {
-        (37_482_000 as Weight)
+        (38_265_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(4 as Weight))
             .saturating_add(T::DbWeight::get().writes(4 as Weight))
     }
     // Storage: CollatorSelection Candidates (r:1 w:0)
     // Storage: CollatorSelection EvictionBaseline (r:1 w:0)
     // Storage: CollatorSelection EvictionTolerance (r:1 w:0)
-    // Storage: CollatorSelection BlocksPerCollatorThisSession (r:2 w:6)
+    // Storage: CollatorSelection BlocksPerCollatorThisSession (r:2 w:2)
     // Storage: CollatorSelection Invulnerables (r:1 w:0)
     // Storage: System BlockWeight (r:1 w:1)
     // Storage: Session Validators (r:1 w:0)
     // Storage: System Account (r:1 w:1)
     fn new_session(c: u32, ) -> Weight {
-        (27_204_000 as Weight)
-            // Standard Error: 72_000
-            .saturating_add((23_049_000 as Weight).saturating_mul(c as Weight))
+        (19_157_000 as Weight)
+            // Standard Error: 73_000
+            .saturating_add((23_880_000 as Weight).saturating_mul(c as Weight))
             .saturating_add(T::DbWeight::get().reads(6 as Weight))
             .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
-            .saturating_add(T::DbWeight::get().writes(10 as Weight))
+            .saturating_add(T::DbWeight::get().writes(3 as Weight))
             .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(c as Weight)))
     }
 }
@@ -161,29 +161,29 @@ impl<T: frame_system::Config> manta_collator_selection::WeightInfo for Substrate
 impl WeightInfo for () {
     // Storage: CollatorSelection Invulnerables (r:0 w:1)
     fn set_invulnerables(b: u32, ) -> Weight {
-        (12_497_000 as Weight)
+        (13_093_000 as Weight)
             // Standard Error: 6_000
-            .saturating_add((67_000 as Weight).saturating_mul(b as Weight))
+            .saturating_add((140_000 as Weight).saturating_mul(b as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: CollatorSelection DesiredCandidates (r:0 w:1)
     fn set_desired_candidates() -> Weight {
-        (14_270_000 as Weight)
+        (14_962_000 as Weight)
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: CollatorSelection CandidacyBond (r:0 w:1)
     fn set_candidacy_bond() -> Weight {
-        (12_212_000 as Weight)
+        (12_688_000 as Weight)
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: CollatorSelection EvictionBaseline (r:0 w:1)
     fn set_eviction_baseline() -> Weight {
-        (11_593_000 as Weight)
+        (12_400_000 as Weight)
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: CollatorSelection EvictionTolerance (r:0 w:1)
     fn set_eviction_tolerance() -> Weight {
-        (11_680_000 as Weight)
+        (12_220_000 as Weight)
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: CollatorSelection Candidates (r:1 w:1)
@@ -192,26 +192,26 @@ impl WeightInfo for () {
     // Storage: Session NextKeys (r:1 w:0)
     // Storage: CollatorSelection CandidacyBond (r:1 w:0)
     fn register_as_candidate(c: u32, ) -> Weight {
-        (42_406_000 as Weight)
+        (43_147_000 as Weight)
             // Standard Error: 3_000
-            .saturating_add((379_000 as Weight).saturating_mul(c as Weight))
+            .saturating_add((365_000 as Weight).saturating_mul(c as Weight))
             .saturating_add(RocksDbWeight::get().reads(5 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: CollatorSelection Candidates (r:1 w:1)
     fn leave_intent(c: u32, ) -> Weight {
-        (30_786_000 as Weight)
-            // Standard Error: 5_000
-            .saturating_add((277_000 as Weight).saturating_mul(c as Weight))
+        (31_968_000 as Weight)
+            // Standard Error: 6_000
+            .saturating_add((251_000 as Weight).saturating_mul(c as Weight))
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: CollatorSelection Invulnerables (r:1 w:0)
     // Storage: CollatorSelection Candidates (r:1 w:1)
     fn remove_collator(c: u32, ) -> Weight {
-        (32_496_000 as Weight)
-            // Standard Error: 5_000
-            .saturating_add((295_000 as Weight).saturating_mul(c as Weight))
+        (34_203_000 as Weight)
+            // Standard Error: 6_000
+            .saturating_add((223_000 as Weight).saturating_mul(c as Weight))
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
@@ -221,9 +221,9 @@ impl WeightInfo for () {
     // Storage: Session NextKeys (r:1 w:0)
     // Storage: CollatorSelection CandidacyBond (r:1 w:0)
     fn register_candidate(c: u32, ) -> Weight {
-        (43_521_000 as Weight)
+        (44_805_000 as Weight)
             // Standard Error: 7_000
-            .saturating_add((266_000 as Weight).saturating_mul(c as Weight))
+            .saturating_add((220_000 as Weight).saturating_mul(c as Weight))
             .saturating_add(RocksDbWeight::get().reads(5 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
@@ -231,25 +231,25 @@ impl WeightInfo for () {
     // Storage: CollatorSelection BlocksPerCollatorThisSession (r:1 w:1)
     // Storage: System BlockWeight (r:1 w:1)
     fn note_author() -> Weight {
-        (37_482_000 as Weight)
+        (38_265_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(4 as Weight))
             .saturating_add(RocksDbWeight::get().writes(4 as Weight))
     }
     // Storage: CollatorSelection Candidates (r:1 w:0)
     // Storage: CollatorSelection EvictionBaseline (r:1 w:0)
     // Storage: CollatorSelection EvictionTolerance (r:1 w:0)
-    // Storage: CollatorSelection BlocksPerCollatorThisSession (r:2 w:6)
+    // Storage: CollatorSelection BlocksPerCollatorThisSession (r:2 w:2)
     // Storage: CollatorSelection Invulnerables (r:1 w:0)
     // Storage: System BlockWeight (r:1 w:1)
     // Storage: Session Validators (r:1 w:0)
     // Storage: System Account (r:1 w:1)
     fn new_session(c: u32, ) -> Weight {
-        (27_204_000 as Weight)
-            // Standard Error: 72_000
-            .saturating_add((23_049_000 as Weight).saturating_mul(c as Weight))
+        (19_157_000 as Weight)
+            // Standard Error: 73_000
+            .saturating_add((23_880_000 as Weight).saturating_mul(c as Weight))
             .saturating_add(RocksDbWeight::get().reads(6 as Weight))
             .saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
-            .saturating_add(RocksDbWeight::get().writes(10 as Weight))
+            .saturating_add(RocksDbWeight::get().writes(3 as Weight))
             .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(c as Weight)))
     }
 }
diff --git a/runtime/manta/src/weights/pallet_asset_manager.rs b/runtime/manta/src/weights/pallet_asset_manager.rs
index 4f08af349..dea3b4b58 100644
--- a/runtime/manta/src/weights/pallet_asset_manager.rs
+++ b/runtime/manta/src/weights/pallet_asset_manager.rs
@@ -17,7 +17,7 @@
 //! Autogenerated weights for pallet_asset_manager
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta-dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -64,14 +64,14 @@ impl<T: frame_system::Config> pallet_asset_manager::WeightInfo for SubstrateWeig
     // Storage: AssetManager AssetIdMetadata (r:0 w:1)
     // Storage: AssetManager AssetIdLocation (r:0 w:1)
     fn register_asset() -> Weight {
-        (47_986_000 as Weight)
+        (49_599_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(4 as Weight))
             .saturating_add(T::DbWeight::get().writes(6 as Weight))
     }
     // Storage: AssetManager AssetIdLocation (r:1 w:0)
     // Storage: AssetManager UnitsPerSecond (r:0 w:1)
     fn set_units_per_second() -> Weight {
-        (52_362_000 as Weight)
+        (53_784_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
@@ -79,7 +79,7 @@ impl<T: frame_system::Config> pallet_asset_manager::WeightInfo for SubstrateWeig
     // Storage: AssetManager LocationAssetId (r:1 w:2)
     // Storage: AssetManager AllowedDestParaIds (r:2 w:2)
     fn update_asset_location() -> Weight {
-        (69_006_000 as Weight)
+        (75_667_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(4 as Weight))
             .saturating_add(T::DbWeight::get().writes(5 as Weight))
     }
@@ -88,7 +88,7 @@ impl<T: frame_system::Config> pallet_asset_manager::WeightInfo for SubstrateWeig
     // Storage: Assets Metadata (r:1 w:1)
     // Storage: AssetManager AssetIdMetadata (r:0 w:1)
     fn update_asset_metadata() -> Weight {
-        (73_326_000 as Weight)
+        (73_920_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(3 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
@@ -96,13 +96,13 @@ impl<T: frame_system::Config> pallet_asset_manager::WeightInfo for SubstrateWeig
     // Storage: Assets Asset (r:1 w:1)
     // Storage: Assets Account (r:1 w:1)
     fn mint_asset() -> Weight {
-        (82_318_000 as Weight)
+        (82_238_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(3 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
     // Storage: AssetManager MinXcmFee (r:0 w:1)
     fn set_min_xcm_fee() -> Weight {
-        (41_165_000 as Weight)
+        (43_669_000 as Weight)
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
 }
@@ -116,14 +116,14 @@ impl WeightInfo for () {
     // Storage: AssetManager AssetIdMetadata (r:0 w:1)
     // Storage: AssetManager AssetIdLocation (r:0 w:1)
     fn register_asset() -> Weight {
-        (47_986_000 as Weight)
+        (49_599_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(4 as Weight))
             .saturating_add(RocksDbWeight::get().writes(6 as Weight))
     }
     // Storage: AssetManager AssetIdLocation (r:1 w:0)
     // Storage: AssetManager UnitsPerSecond (r:0 w:1)
     fn set_units_per_second() -> Weight {
-        (52_362_000 as Weight)
+        (53_784_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
@@ -131,7 +131,7 @@ impl WeightInfo for () {
     // Storage: AssetManager LocationAssetId (r:1 w:2)
     // Storage: AssetManager AllowedDestParaIds (r:2 w:2)
     fn update_asset_location() -> Weight {
-        (69_006_000 as Weight)
+        (75_667_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(4 as Weight))
             .saturating_add(RocksDbWeight::get().writes(5 as Weight))
     }
@@ -140,7 +140,7 @@ impl WeightInfo for () {
     // Storage: Assets Metadata (r:1 w:1)
     // Storage: AssetManager AssetIdMetadata (r:0 w:1)
     fn update_asset_metadata() -> Weight {
-        (73_326_000 as Weight)
+        (73_920_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(3 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
@@ -148,13 +148,13 @@ impl WeightInfo for () {
     // Storage: Assets Asset (r:1 w:1)
     // Storage: Assets Account (r:1 w:1)
     fn mint_asset() -> Weight {
-        (82_318_000 as Weight)
+        (82_238_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(3 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
     // Storage: AssetManager MinXcmFee (r:0 w:1)
     fn set_min_xcm_fee() -> Weight {
-        (41_165_000 as Weight)
+        (43_669_000 as Weight)
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
 }
diff --git a/runtime/manta/src/weights/pallet_assets.rs b/runtime/manta/src/weights/pallet_assets.rs
index 57f10da9f..bdbaae7ca 100644
--- a/runtime/manta/src/weights/pallet_assets.rs
+++ b/runtime/manta/src/weights/pallet_assets.rs
@@ -17,7 +17,7 @@
 //! Autogenerated weights for pallet_assets
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta-dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -76,13 +76,13 @@ pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_assets::WeightInfo for SubstrateWeight<T> {
     // Storage: Assets Asset (r:1 w:1)
     fn create() -> Weight {
-        (16_498_000 as Weight)
+        (17_161_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     fn force_create() -> Weight {
-        (15_596_000 as Weight)
+        (15_627_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
@@ -93,12 +93,12 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for SubstrateWeight<T> {
     // Storage: Assets Approvals (r:501 w:500)
     fn destroy(c: u32, s: u32, a: u32, ) -> Weight {
         (0 as Weight)
-            // Standard Error: 49_000
-            .saturating_add((18_268_000 as Weight).saturating_mul(c as Weight))
-            // Standard Error: 49_000
-            .saturating_add((21_392_000 as Weight).saturating_mul(s as Weight))
-            // Standard Error: 493_000
-            .saturating_add((9_829_000 as Weight).saturating_mul(a as Weight))
+            // Standard Error: 47_000
+            .saturating_add((18_377_000 as Weight).saturating_mul(c as Weight))
+            // Standard Error: 47_000
+            .saturating_add((21_491_000 as Weight).saturating_mul(s as Weight))
+            // Standard Error: 474_000
+            .saturating_add((11_740_000 as Weight).saturating_mul(a as Weight))
             .saturating_add(T::DbWeight::get().reads(5 as Weight))
             .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
             .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(s as Weight)))
@@ -111,14 +111,14 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for SubstrateWeight<T> {
     // Storage: Assets Asset (r:1 w:1)
     // Storage: Assets Account (r:1 w:1)
     fn mint() -> Weight {
-        (31_176_000 as Weight)
+        (31_466_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     // Storage: Assets Account (r:1 w:1)
     fn burn() -> Weight {
-        (36_540_000 as Weight)
+        (34_120_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
@@ -126,7 +126,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for SubstrateWeight<T> {
     // Storage: Assets Account (r:2 w:2)
     // Storage: System Account (r:1 w:1)
     fn transfer() -> Weight {
-        (51_999_000 as Weight)
+        (51_341_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(4 as Weight))
             .saturating_add(T::DbWeight::get().writes(4 as Weight))
     }
@@ -134,7 +134,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for SubstrateWeight<T> {
     // Storage: Assets Account (r:2 w:2)
     // Storage: System Account (r:1 w:1)
     fn transfer_keep_alive() -> Weight {
-        (43_324_000 as Weight)
+        (43_597_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(4 as Weight))
             .saturating_add(T::DbWeight::get().writes(4 as Weight))
     }
@@ -142,89 +142,91 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for SubstrateWeight<T> {
     // Storage: Assets Account (r:2 w:2)
     // Storage: System Account (r:1 w:1)
     fn force_transfer() -> Weight {
-        (48_346_000 as Weight)
+        (51_661_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(4 as Weight))
             .saturating_add(T::DbWeight::get().writes(4 as Weight))
     }
     // Storage: Assets Asset (r:1 w:0)
     // Storage: Assets Account (r:1 w:1)
     fn freeze() -> Weight {
-        (20_410_000 as Weight)
+        (20_480_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:0)
     // Storage: Assets Account (r:1 w:1)
     fn thaw() -> Weight {
-        (19_372_000 as Weight)
+        (20_265_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     fn freeze_asset() -> Weight {
-        (16_768_000 as Weight)
+        (16_901_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     fn thaw_asset() -> Weight {
-        (16_022_000 as Weight)
+        (15_756_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     // Storage: Assets Metadata (r:1 w:0)
     fn transfer_ownership() -> Weight {
-        (17_816_000 as Weight)
+        (17_971_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     fn set_team() -> Weight {
-        (16_366_000 as Weight)
+        (16_830_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:0)
     // Storage: Assets Metadata (r:1 w:1)
-    fn set_metadata(n: u32, _s: u32, ) -> Weight {
-        (19_669_000 as Weight)
+    fn set_metadata(n: u32, s: u32, ) -> Weight {
+        (19_798_000 as Weight)
             // Standard Error: 1_000
-            .saturating_add((17_000 as Weight).saturating_mul(n as Weight))
+            .saturating_add((5_000 as Weight).saturating_mul(n as Weight))
+            // Standard Error: 1_000
+            .saturating_add((3_000 as Weight).saturating_mul(s as Weight))
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:0)
     // Storage: Assets Metadata (r:1 w:1)
     fn clear_metadata() -> Weight {
-        (19_523_000 as Weight)
+        (18_582_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:0)
     // Storage: Assets Metadata (r:1 w:1)
     fn force_set_metadata(_n: u32, _s: u32, ) -> Weight {
-        (21_157_000 as Weight)
+        (18_303_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:0)
     // Storage: Assets Metadata (r:1 w:1)
     fn force_clear_metadata() -> Weight {
-        (20_782_000 as Weight)
+        (18_317_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     fn force_asset_status() -> Weight {
-        (16_380_000 as Weight)
+        (15_862_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     // Storage: Assets Approvals (r:1 w:1)
     fn approve_transfer() -> Weight {
-        (23_306_000 as Weight)
+        (24_307_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
@@ -233,21 +235,21 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for SubstrateWeight<T> {
     // Storage: Assets Account (r:2 w:2)
     // Storage: System Account (r:1 w:1)
     fn transfer_approved() -> Weight {
-        (59_744_000 as Weight)
+        (54_088_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(5 as Weight))
             .saturating_add(T::DbWeight::get().writes(5 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     // Storage: Assets Approvals (r:1 w:1)
     fn cancel_approval() -> Weight {
-        (26_094_000 as Weight)
+        (23_174_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     // Storage: Assets Approvals (r:1 w:1)
     fn force_cancel_approval() -> Weight {
-        (26_426_000 as Weight)
+        (25_273_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
@@ -257,13 +259,13 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for SubstrateWeight<T> {
 impl WeightInfo for () {
     // Storage: Assets Asset (r:1 w:1)
     fn create() -> Weight {
-        (16_498_000 as Weight)
+        (17_161_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     fn force_create() -> Weight {
-        (15_596_000 as Weight)
+        (15_627_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
@@ -274,12 +276,12 @@ impl WeightInfo for () {
     // Storage: Assets Approvals (r:501 w:500)
     fn destroy(c: u32, s: u32, a: u32, ) -> Weight {
         (0 as Weight)
-            // Standard Error: 49_000
-            .saturating_add((18_268_000 as Weight).saturating_mul(c as Weight))
-            // Standard Error: 49_000
-            .saturating_add((21_392_000 as Weight).saturating_mul(s as Weight))
-            // Standard Error: 493_000
-            .saturating_add((9_829_000 as Weight).saturating_mul(a as Weight))
+            // Standard Error: 47_000
+            .saturating_add((18_377_000 as Weight).saturating_mul(c as Weight))
+            // Standard Error: 47_000
+            .saturating_add((21_491_000 as Weight).saturating_mul(s as Weight))
+            // Standard Error: 474_000
+            .saturating_add((11_740_000 as Weight).saturating_mul(a as Weight))
             .saturating_add(RocksDbWeight::get().reads(5 as Weight))
             .saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(c as Weight)))
             .saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(s as Weight)))
@@ -292,14 +294,14 @@ impl WeightInfo for () {
     // Storage: Assets Asset (r:1 w:1)
     // Storage: Assets Account (r:1 w:1)
     fn mint() -> Weight {
-        (31_176_000 as Weight)
+        (31_466_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     // Storage: Assets Account (r:1 w:1)
     fn burn() -> Weight {
-        (36_540_000 as Weight)
+        (34_120_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
@@ -307,7 +309,7 @@ impl WeightInfo for () {
     // Storage: Assets Account (r:2 w:2)
     // Storage: System Account (r:1 w:1)
     fn transfer() -> Weight {
-        (51_999_000 as Weight)
+        (51_341_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(4 as Weight))
             .saturating_add(RocksDbWeight::get().writes(4 as Weight))
     }
@@ -315,7 +317,7 @@ impl WeightInfo for () {
     // Storage: Assets Account (r:2 w:2)
     // Storage: System Account (r:1 w:1)
     fn transfer_keep_alive() -> Weight {
-        (43_324_000 as Weight)
+        (43_597_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(4 as Weight))
             .saturating_add(RocksDbWeight::get().writes(4 as Weight))
     }
@@ -323,89 +325,91 @@ impl WeightInfo for () {
     // Storage: Assets Account (r:2 w:2)
     // Storage: System Account (r:1 w:1)
     fn force_transfer() -> Weight {
-        (48_346_000 as Weight)
+        (51_661_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(4 as Weight))
             .saturating_add(RocksDbWeight::get().writes(4 as Weight))
     }
     // Storage: Assets Asset (r:1 w:0)
     // Storage: Assets Account (r:1 w:1)
     fn freeze() -> Weight {
-        (20_410_000 as Weight)
+        (20_480_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:0)
     // Storage: Assets Account (r:1 w:1)
     fn thaw() -> Weight {
-        (19_372_000 as Weight)
+        (20_265_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     fn freeze_asset() -> Weight {
-        (16_768_000 as Weight)
+        (16_901_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     fn thaw_asset() -> Weight {
-        (16_022_000 as Weight)
+        (15_756_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     // Storage: Assets Metadata (r:1 w:0)
     fn transfer_ownership() -> Weight {
-        (17_816_000 as Weight)
+        (17_971_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     fn set_team() -> Weight {
-        (16_366_000 as Weight)
+        (16_830_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:0)
     // Storage: Assets Metadata (r:1 w:1)
-    fn set_metadata(n: u32, _s: u32, ) -> Weight {
-        (19_669_000 as Weight)
+    fn set_metadata(n: u32, s: u32, ) -> Weight {
+        (19_798_000 as Weight)
+            // Standard Error: 1_000
+            .saturating_add((5_000 as Weight).saturating_mul(n as Weight))
             // Standard Error: 1_000
-            .saturating_add((17_000 as Weight).saturating_mul(n as Weight))
+            .saturating_add((3_000 as Weight).saturating_mul(s as Weight))
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:0)
     // Storage: Assets Metadata (r:1 w:1)
     fn clear_metadata() -> Weight {
-        (19_523_000 as Weight)
+        (18_582_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:0)
     // Storage: Assets Metadata (r:1 w:1)
     fn force_set_metadata(_n: u32, _s: u32, ) -> Weight {
-        (21_157_000 as Weight)
+        (18_303_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:0)
     // Storage: Assets Metadata (r:1 w:1)
     fn force_clear_metadata() -> Weight {
-        (20_782_000 as Weight)
+        (18_317_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     fn force_asset_status() -> Weight {
-        (16_380_000 as Weight)
+        (15_862_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     // Storage: Assets Approvals (r:1 w:1)
     fn approve_transfer() -> Weight {
-        (23_306_000 as Weight)
+        (24_307_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
@@ -414,21 +418,21 @@ impl WeightInfo for () {
     // Storage: Assets Account (r:2 w:2)
     // Storage: System Account (r:1 w:1)
     fn transfer_approved() -> Weight {
-        (59_744_000 as Weight)
+        (54_088_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(5 as Weight))
             .saturating_add(RocksDbWeight::get().writes(5 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     // Storage: Assets Approvals (r:1 w:1)
     fn cancel_approval() -> Weight {
-        (26_094_000 as Weight)
+        (23_174_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
     // Storage: Assets Asset (r:1 w:1)
     // Storage: Assets Approvals (r:1 w:1)
     fn force_cancel_approval() -> Weight {
-        (26_426_000 as Weight)
+        (25_273_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
diff --git a/runtime/manta/src/weights/pallet_author_inherent.rs b/runtime/manta/src/weights/pallet_author_inherent.rs
index 2736cb225..9cf4c0d61 100644
--- a/runtime/manta/src/weights/pallet_author_inherent.rs
+++ b/runtime/manta/src/weights/pallet_author_inherent.rs
@@ -17,14 +17,14 @@
 //! Autogenerated weights for pallet_author_inherent
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-02-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta"), DB CACHE: 1024
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta-dev"), DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/manta
 // benchmark
 // pallet
-// --chain=manta
+// --chain=manta-dev
 // --steps=50
 // --repeat=20
 // --pallet=pallet_author_inherent
@@ -57,7 +57,7 @@ impl<T: frame_system::Config> pallet_author_inherent::WeightInfo for SubstrateWe
     // Storage: AuthorInherent Author (r:1 w:0)
     // Storage: ParachainStaking SelectedCandidates (r:1 w:0)
     fn kick_off_authorship_validation() -> Weight {
-        (12_325_000 as Weight)
+        (12_718_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(4 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
@@ -70,7 +70,7 @@ impl WeightInfo for () {
     // Storage: AuthorInherent Author (r:1 w:0)
     // Storage: ParachainStaking SelectedCandidates (r:1 w:0)
     fn kick_off_authorship_validation() -> Weight {
-        (12_325_000 as Weight)
+        (12_718_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(4 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
diff --git a/runtime/manta/src/weights/pallet_balances.rs b/runtime/manta/src/weights/pallet_balances.rs
index 96fea533f..6b0e7c4a0 100644
--- a/runtime/manta/src/weights/pallet_balances.rs
+++ b/runtime/manta/src/weights/pallet_balances.rs
@@ -17,14 +17,14 @@
 //! Autogenerated weights for pallet_balances
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-02-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta"), DB CACHE: 1024
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta-dev"), DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/manta
 // benchmark
 // pallet
-// --chain=manta
+// --chain=manta-dev
 // --steps=50
 // --repeat=20
 // --pallet=pallet_balances
@@ -60,43 +60,43 @@ pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_balances::WeightInfo for SubstrateWeight<T> {
     // Storage: System Account (r:1 w:1)
     fn transfer() -> Weight {
-        (42_800_000 as Weight)
+        (47_589_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: System Account (r:1 w:1)
     fn transfer_keep_alive() -> Weight {
-        (34_569_000 as Weight)
+        (34_772_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: System Account (r:1 w:1)
     fn set_balance_creating() -> Weight {
-        (22_836_000 as Weight)
+        (21_853_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: System Account (r:1 w:1)
     fn set_balance_killing() -> Weight {
-        (26_166_000 as Weight)
+        (24_083_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: System Account (r:2 w:2)
     fn force_transfer() -> Weight {
-        (42_363_000 as Weight)
+        (47_209_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
     // Storage: System Account (r:1 w:1)
     fn transfer_all() -> Weight {
-        (40_855_000 as Weight)
+        (38_922_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: System Account (r:1 w:1)
     fn force_unreserve() -> Weight {
-        (20_239_000 as Weight)
+        (20_000_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
@@ -106,43 +106,43 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for SubstrateWeight<T>
 impl WeightInfo for () {
     // Storage: System Account (r:1 w:1)
     fn transfer() -> Weight {
-        (42_800_000 as Weight)
+        (47_589_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: System Account (r:1 w:1)
     fn transfer_keep_alive() -> Weight {
-        (34_569_000 as Weight)
+        (34_772_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: System Account (r:1 w:1)
     fn set_balance_creating() -> Weight {
-        (22_836_000 as Weight)
+        (21_853_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: System Account (r:1 w:1)
     fn set_balance_killing() -> Weight {
-        (26_166_000 as Weight)
+        (24_083_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: System Account (r:2 w:2)
     fn force_transfer() -> Weight {
-        (42_363_000 as Weight)
+        (47_209_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
     // Storage: System Account (r:1 w:1)
     fn transfer_all() -> Weight {
-        (40_855_000 as Weight)
+        (38_922_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: System Account (r:1 w:1)
     fn force_unreserve() -> Weight {
-        (20_239_000 as Weight)
+        (20_000_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
diff --git a/runtime/manta/src/weights/pallet_multisig.rs b/runtime/manta/src/weights/pallet_multisig.rs
index b5f32739b..ad5fa5c39 100644
--- a/runtime/manta/src/weights/pallet_multisig.rs
+++ b/runtime/manta/src/weights/pallet_multisig.rs
@@ -17,14 +17,14 @@
 //! Autogenerated weights for pallet_multisig
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-02-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta"), DB CACHE: 1024
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta-dev"), DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/manta
 // benchmark
 // pallet
-// --chain=manta
+// --chain=manta-dev
 // --steps=50
 // --repeat=20
 // --pallet=pallet_multisig
@@ -62,16 +62,16 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_multisig::WeightInfo for SubstrateWeight<T> {
     fn as_multi_threshold_1(z: u32, ) -> Weight {
-        (21_367_000 as Weight)
+        (21_337_000 as Weight)
             // Standard Error: 0
             .saturating_add((1_000 as Weight).saturating_mul(z as Weight))
     }
     // Storage: Multisig Multisigs (r:1 w:1)
     // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
     fn as_multi_create(s: u32, z: u32, ) -> Weight {
-        (38_960_000 as Weight)
+        (39_286_000 as Weight)
             // Standard Error: 2_000
-            .saturating_add((106_000 as Weight).saturating_mul(s as Weight))
+            .saturating_add((115_000 as Weight).saturating_mul(s as Weight))
             // Standard Error: 0
             .saturating_add((1_000 as Weight).saturating_mul(z as Weight))
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
@@ -81,9 +81,9 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for SubstrateWeight<T>
     // Storage: Multisig Calls (r:1 w:1)
     // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
     fn as_multi_create_store(s: u32, z: u32, ) -> Weight {
-        (41_571_000 as Weight)
+        (43_631_000 as Weight)
             // Standard Error: 2_000
-            .saturating_add((89_000 as Weight).saturating_mul(s as Weight))
+            .saturating_add((93_000 as Weight).saturating_mul(s as Weight))
             // Standard Error: 0
             .saturating_add((2_000 as Weight).saturating_mul(z as Weight))
             .saturating_add(T::DbWeight::get().reads(3 as Weight))
@@ -91,9 +91,9 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for SubstrateWeight<T>
     }
     // Storage: Multisig Multisigs (r:1 w:1)
     fn as_multi_approve(s: u32, z: u32, ) -> Weight {
-        (26_100_000 as Weight)
+        (26_151_000 as Weight)
             // Standard Error: 2_000
-            .saturating_add((90_000 as Weight).saturating_mul(s as Weight))
+            .saturating_add((99_000 as Weight).saturating_mul(s as Weight))
             // Standard Error: 0
             .saturating_add((1_000 as Weight).saturating_mul(z as Weight))
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
@@ -102,9 +102,9 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for SubstrateWeight<T>
     // Storage: Multisig Multisigs (r:1 w:1)
     // Storage: Multisig Calls (r:1 w:1)
     fn as_multi_approve_store(s: u32, z: u32, ) -> Weight {
-        (42_101_000 as Weight)
+        (41_576_000 as Weight)
             // Standard Error: 2_000
-            .saturating_add((91_000 as Weight).saturating_mul(s as Weight))
+            .saturating_add((99_000 as Weight).saturating_mul(s as Weight))
             // Standard Error: 0
             .saturating_add((2_000 as Weight).saturating_mul(z as Weight))
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
@@ -114,9 +114,9 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for SubstrateWeight<T>
     // Storage: Multisig Calls (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn as_multi_complete(s: u32, z: u32, ) -> Weight {
-        (51_142_000 as Weight)
+        (55_578_000 as Weight)
             // Standard Error: 2_000
-            .saturating_add((128_000 as Weight).saturating_mul(s as Weight))
+            .saturating_add((118_000 as Weight).saturating_mul(s as Weight))
             // Standard Error: 0
             .saturating_add((2_000 as Weight).saturating_mul(z as Weight))
             .saturating_add(T::DbWeight::get().reads(3 as Weight))
@@ -125,18 +125,18 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for SubstrateWeight<T>
     // Storage: Multisig Multisigs (r:1 w:1)
     // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
     fn approve_as_multi_create(s: u32, ) -> Weight {
-        (34_650_000 as Weight)
+        (35_985_000 as Weight)
             // Standard Error: 2_000
-            .saturating_add((125_000 as Weight).saturating_mul(s as Weight))
+            .saturating_add((129_000 as Weight).saturating_mul(s as Weight))
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Multisig Multisigs (r:1 w:1)
     // Storage: Multisig Calls (r:1 w:0)
     fn approve_as_multi_approve(s: u32, ) -> Weight {
-        (21_755_000 as Weight)
+        (22_430_000 as Weight)
             // Standard Error: 1_000
-            .saturating_add((119_000 as Weight).saturating_mul(s as Weight))
+            .saturating_add((121_000 as Weight).saturating_mul(s as Weight))
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
@@ -144,18 +144,18 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for SubstrateWeight<T>
     // Storage: Multisig Calls (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn approve_as_multi_complete(s: u32, ) -> Weight {
-        (64_361_000 as Weight)
+        (64_651_000 as Weight)
             // Standard Error: 2_000
-            .saturating_add((164_000 as Weight).saturating_mul(s as Weight))
+            .saturating_add((152_000 as Weight).saturating_mul(s as Weight))
             .saturating_add(T::DbWeight::get().reads(3 as Weight))
             .saturating_add(T::DbWeight::get().writes(3 as Weight))
     }
     // Storage: Multisig Multisigs (r:1 w:1)
     // Storage: Multisig Calls (r:1 w:1)
     fn cancel_as_multi(s: u32, ) -> Weight {
-        (51_254_000 as Weight)
-            // Standard Error: 2_000
-            .saturating_add((139_000 as Weight).saturating_mul(s as Weight))
+        (52_206_000 as Weight)
+            // Standard Error: 3_000
+            .saturating_add((130_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))
     }
@@ -164,16 +164,16 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for SubstrateWeight<T>
 // For backwards compatibility and tests
 impl WeightInfo for () {
     fn as_multi_threshold_1(z: u32, ) -> Weight {
-        (21_367_000 as Weight)
+        (21_337_000 as Weight)
             // Standard Error: 0
             .saturating_add((1_000 as Weight).saturating_mul(z as Weight))
     }
     // Storage: Multisig Multisigs (r:1 w:1)
     // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
     fn as_multi_create(s: u32, z: u32, ) -> Weight {
-        (38_960_000 as Weight)
+        (39_286_000 as Weight)
             // Standard Error: 2_000
-            .saturating_add((106_000 as Weight).saturating_mul(s as Weight))
+            .saturating_add((115_000 as Weight).saturating_mul(s as Weight))
             // Standard Error: 0
             .saturating_add((1_000 as Weight).saturating_mul(z as Weight))
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
@@ -183,9 +183,9 @@ impl WeightInfo for () {
     // Storage: Multisig Calls (r:1 w:1)
     // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
     fn as_multi_create_store(s: u32, z: u32, ) -> Weight {
-        (41_571_000 as Weight)
+        (43_631_000 as Weight)
             // Standard Error: 2_000
-            .saturating_add((89_000 as Weight).saturating_mul(s as Weight))
+            .saturating_add((93_000 as Weight).saturating_mul(s as Weight))
             // Standard Error: 0
             .saturating_add((2_000 as Weight).saturating_mul(z as Weight))
             .saturating_add(RocksDbWeight::get().reads(3 as Weight))
@@ -193,9 +193,9 @@ impl WeightInfo for () {
     }
     // Storage: Multisig Multisigs (r:1 w:1)
     fn as_multi_approve(s: u32, z: u32, ) -> Weight {
-        (26_100_000 as Weight)
+        (26_151_000 as Weight)
             // Standard Error: 2_000
-            .saturating_add((90_000 as Weight).saturating_mul(s as Weight))
+            .saturating_add((99_000 as Weight).saturating_mul(s as Weight))
             // Standard Error: 0
             .saturating_add((1_000 as Weight).saturating_mul(z as Weight))
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
@@ -204,9 +204,9 @@ impl WeightInfo for () {
     // Storage: Multisig Multisigs (r:1 w:1)
     // Storage: Multisig Calls (r:1 w:1)
     fn as_multi_approve_store(s: u32, z: u32, ) -> Weight {
-        (42_101_000 as Weight)
+        (41_576_000 as Weight)
             // Standard Error: 2_000
-            .saturating_add((91_000 as Weight).saturating_mul(s as Weight))
+            .saturating_add((99_000 as Weight).saturating_mul(s as Weight))
             // Standard Error: 0
             .saturating_add((2_000 as Weight).saturating_mul(z as Weight))
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
@@ -216,9 +216,9 @@ impl WeightInfo for () {
     // Storage: Multisig Calls (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn as_multi_complete(s: u32, z: u32, ) -> Weight {
-        (51_142_000 as Weight)
+        (55_578_000 as Weight)
             // Standard Error: 2_000
-            .saturating_add((128_000 as Weight).saturating_mul(s as Weight))
+            .saturating_add((118_000 as Weight).saturating_mul(s as Weight))
             // Standard Error: 0
             .saturating_add((2_000 as Weight).saturating_mul(z as Weight))
             .saturating_add(RocksDbWeight::get().reads(3 as Weight))
@@ -227,18 +227,18 @@ impl WeightInfo for () {
     // Storage: Multisig Multisigs (r:1 w:1)
     // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
     fn approve_as_multi_create(s: u32, ) -> Weight {
-        (34_650_000 as Weight)
+        (35_985_000 as Weight)
             // Standard Error: 2_000
-            .saturating_add((125_000 as Weight).saturating_mul(s as Weight))
+            .saturating_add((129_000 as Weight).saturating_mul(s as Weight))
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Multisig Multisigs (r:1 w:1)
     // Storage: Multisig Calls (r:1 w:0)
     fn approve_as_multi_approve(s: u32, ) -> Weight {
-        (21_755_000 as Weight)
+        (22_430_000 as Weight)
             // Standard Error: 1_000
-            .saturating_add((119_000 as Weight).saturating_mul(s as Weight))
+            .saturating_add((121_000 as Weight).saturating_mul(s as Weight))
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
@@ -246,18 +246,18 @@ impl WeightInfo for () {
     // Storage: Multisig Calls (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn approve_as_multi_complete(s: u32, ) -> Weight {
-        (64_361_000 as Weight)
+        (64_651_000 as Weight)
             // Standard Error: 2_000
-            .saturating_add((164_000 as Weight).saturating_mul(s as Weight))
+            .saturating_add((152_000 as Weight).saturating_mul(s as Weight))
             .saturating_add(RocksDbWeight::get().reads(3 as Weight))
             .saturating_add(RocksDbWeight::get().writes(3 as Weight))
     }
     // Storage: Multisig Multisigs (r:1 w:1)
     // Storage: Multisig Calls (r:1 w:1)
     fn cancel_as_multi(s: u32, ) -> Weight {
-        (51_254_000 as Weight)
-            // Standard Error: 2_000
-            .saturating_add((139_000 as Weight).saturating_mul(s as Weight))
+        (52_206_000 as Weight)
+            // Standard Error: 3_000
+            .saturating_add((130_000 as Weight).saturating_mul(s as Weight))
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
diff --git a/runtime/manta/src/weights/pallet_parachain_staking.rs b/runtime/manta/src/weights/pallet_parachain_staking.rs
index aeb1bc92b..0acf822e8 100644
--- a/runtime/manta/src/weights/pallet_parachain_staking.rs
+++ b/runtime/manta/src/weights/pallet_parachain_staking.rs
@@ -17,14 +17,14 @@
 //! Autogenerated weights for pallet_parachain_staking
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-02-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta"), DB CACHE: 1024
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta-dev"), DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/manta
 // benchmark
 // pallet
-// --chain=manta
+// --chain=manta-dev
 // --steps=50
 // --repeat=20
 // --pallet=pallet_parachain_staking
@@ -84,44 +84,44 @@ pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_parachain_staking::WeightInfo for SubstrateWeight<T> {
     // Storage: ParachainStaking InflationConfig (r:1 w:1)
     fn set_staking_expectations() -> Weight {
-        (16_255_000 as Weight)
+        (16_517_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: ParachainStaking InflationConfig (r:1 w:1)
     fn set_inflation() -> Weight {
-        (62_711_000 as Weight)
+        (58_667_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: ParachainStaking ParachainBondInfo (r:1 w:1)
     fn set_parachain_bond_account() -> Weight {
-        (16_118_000 as Weight)
+        (16_423_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: ParachainStaking ParachainBondInfo (r:1 w:1)
     fn set_parachain_bond_reserve_percent() -> Weight {
-        (15_006_000 as Weight)
+        (15_582_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: ParachainStaking TotalSelected (r:1 w:1)
     fn set_total_selected() -> Weight {
-        (17_586_000 as Weight)
+        (17_744_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: ParachainStaking CollatorCommission (r:1 w:1)
     fn set_collator_commission() -> Weight {
-        (14_531_000 as Weight)
+        (14_652_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: ParachainStaking TotalSelected (r:1 w:0)
     // Storage: ParachainStaking InflationConfig (r:1 w:1)
     fn set_blocks_per_round() -> Weight {
-        (23_993_000 as Weight)
+        (24_264_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
@@ -135,18 +135,18 @@ impl<T: frame_system::Config> pallet_parachain_staking::WeightInfo for Substrate
     // Storage: ParachainStaking TopDelegations (r:0 w:1)
     // Storage: ParachainStaking BottomDelegations (r:0 w:1)
     fn join_candidates(x: u32, ) -> Weight {
-        (72_341_000 as Weight)
+        (74_756_000 as Weight)
             // Standard Error: 1_000
-            .saturating_add((65_000 as Weight).saturating_mul(x as Weight))
+            .saturating_add((56_000 as Weight).saturating_mul(x as Weight))
             .saturating_add(T::DbWeight::get().reads(7 as Weight))
             .saturating_add(T::DbWeight::get().writes(7 as Weight))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn schedule_leave_candidates(x: u32, ) -> Weight {
-        (60_702_000 as Weight)
+        (57_249_000 as Weight)
             // Standard Error: 1_000
-            .saturating_add((39_000 as Weight).saturating_mul(x as Weight))
+            .saturating_add((42_000 as Weight).saturating_mul(x as Weight))
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
@@ -160,8 +160,8 @@ impl<T: frame_system::Config> pallet_parachain_staking::WeightInfo for Substrate
     // Storage: ParachainStaking Total (r:1 w:1)
     fn execute_leave_candidates(x: u32, ) -> Weight {
         (0 as Weight)
-            // Standard Error: 52_000
-            .saturating_add((26_034_000 as Weight).saturating_mul(x as Weight))
+            // Standard Error: 57_000
+            .saturating_add((25_589_000 as Weight).saturating_mul(x as Weight))
             .saturating_add(T::DbWeight::get().reads(4 as Weight))
             .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(x as Weight)))
             .saturating_add(T::DbWeight::get().writes(4 as Weight))
@@ -170,23 +170,23 @@ impl<T: frame_system::Config> pallet_parachain_staking::WeightInfo for Substrate
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn cancel_leave_candidates(x: u32, ) -> Weight {
-        (58_831_000 as Weight)
+        (56_213_000 as Weight)
             // Standard Error: 1_000
-            .saturating_add((46_000 as Weight).saturating_mul(x as Weight))
+            .saturating_add((43_000 as Weight).saturating_mul(x as Weight))
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn go_offline() -> Weight {
-        (25_060_000 as Weight)
+        (24_705_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn go_online() -> Weight {
-        (24_821_000 as Weight)
+        (23_493_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
@@ -196,13 +196,13 @@ impl<T: frame_system::Config> pallet_parachain_staking::WeightInfo for Substrate
     // Storage: Balances Locks (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn candidate_bond_more() -> Weight {
-        (43_023_000 as Weight)
+        (42_515_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(5 as Weight))
             .saturating_add(T::DbWeight::get().writes(5 as Weight))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     fn schedule_candidate_bond_less() -> Weight {
-        (22_220_000 as Weight)
+        (22_273_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
@@ -212,13 +212,13 @@ impl<T: frame_system::Config> pallet_parachain_staking::WeightInfo for Substrate
     // Storage: System Account (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn execute_candidate_bond_less() -> Weight {
-        (65_925_000 as Weight)
+        (57_770_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(5 as Weight))
             .saturating_add(T::DbWeight::get().writes(5 as Weight))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     fn cancel_candidate_bond_less() -> Weight {
-        (19_259_000 as Weight)
+        (20_135_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
@@ -230,18 +230,18 @@ impl<T: frame_system::Config> pallet_parachain_staking::WeightInfo for Substrate
     // Storage: Balances Locks (r:1 w:1)
     // Storage: ParachainStaking Total (r:1 w:1)
     fn delegate(x: u32, y: u32, ) -> Weight {
-        (66_829_000 as Weight)
-            // Standard Error: 6_000
-            .saturating_add((495_000 as Weight).saturating_mul(x as Weight))
+        (66_920_000 as Weight)
+            // Standard Error: 7_000
+            .saturating_add((479_000 as Weight).saturating_mul(x as Weight))
             // Standard Error: 1_000
-            .saturating_add((303_000 as Weight).saturating_mul(y as Weight))
+            .saturating_add((284_000 as Weight).saturating_mul(y as Weight))
             .saturating_add(T::DbWeight::get().reads(7 as Weight))
             .saturating_add(T::DbWeight::get().writes(7 as Weight))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     fn schedule_leave_delegators() -> Weight {
-        (27_505_000 as Weight)
+        (28_043_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
@@ -254,9 +254,9 @@ impl<T: frame_system::Config> pallet_parachain_staking::WeightInfo for Substrate
     // Storage: Balances Locks (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn execute_leave_delegators(x: u32, ) -> Weight {
-        (38_391_000 as Weight)
-            // Standard Error: 39_000
-            .saturating_add((23_151_000 as Weight).saturating_mul(x as Weight))
+        (35_520_000 as Weight)
+            // Standard Error: 35_000
+            .saturating_add((23_163_000 as Weight).saturating_mul(x as Weight))
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(x as Weight)))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
@@ -265,14 +265,14 @@ impl<T: frame_system::Config> pallet_parachain_staking::WeightInfo for Substrate
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     fn cancel_leave_delegators() -> Weight {
-        (27_627_000 as Weight)
+        (27_803_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     fn schedule_revoke_delegation() -> Weight {
-        (27_143_000 as Weight)
+        (29_540_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
@@ -285,14 +285,14 @@ impl<T: frame_system::Config> pallet_parachain_staking::WeightInfo for Substrate
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     // Storage: ParachainStaking Total (r:1 w:1)
     fn delegator_bond_more() -> Weight {
-        (58_101_000 as Weight)
+        (63_029_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(8 as Weight))
             .saturating_add(T::DbWeight::get().writes(7 as Weight))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     fn schedule_delegator_bond_less() -> Weight {
-        (27_897_000 as Weight)
+        (28_234_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
@@ -305,7 +305,7 @@ impl<T: frame_system::Config> pallet_parachain_staking::WeightInfo for Substrate
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     // Storage: ParachainStaking Total (r:1 w:1)
     fn execute_revoke_delegation() -> Weight {
-        (90_038_000 as Weight)
+        (83_609_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(8 as Weight))
             .saturating_add(T::DbWeight::get().writes(8 as Weight))
     }
@@ -318,21 +318,21 @@ impl<T: frame_system::Config> pallet_parachain_staking::WeightInfo for Substrate
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     // Storage: ParachainStaking Total (r:1 w:1)
     fn execute_delegator_bond_less() -> Weight {
-        (80_847_000 as Weight)
+        (74_176_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(8 as Weight))
             .saturating_add(T::DbWeight::get().writes(8 as Weight))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     fn cancel_revoke_delegation() -> Weight {
-        (25_703_000 as Weight)
+        (26_369_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     fn cancel_delegator_bond_less() -> Weight {
-        (32_162_000 as Weight)
+        (31_999_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
@@ -343,22 +343,22 @@ impl<T: frame_system::Config> pallet_parachain_staking::WeightInfo for Substrate
     // Storage: ParachainStaking CollatorCommission (r:1 w:0)
     // Storage: ParachainStaking CandidatePool (r:1 w:0)
     // Storage: ParachainStaking TotalSelected (r:1 w:0)
-    // Storage: ParachainStaking CandidateInfo (r:13 w:0)
-    // Storage: ParachainStaking DelegationScheduledRequests (r:13 w:0)
-    // Storage: ParachainStaking TopDelegations (r:13 w:0)
+    // Storage: ParachainStaking CandidateInfo (r:9 w:0)
+    // Storage: ParachainStaking DelegationScheduledRequests (r:9 w:0)
+    // Storage: ParachainStaking TopDelegations (r:9 w:0)
     // Storage: ParachainStaking Total (r:1 w:0)
     // Storage: ParachainStaking AwardedPts (r:2 w:1)
-    // Storage: ParachainStaking AtStake (r:1 w:14)
+    // Storage: ParachainStaking AtStake (r:1 w:10)
     // Storage: System Account (r:101 w:101)
     // Storage: ParachainStaking SelectedCandidates (r:0 w:1)
     // Storage: ParachainStaking DelayedPayouts (r:0 w:1)
     fn round_transition_on_initialize(x: u32, _y: u32, ) -> Weight {
-        (1_581_145_000 as Weight)
-            // Standard Error: 360_000
-            .saturating_add((2_176_000 as Weight).saturating_mul(x as Weight))
-            .saturating_add(T::DbWeight::get().reads(128 as Weight))
+        (1_557_701_000 as Weight)
+            // Standard Error: 365_000
+            .saturating_add((3_091_000 as Weight).saturating_mul(x as Weight))
+            .saturating_add(T::DbWeight::get().reads(119 as Weight))
             .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(x as Weight)))
-            .saturating_add(T::DbWeight::get().writes(116 as Weight))
+            .saturating_add(T::DbWeight::get().writes(113 as Weight))
     }
     // Storage: ParachainStaking DelayedPayouts (r:1 w:0)
     // Storage: ParachainStaking Points (r:1 w:0)
@@ -366,16 +366,16 @@ impl<T: frame_system::Config> pallet_parachain_staking::WeightInfo for Substrate
     // Storage: ParachainStaking AtStake (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn pay_one_collator_reward(y: u32, ) -> Weight {
-        (49_314_000 as Weight)
+        (49_139_000 as Weight)
             // Standard Error: 13_000
-            .saturating_add((13_135_000 as Weight).saturating_mul(y as Weight))
+            .saturating_add((13_224_000 as Weight).saturating_mul(y as Weight))
             .saturating_add(T::DbWeight::get().reads(6 as Weight))
             .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(y as Weight)))
             .saturating_add(T::DbWeight::get().writes(3 as Weight))
             .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(y as Weight)))
     }
     fn base_on_initialize() -> Weight {
-        (2_978_000 as Weight)
+        (3_163_000 as Weight)
     }
 }
 
@@ -383,44 +383,44 @@ impl<T: frame_system::Config> pallet_parachain_staking::WeightInfo for Substrate
 impl WeightInfo for () {
     // Storage: ParachainStaking InflationConfig (r:1 w:1)
     fn set_staking_expectations() -> Weight {
-        (16_255_000 as Weight)
+        (16_517_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: ParachainStaking InflationConfig (r:1 w:1)
     fn set_inflation() -> Weight {
-        (62_711_000 as Weight)
+        (58_667_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: ParachainStaking ParachainBondInfo (r:1 w:1)
     fn set_parachain_bond_account() -> Weight {
-        (16_118_000 as Weight)
+        (16_423_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: ParachainStaking ParachainBondInfo (r:1 w:1)
     fn set_parachain_bond_reserve_percent() -> Weight {
-        (15_006_000 as Weight)
+        (15_582_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: ParachainStaking TotalSelected (r:1 w:1)
     fn set_total_selected() -> Weight {
-        (17_586_000 as Weight)
+        (17_744_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: ParachainStaking CollatorCommission (r:1 w:1)
     fn set_collator_commission() -> Weight {
-        (14_531_000 as Weight)
+        (14_652_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: ParachainStaking TotalSelected (r:1 w:0)
     // Storage: ParachainStaking InflationConfig (r:1 w:1)
     fn set_blocks_per_round() -> Weight {
-        (23_993_000 as Weight)
+        (24_264_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
@@ -434,18 +434,18 @@ impl WeightInfo for () {
     // Storage: ParachainStaking TopDelegations (r:0 w:1)
     // Storage: ParachainStaking BottomDelegations (r:0 w:1)
     fn join_candidates(x: u32, ) -> Weight {
-        (72_341_000 as Weight)
+        (74_756_000 as Weight)
             // Standard Error: 1_000
-            .saturating_add((65_000 as Weight).saturating_mul(x as Weight))
+            .saturating_add((56_000 as Weight).saturating_mul(x as Weight))
             .saturating_add(RocksDbWeight::get().reads(7 as Weight))
             .saturating_add(RocksDbWeight::get().writes(7 as Weight))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn schedule_leave_candidates(x: u32, ) -> Weight {
-        (60_702_000 as Weight)
+        (57_249_000 as Weight)
             // Standard Error: 1_000
-            .saturating_add((39_000 as Weight).saturating_mul(x as Weight))
+            .saturating_add((42_000 as Weight).saturating_mul(x as Weight))
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
@@ -459,8 +459,8 @@ impl WeightInfo for () {
     // Storage: ParachainStaking Total (r:1 w:1)
     fn execute_leave_candidates(x: u32, ) -> Weight {
         (0 as Weight)
-            // Standard Error: 52_000
-            .saturating_add((26_034_000 as Weight).saturating_mul(x as Weight))
+            // Standard Error: 57_000
+            .saturating_add((25_589_000 as Weight).saturating_mul(x as Weight))
             .saturating_add(RocksDbWeight::get().reads(4 as Weight))
             .saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(x as Weight)))
             .saturating_add(RocksDbWeight::get().writes(4 as Weight))
@@ -469,23 +469,23 @@ impl WeightInfo for () {
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn cancel_leave_candidates(x: u32, ) -> Weight {
-        (58_831_000 as Weight)
+        (56_213_000 as Weight)
             // Standard Error: 1_000
-            .saturating_add((46_000 as Weight).saturating_mul(x as Weight))
+            .saturating_add((43_000 as Weight).saturating_mul(x as Weight))
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn go_offline() -> Weight {
-        (25_060_000 as Weight)
+        (24_705_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn go_online() -> Weight {
-        (24_821_000 as Weight)
+        (23_493_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
@@ -495,13 +495,13 @@ impl WeightInfo for () {
     // Storage: Balances Locks (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn candidate_bond_more() -> Weight {
-        (43_023_000 as Weight)
+        (42_515_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(5 as Weight))
             .saturating_add(RocksDbWeight::get().writes(5 as Weight))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     fn schedule_candidate_bond_less() -> Weight {
-        (22_220_000 as Weight)
+        (22_273_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
@@ -511,13 +511,13 @@ impl WeightInfo for () {
     // Storage: System Account (r:1 w:1)
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     fn execute_candidate_bond_less() -> Weight {
-        (65_925_000 as Weight)
+        (57_770_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(5 as Weight))
             .saturating_add(RocksDbWeight::get().writes(5 as Weight))
     }
     // Storage: ParachainStaking CandidateInfo (r:1 w:1)
     fn cancel_candidate_bond_less() -> Weight {
-        (19_259_000 as Weight)
+        (20_135_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
@@ -529,18 +529,18 @@ impl WeightInfo for () {
     // Storage: Balances Locks (r:1 w:1)
     // Storage: ParachainStaking Total (r:1 w:1)
     fn delegate(x: u32, y: u32, ) -> Weight {
-        (66_829_000 as Weight)
-            // Standard Error: 6_000
-            .saturating_add((495_000 as Weight).saturating_mul(x as Weight))
+        (66_920_000 as Weight)
+            // Standard Error: 7_000
+            .saturating_add((479_000 as Weight).saturating_mul(x as Weight))
             // Standard Error: 1_000
-            .saturating_add((303_000 as Weight).saturating_mul(y as Weight))
+            .saturating_add((284_000 as Weight).saturating_mul(y as Weight))
             .saturating_add(RocksDbWeight::get().reads(7 as Weight))
             .saturating_add(RocksDbWeight::get().writes(7 as Weight))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     fn schedule_leave_delegators() -> Weight {
-        (27_505_000 as Weight)
+        (28_043_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
@@ -553,9 +553,9 @@ impl WeightInfo for () {
     // Storage: Balances Locks (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn execute_leave_delegators(x: u32, ) -> Weight {
-        (38_391_000 as Weight)
-            // Standard Error: 39_000
-            .saturating_add((23_151_000 as Weight).saturating_mul(x as Weight))
+        (35_520_000 as Weight)
+            // Standard Error: 35_000
+            .saturating_add((23_163_000 as Weight).saturating_mul(x as Weight))
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(x as Weight)))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
@@ -564,14 +564,14 @@ impl WeightInfo for () {
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     fn cancel_leave_delegators() -> Weight {
-        (27_627_000 as Weight)
+        (27_803_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     fn schedule_revoke_delegation() -> Weight {
-        (27_143_000 as Weight)
+        (29_540_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
@@ -584,14 +584,14 @@ impl WeightInfo for () {
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     // Storage: ParachainStaking Total (r:1 w:1)
     fn delegator_bond_more() -> Weight {
-        (58_101_000 as Weight)
+        (63_029_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(8 as Weight))
             .saturating_add(RocksDbWeight::get().writes(7 as Weight))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     fn schedule_delegator_bond_less() -> Weight {
-        (27_897_000 as Weight)
+        (28_234_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
@@ -604,7 +604,7 @@ impl WeightInfo for () {
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     // Storage: ParachainStaking Total (r:1 w:1)
     fn execute_revoke_delegation() -> Weight {
-        (90_038_000 as Weight)
+        (83_609_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(8 as Weight))
             .saturating_add(RocksDbWeight::get().writes(8 as Weight))
     }
@@ -617,21 +617,21 @@ impl WeightInfo for () {
     // Storage: ParachainStaking CandidatePool (r:1 w:1)
     // Storage: ParachainStaking Total (r:1 w:1)
     fn execute_delegator_bond_less() -> Weight {
-        (80_847_000 as Weight)
+        (74_176_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(8 as Weight))
             .saturating_add(RocksDbWeight::get().writes(8 as Weight))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     fn cancel_revoke_delegation() -> Weight {
-        (25_703_000 as Weight)
+        (26_369_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
     // Storage: ParachainStaking DelegatorState (r:1 w:1)
     // Storage: ParachainStaking DelegationScheduledRequests (r:1 w:1)
     fn cancel_delegator_bond_less() -> Weight {
-        (32_162_000 as Weight)
+        (31_999_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
@@ -642,22 +642,22 @@ impl WeightInfo for () {
     // Storage: ParachainStaking CollatorCommission (r:1 w:0)
     // Storage: ParachainStaking CandidatePool (r:1 w:0)
     // Storage: ParachainStaking TotalSelected (r:1 w:0)
-    // Storage: ParachainStaking CandidateInfo (r:13 w:0)
-    // Storage: ParachainStaking DelegationScheduledRequests (r:13 w:0)
-    // Storage: ParachainStaking TopDelegations (r:13 w:0)
+    // Storage: ParachainStaking CandidateInfo (r:9 w:0)
+    // Storage: ParachainStaking DelegationScheduledRequests (r:9 w:0)
+    // Storage: ParachainStaking TopDelegations (r:9 w:0)
     // Storage: ParachainStaking Total (r:1 w:0)
     // Storage: ParachainStaking AwardedPts (r:2 w:1)
-    // Storage: ParachainStaking AtStake (r:1 w:14)
+    // Storage: ParachainStaking AtStake (r:1 w:10)
     // Storage: System Account (r:101 w:101)
     // Storage: ParachainStaking SelectedCandidates (r:0 w:1)
     // Storage: ParachainStaking DelayedPayouts (r:0 w:1)
     fn round_transition_on_initialize(x: u32, _y: u32, ) -> Weight {
-        (1_581_145_000 as Weight)
-            // Standard Error: 360_000
-            .saturating_add((2_176_000 as Weight).saturating_mul(x as Weight))
-            .saturating_add(RocksDbWeight::get().reads(128 as Weight))
+        (1_557_701_000 as Weight)
+            // Standard Error: 365_000
+            .saturating_add((3_091_000 as Weight).saturating_mul(x as Weight))
+            .saturating_add(RocksDbWeight::get().reads(119 as Weight))
             .saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(x as Weight)))
-            .saturating_add(RocksDbWeight::get().writes(116 as Weight))
+            .saturating_add(RocksDbWeight::get().writes(113 as Weight))
     }
     // Storage: ParachainStaking DelayedPayouts (r:1 w:0)
     // Storage: ParachainStaking Points (r:1 w:0)
@@ -665,15 +665,15 @@ impl WeightInfo for () {
     // Storage: ParachainStaking AtStake (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn pay_one_collator_reward(y: u32, ) -> Weight {
-        (49_314_000 as Weight)
+        (49_139_000 as Weight)
             // Standard Error: 13_000
-            .saturating_add((13_135_000 as Weight).saturating_mul(y as Weight))
+            .saturating_add((13_224_000 as Weight).saturating_mul(y as Weight))
             .saturating_add(RocksDbWeight::get().reads(6 as Weight))
             .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(y as Weight)))
             .saturating_add(RocksDbWeight::get().writes(3 as Weight))
             .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(y as Weight)))
     }
     fn base_on_initialize() -> Weight {
-        (2_978_000 as Weight)
+        (3_163_000 as Weight)
     }
 }
diff --git a/runtime/manta/src/weights/pallet_preimage.rs b/runtime/manta/src/weights/pallet_preimage.rs
index 1d4ad3d29..e504590df 100644
--- a/runtime/manta/src/weights/pallet_preimage.rs
+++ b/runtime/manta/src/weights/pallet_preimage.rs
@@ -17,14 +17,14 @@
 //! Autogenerated weights for pallet_preimage
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-02-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta"), DB CACHE: 1024
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta-dev"), DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/manta
 // benchmark
 // pallet
-// --chain=manta
+// --chain=manta-dev
 // --steps=50
 // --repeat=20
 // --pallet=pallet_preimage
@@ -93,58 +93,58 @@ impl<T: frame_system::Config> pallet_preimage::WeightInfo for SubstrateWeight<T>
     // Storage: Preimage StatusFor (r:1 w:1)
     // Storage: Preimage PreimageFor (r:0 w:1)
     fn unnote_preimage() -> Weight {
-        (36_208_000 as Weight)
+        (36_033_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     // Storage: Preimage PreimageFor (r:0 w:1)
     fn unnote_no_deposit_preimage() -> Weight {
-        (22_670_000 as Weight)
+        (22_081_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     fn request_preimage() -> Weight {
-        (35_218_000 as Weight)
+        (34_420_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     fn request_no_deposit_preimage() -> Weight {
-        (21_461_000 as Weight)
+        (21_099_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     fn request_unnoted_preimage() -> Weight {
-        (17_370_000 as Weight)
+        (17_739_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     fn request_requested_preimage() -> Weight {
-        (7_247_000 as Weight)
+        (7_195_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     // Storage: Preimage PreimageFor (r:0 w:1)
     fn unrequest_preimage() -> Weight {
-        (21_803_000 as Weight)
+        (21_483_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     // Storage: Preimage PreimageFor (r:0 w:1)
     fn unrequest_unnoted_preimage() -> Weight {
-        (17_345_000 as Weight)
+        (17_430_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     fn unrequest_multi_referenced_preimage() -> Weight {
-        (7_187_000 as Weight)
+        (7_282_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
@@ -182,58 +182,58 @@ impl WeightInfo for () {
     // Storage: Preimage StatusFor (r:1 w:1)
     // Storage: Preimage PreimageFor (r:0 w:1)
     fn unnote_preimage() -> Weight {
-        (36_208_000 as Weight)
+        (36_033_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     // Storage: Preimage PreimageFor (r:0 w:1)
     fn unnote_no_deposit_preimage() -> Weight {
-        (22_670_000 as Weight)
+        (22_081_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     fn request_preimage() -> Weight {
-        (35_218_000 as Weight)
+        (34_420_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     fn request_no_deposit_preimage() -> Weight {
-        (21_461_000 as Weight)
+        (21_099_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     fn request_unnoted_preimage() -> Weight {
-        (17_370_000 as Weight)
+        (17_739_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     fn request_requested_preimage() -> Weight {
-        (7_247_000 as Weight)
+        (7_195_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     // Storage: Preimage PreimageFor (r:0 w:1)
     fn unrequest_preimage() -> Weight {
-        (21_803_000 as Weight)
+        (21_483_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     // Storage: Preimage PreimageFor (r:0 w:1)
     fn unrequest_unnoted_preimage() -> Weight {
-        (17_345_000 as Weight)
+        (17_430_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
     // Storage: Preimage StatusFor (r:1 w:1)
     fn unrequest_multi_referenced_preimage() -> Weight {
-        (7_187_000 as Weight)
+        (7_282_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
diff --git a/runtime/manta/src/weights/pallet_session.rs b/runtime/manta/src/weights/pallet_session.rs
index 1566f6404..39991faab 100644
--- a/runtime/manta/src/weights/pallet_session.rs
+++ b/runtime/manta/src/weights/pallet_session.rs
@@ -17,14 +17,14 @@
 //! Autogenerated weights for pallet_session
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-02-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta"), DB CACHE: 1024
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta-dev"), DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/manta
 // benchmark
 // pallet
-// --chain=manta
+// --chain=manta-dev
 // --steps=50
 // --repeat=20
 // --pallet=pallet_session
@@ -56,14 +56,14 @@ impl<T: frame_system::Config> pallet_session::WeightInfo for SubstrateWeight<T>
     // Storage: Session NextKeys (r:1 w:1)
     // Storage: Session KeyOwner (r:2 w:2)
     fn set_keys() -> Weight {
-        (22_623_000 as Weight)
+        (22_900_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(3 as Weight))
             .saturating_add(T::DbWeight::get().writes(3 as Weight))
     }
     // Storage: Session NextKeys (r:1 w:1)
     // Storage: Session KeyOwner (r:0 w:2)
     fn purge_keys() -> Weight {
-        (16_512_000 as Weight)
+        (14_785_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(3 as Weight))
     }
@@ -74,14 +74,14 @@ impl WeightInfo for () {
     // Storage: Session NextKeys (r:1 w:1)
     // Storage: Session KeyOwner (r:2 w:2)
     fn set_keys() -> Weight {
-        (22_623_000 as Weight)
+        (22_900_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(3 as Weight))
             .saturating_add(RocksDbWeight::get().writes(3 as Weight))
     }
     // Storage: Session NextKeys (r:1 w:1)
     // Storage: Session KeyOwner (r:0 w:2)
     fn purge_keys() -> Weight {
-        (16_512_000 as Weight)
+        (14_785_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(3 as Weight))
     }
diff --git a/runtime/manta/src/weights/pallet_timestamp.rs b/runtime/manta/src/weights/pallet_timestamp.rs
index 6e891d825..13a799311 100644
--- a/runtime/manta/src/weights/pallet_timestamp.rs
+++ b/runtime/manta/src/weights/pallet_timestamp.rs
@@ -17,14 +17,14 @@
 //! Autogenerated weights for pallet_timestamp
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-02-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta"), DB CACHE: 1024
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta-dev"), DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/manta
 // benchmark
 // pallet
-// --chain=manta
+// --chain=manta-dev
 // --steps=50
 // --repeat=20
 // --pallet=pallet_timestamp
@@ -55,12 +55,12 @@ pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_timestamp::WeightInfo for SubstrateWeight<T> {
     // Storage: Timestamp Now (r:1 w:1)
     fn set() -> Weight {
-        (7_319_000 as Weight)
+        (7_381_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     fn on_finalize() -> Weight {
-        (2_718_000 as Weight)
+        (2_752_000 as Weight)
     }
 }
 
@@ -68,11 +68,11 @@ impl<T: frame_system::Config> pallet_timestamp::WeightInfo for SubstrateWeight<T
 impl WeightInfo for () {
     // Storage: Timestamp Now (r:1 w:1)
     fn set() -> Weight {
-        (7_319_000 as Weight)
+        (7_381_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     fn on_finalize() -> Weight {
-        (2_718_000 as Weight)
+        (2_752_000 as Weight)
     }
 }
diff --git a/runtime/manta/src/weights/pallet_treasury.rs b/runtime/manta/src/weights/pallet_treasury.rs
index bfab063fb..2ac49ea35 100644
--- a/runtime/manta/src/weights/pallet_treasury.rs
+++ b/runtime/manta/src/weights/pallet_treasury.rs
@@ -17,7 +17,7 @@
 //! Autogenerated weights for pallet_treasury
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta-dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -58,34 +58,34 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_treasury::WeightInfo for SubstrateWeight<T> {
     fn spend() -> Weight {
-        (172_000 as Weight)
+        (492_000 as Weight)
     }
     // Storage: Treasury ProposalCount (r:1 w:1)
     // Storage: Treasury Proposals (r:0 w:1)
     fn propose_spend() -> Weight {
-        (29_382_000 as Weight)
+        (36_564_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:1 w:1)
     fn reject_proposal() -> Weight {
-        (52_004_000 as Weight)
+        (48_458_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(2 as Weight))
     }
     // Storage: Treasury Proposals (r:1 w:0)
     // Storage: Treasury Approvals (r:1 w:1)
     fn approve_proposal(p: u32, ) -> Weight {
-        (12_043_000 as Weight)
+        (12_837_000 as Weight)
             // Standard Error: 0
-            .saturating_add((120_000 as Weight).saturating_mul(p as Weight))
+            .saturating_add((117_000 as Weight).saturating_mul(p as Weight))
             .saturating_add(T::DbWeight::get().reads(2 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
     // Storage: Treasury Approvals (r:1 w:1)
     fn remove_approval() -> Weight {
-        (7_407_000 as Weight)
+        (8_059_000 as Weight)
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
     }
@@ -93,9 +93,9 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for SubstrateWeight<T>
     // Storage: Treasury Proposals (r:2 w:2)
     // Storage: System Account (r:4 w:4)
     fn on_initialize_proposals(p: u32, ) -> Weight {
-        (27_574_000 as Weight)
-            // Standard Error: 33_000
-            .saturating_add((32_633_000 as Weight).saturating_mul(p as Weight))
+        (31_344_000 as Weight)
+            // Standard Error: 23_000
+            .saturating_add((33_028_000 as Weight).saturating_mul(p as Weight))
             .saturating_add(T::DbWeight::get().reads(1 as Weight))
             .saturating_add(T::DbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
             .saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -106,34 +106,34 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for SubstrateWeight<T>
 // For backwards compatibility and tests
 impl WeightInfo for () {
     fn spend() -> Weight {
-        (172_000 as Weight)
+        (492_000 as Weight)
     }
     // Storage: Treasury ProposalCount (r:1 w:1)
     // Storage: Treasury Proposals (r:0 w:1)
     fn propose_spend() -> Weight {
-        (29_382_000 as Weight)
+        (36_564_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
     // Storage: Treasury Proposals (r:1 w:1)
     // Storage: System Account (r:1 w:1)
     fn reject_proposal() -> Weight {
-        (52_004_000 as Weight)
+        (48_458_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(2 as Weight))
     }
     // Storage: Treasury Proposals (r:1 w:0)
     // Storage: Treasury Approvals (r:1 w:1)
     fn approve_proposal(p: u32, ) -> Weight {
-        (12_043_000 as Weight)
+        (12_837_000 as Weight)
             // Standard Error: 0
-            .saturating_add((120_000 as Weight).saturating_mul(p as Weight))
+            .saturating_add((117_000 as Weight).saturating_mul(p as Weight))
             .saturating_add(RocksDbWeight::get().reads(2 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
     // Storage: Treasury Approvals (r:1 w:1)
     fn remove_approval() -> Weight {
-        (7_407_000 as Weight)
+        (8_059_000 as Weight)
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
     }
@@ -141,9 +141,9 @@ impl WeightInfo for () {
     // Storage: Treasury Proposals (r:2 w:2)
     // Storage: System Account (r:4 w:4)
     fn on_initialize_proposals(p: u32, ) -> Weight {
-        (27_574_000 as Weight)
-            // Standard Error: 33_000
-            .saturating_add((32_633_000 as Weight).saturating_mul(p as Weight))
+        (31_344_000 as Weight)
+            // Standard Error: 23_000
+            .saturating_add((33_028_000 as Weight).saturating_mul(p as Weight))
             .saturating_add(RocksDbWeight::get().reads(1 as Weight))
             .saturating_add(RocksDbWeight::get().reads((3 as Weight).saturating_mul(p as Weight)))
             .saturating_add(RocksDbWeight::get().writes(1 as Weight))
diff --git a/runtime/manta/src/weights/pallet_utility.rs b/runtime/manta/src/weights/pallet_utility.rs
index 87f3e7955..6fa31e0ec 100644
--- a/runtime/manta/src/weights/pallet_utility.rs
+++ b/runtime/manta/src/weights/pallet_utility.rs
@@ -17,14 +17,14 @@
 //! Autogenerated weights for pallet_utility
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-02-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta"), DB CACHE: 1024
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta-dev"), DB CACHE: 1024
 
 // Executed Command:
 // ./target/production/manta
 // benchmark
 // pallet
-// --chain=manta
+// --chain=manta-dev
 // --steps=50
 // --repeat=20
 // --pallet=pallet_utility
@@ -57,49 +57,49 @@ pub trait WeightInfo {
 pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_utility::WeightInfo for SubstrateWeight<T> {
     fn batch(c: u32, ) -> Weight {
-        (30_044_000 as Weight)
-            // Standard Error: 4_000
-            .saturating_add((4_459_000 as Weight).saturating_mul(c as Weight))
+        (25_168_000 as Weight)
+            // Standard Error: 5_000
+            .saturating_add((4_812_000 as Weight).saturating_mul(c as Weight))
     }
     fn as_derivative() -> Weight {
-        (6_170_000 as Weight)
+        (6_038_000 as Weight)
     }
     fn batch_all(c: u32, ) -> Weight {
-        (28_217_000 as Weight)
-            // Standard Error: 4_000
-            .saturating_add((4_656_000 as Weight).saturating_mul(c as Weight))
+        (22_514_000 as Weight)
+            // Standard Error: 5_000
+            .saturating_add((4_974_000 as Weight).saturating_mul(c as Weight))
     }
     fn dispatch_as() -> Weight {
-        (14_153_000 as Weight)
+        (13_644_000 as Weight)
     }
     fn force_batch(c: u32, ) -> Weight {
-        (25_111_000 as Weight)
-            // Standard Error: 5_000
-            .saturating_add((4_475_000 as Weight).saturating_mul(c as Weight))
+        (27_816_000 as Weight)
+            // Standard Error: 4_000
+            .saturating_add((4_795_000 as Weight).saturating_mul(c as Weight))
     }
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
     fn batch(c: u32, ) -> Weight {
-        (30_044_000 as Weight)
-            // Standard Error: 4_000
-            .saturating_add((4_459_000 as Weight).saturating_mul(c as Weight))
+        (25_168_000 as Weight)
+            // Standard Error: 5_000
+            .saturating_add((4_812_000 as Weight).saturating_mul(c as Weight))
     }
     fn as_derivative() -> Weight {
-        (6_170_000 as Weight)
+        (6_038_000 as Weight)
     }
     fn batch_all(c: u32, ) -> Weight {
-        (28_217_000 as Weight)
-            // Standard Error: 4_000
-            .saturating_add((4_656_000 as Weight).saturating_mul(c as Weight))
+        (22_514_000 as Weight)
+            // Standard Error: 5_000
+            .saturating_add((4_974_000 as Weight).saturating_mul(c as Weight))
     }
     fn dispatch_as() -> Weight {
-        (14_153_000 as Weight)
+        (13_644_000 as Weight)
     }
     fn force_batch(c: u32, ) -> Weight {
-        (25_111_000 as Weight)
-            // Standard Error: 5_000
-            .saturating_add((4_475_000 as Weight).saturating_mul(c as Weight))
+        (27_816_000 as Weight)
+            // Standard Error: 4_000
+            .saturating_add((4_795_000 as Weight).saturating_mul(c as Weight))
     }
 }
diff --git a/runtime/manta/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs b/runtime/manta/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
index 2ffbcfd82..e2c0e1651 100644
--- a/runtime/manta/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
+++ b/runtime/manta/src/weights/xcm/pallet_xcm_benchmarks_fungible.rs
@@ -17,8 +17,8 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::fungible`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-27-55`, CPU: `Intel(R) Xeon(R) Platinum 8275CL CPU @ 3.00GHz`
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-90-1`, CPU: `Intel(R) Xeon(R) Platinum 8275CL CPU @ 3.00GHz`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta-dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -50,7 +50,7 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Storage: AssetManager LocationAssetId (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
 	pub(crate) fn withdraw_asset() -> Weight {
-		(38_240_000 as Weight)
+		(35_826_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -58,7 +58,7 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Storage: AssetManager LocationAssetId (r:1 w:0)
 	// Storage: System Account (r:2 w:2)
 	pub(crate) fn transfer_asset() -> Weight {
-		(54_282_000 as Weight)
+		(52_337_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(4 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
@@ -71,18 +71,18 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Storage: ParachainSystem HostConfiguration (r:1 w:0)
 	// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
 	pub(crate) fn transfer_reserve_asset() -> Weight {
-		(66_675_000 as Weight)
+		(64_572_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(9 as Weight))
 			.saturating_add(T::DbWeight::get().writes(4 as Weight))
 	}
 	pub(crate) fn reserve_asset_deposited() -> Weight {
-		(1_487_000 as Weight)
+		(1_504_000 as Weight)
 	}
 	// Storage: ParachainInfo ParachainId (r:1 w:0)
 	// Storage: AssetManager LocationAssetId (r:1 w:0)
 	// Storage: System Account (r:1 w:1)
 	pub(crate) fn deposit_asset() -> Weight {
-		(37_342_000 as Weight)
+		(36_310_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(3 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
@@ -95,7 +95,7 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Storage: ParachainSystem HostConfiguration (r:1 w:0)
 	// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
 	pub(crate) fn deposit_reserve_asset() -> Weight {
-		(56_275_000 as Weight)
+		(54_664_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(8 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
@@ -106,7 +106,7 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Storage: ParachainSystem HostConfiguration (r:1 w:0)
 	// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
 	pub(crate) fn initiate_teleport() -> Weight {
-		(25_474_000 as Weight)
+		(24_147_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
diff --git a/runtime/manta/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/runtime/manta/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
index 38ec567a5..ea8554a83 100644
--- a/runtime/manta/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+++ b/runtime/manta/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
@@ -17,8 +17,8 @@
 //! Autogenerated weights for `pallet_xcm_benchmarks::generic`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-03-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! HOSTNAME: `ip-172-31-27-55`, CPU: `Intel(R) Xeon(R) Platinum 8275CL CPU @ 3.00GHz`
+//! DATE: 2023-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! HOSTNAME: `ip-172-31-90-1`, CPU: `Intel(R) Xeon(R) Platinum 8275CL CPU @ 3.00GHz`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("manta-dev"), DB CACHE: 1024
 
 // Executed Command:
@@ -53,38 +53,38 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Storage: ParachainSystem HostConfiguration (r:1 w:0)
 	// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
 	pub(crate) fn query_holding() -> Weight {
-		(887_585_000 as Weight)
+		(841_029_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	pub(crate) fn buy_execution() -> Weight {
-		(4_008_000 as Weight)
+		(4_358_000 as Weight)
 	}
 	// Storage: PolkadotXcm Queries (r:1 w:0)
 	pub(crate) fn query_response() -> Weight {
-		(11_645_000 as Weight)
+		(11_584_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 	}
 	pub(crate) fn transact() -> Weight {
-		(14_950_000 as Weight)
+		(14_713_000 as Weight)
 	}
 	pub(crate) fn refund_surplus() -> Weight {
-		(3_918_000 as Weight)
+		(4_245_000 as Weight)
 	}
 	pub(crate) fn set_error_handler() -> Weight {
-		(860_000 as Weight)
+		(764_000 as Weight)
 	}
 	pub(crate) fn set_appendix() -> Weight {
-		(881_000 as Weight)
+		(761_000 as Weight)
 	}
 	pub(crate) fn clear_error() -> Weight {
-		(854_000 as Weight)
+		(726_000 as Weight)
 	}
 	pub(crate) fn descend_origin() -> Weight {
-		(2_110_000 as Weight)
+		(1_981_000 as Weight)
 	}
 	pub(crate) fn clear_origin() -> Weight {
-		(863_000 as Weight)
+		(757_000 as Weight)
 	}
 	// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
 	// Storage: PolkadotXcm VersionDiscoveryQueue (r:1 w:1)
@@ -92,18 +92,18 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Storage: ParachainSystem HostConfiguration (r:1 w:0)
 	// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
 	pub(crate) fn report_error() -> Weight {
-		(13_318_000 as Weight)
+		(13_402_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(5 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}
 	// Storage: PolkadotXcm AssetTraps (r:1 w:1)
 	pub(crate) fn claim_asset() -> Weight {
-		(6_504_000 as Weight)
+		(6_486_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	pub(crate) fn trap() -> Weight {
-		(854_000 as Weight)
+		(738_000 as Weight)
 	}
 	// Storage: PolkadotXcm VersionNotifyTargets (r:1 w:1)
 	// Storage: PolkadotXcm SupportedVersion (r:1 w:0)
@@ -112,13 +112,13 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Storage: ParachainSystem HostConfiguration (r:1 w:0)
 	// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
 	pub(crate) fn subscribe_version() -> Weight {
-		(17_368_000 as Weight)
+		(17_594_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(3 as Weight))
 	}
 	// Storage: PolkadotXcm VersionNotifyTargets (r:0 w:1)
 	pub(crate) fn unsubscribe_version() -> Weight {
-		(3_121_000 as Weight)
+		(3_054_000 as Weight)
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
 	// Storage: ParachainInfo ParachainId (r:1 w:0)
@@ -128,7 +128,7 @@ impl<T: frame_system::Config> WeightInfo<T> {
 	// Storage: ParachainSystem HostConfiguration (r:1 w:0)
 	// Storage: ParachainSystem PendingUpwardMessages (r:1 w:1)
 	pub(crate) fn initiate_reserve_withdraw() -> Weight {
-		(1_118_822_000 as Weight)
+		(1_103_932_000 as Weight)
 			.saturating_add(T::DbWeight::get().reads(6 as Weight))
 			.saturating_add(T::DbWeight::get().writes(2 as Weight))
 	}