diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8be2aa0d12b..70594cfe32c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -36,7 +36,6 @@
 
 # core-consensus team
 /consensus/ @iotaledger/core-consensus
-/narwhal/ @iotaledger/core-consensus
 
 # dev-tools team
 /crates/iota/ @iotaledger/dev-tools
@@ -69,11 +68,11 @@ vercel.json @iotaledger/boxfish @iotaledger/tooling
 /docs/**/vercel.json @iotaledger/devx
 
 # CI Taskforce
-/.github/actions/ @msarcev @alexsporn @thibault-martinez @DaughterOfMars @fijter @Dr-Electron
-/.github/workflows/ @msarcev @alexsporn @thibault-martinez @DaughterOfMars @fijter @Dr-Electron
+/.github/actions/ @msarcev @alexsporn @thibault-martinez @DaughterOfMars @Dr-Electron
+/.github/workflows/ @msarcev @alexsporn @thibault-martinez @DaughterOfMars @Dr-Electron
 
 # Protect this CODEOWNERS file, with some fallback in case of unavailability
-/.github/CODEOWNERS @luca-moser @lzpap @miker83z @fijter
+/.github/CODEOWNERS @luca-moser @lzpap @miker83z @alexsporn
 
 # Scripts
 /scripts/dependency_graphs/ @muXxer
diff --git a/.github/actions/diffs/action.yml b/.github/actions/diffs/action.yml
index 13e34f24df5..7b092777866 100644
--- a/.github/actions/diffs/action.yml
+++ b/.github/actions/diffs/action.yml
@@ -27,7 +27,6 @@ runs:
             - "consensus/**"
             - "crates/**"
             - "external-crates/**"
-            - "narwhal/**"
             - "iota-execution/**"
             - "docs/examples/rust/**"
             - ".github/workflows/hierarchy.yml"
@@ -64,6 +63,5 @@ runs:
             - "docker/**"
             - "external-crates/**"
             - "kiosk/**"
-            - "narwhal/**"
             - "nre/**"
             - "iota-execution/**"
diff --git a/.github/crates-filters.yml b/.github/crates-filters.yml
index e85857f33ea..55ca74cc759 100644
--- a/.github/crates-filters.yml
+++ b/.github/crates-filters.yml
@@ -170,16 +170,6 @@ typed-store-derive:
   - "crates/typed-store-derive/**"
 typed-store-error:
   - "crates/typed-store-error/**"
-narwhal-config:
-  - "narwhal/config/**"
-narwhal-crypto:
-  - "narwhal/crypto/**"
-narwhal-network:
-  - "narwhal/network/**"
-narwhal-test-utils:
-  - "narwhal/test-utils/**"
-narwhal-types:
-  - "narwhal/types/**"
 iota-execution:
   - "iota-execution/**"
 iota-execution-cut:
diff --git a/.github/workflows/_cargo_deny.yml b/.github/workflows/_cargo_deny.yml
index f8249b38ed0..ccaf425bd58 100644
--- a/.github/workflows/_cargo_deny.yml
+++ b/.github/workflows/_cargo_deny.yml
@@ -2,6 +2,11 @@ name: Cargo deny
 
 on:
   workflow_call:
+    inputs:
+      manifest-path:
+        type: string
+        required: false
+        default: "./Cargo.toml"
     secrets:
       SSH_PRIVATE_KEY_IOTA_CI:
         required: true
@@ -13,24 +18,13 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  rust-crates:
-    name: cargo-deny (advisories, licenses, bans, ...)
-    runs-on: [self-hosted]
-    steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # pin@v4
-      - uses: EmbarkStudios/cargo-deny-action@8371184bd11e21dcf8ac82ebf8c9c9f74ebf7268 # pin@v2
-        with:
-          ssh-key: ${{ secrets.SSH_PRIVATE_KEY_IOTA_CI }}
-          ssh-known-hosts: ${{ secrets.SSH_GITHUB_KNOWN_HOSTS }}
-          use-git-cli: true
-
-  external-crates:
-    name: cargo-deny (advisories, licenses, bans, ...)
+  cargo-deny:
     runs-on: [self-hosted]
     steps:
       - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # pin@v4
       - uses: EmbarkStudios/cargo-deny-action@8371184bd11e21dcf8ac82ebf8c9c9f74ebf7268 # pin@v2
         with:
+          manifest-path: ${{ inputs.manifest-path }}
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY_IOTA_CI }}
           ssh-known-hosts: ${{ secrets.SSH_GITHUB_KNOWN_HOSTS }}
           use-git-cli: true
diff --git a/.github/workflows/_e2e.yml b/.github/workflows/_e2e.yml
index 8956e3e8293..6438470f121 100644
--- a/.github/workflows/_e2e.yml
+++ b/.github/workflows/_e2e.yml
@@ -88,6 +88,14 @@ jobs:
           path: apps/explorer/playwright-report/
           retention-days: 30
 
+      - name: Build Kiosk
+        if: inputs.isRust || inputs.isTypescriptSDK
+        run: pnpm turbo --filter=@iota/kiosk build
+
+      - name: Run Kiosk e2e tests
+        if: inputs.isRust || inputs.isTypescriptSDK
+        run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm --filter=@iota/kiosk test:e2e'
+
       - name: Run Local net
         run: cargo run --bin iota start --force-regenesis --with-faucet --epoch-duration-ms 10000 &
 
diff --git a/.github/workflows/_rust.yml b/.github/workflows/_rust.yml
index 877337351f6..2ae14b1f89b 100644
--- a/.github/workflows/_rust.yml
+++ b/.github/workflows/_rust.yml
@@ -62,6 +62,5 @@ jobs:
     if: |
       !cancelled() && !failure() && inputs.isRust && github.event.pull_request.draft == false
     needs:
-      - rust-tests
-      - external-tests
+      - rust-lints
     uses: ./.github/workflows/_execution_cut.yml
diff --git a/.github/workflows/_rust_lints.yml b/.github/workflows/_rust_lints.yml
index fb7e75eb51b..f63dfb5cab0 100644
--- a/.github/workflows/_rust_lints.yml
+++ b/.github/workflows/_rust_lints.yml
@@ -51,10 +51,6 @@ jobs:
       - rustfmt
     runs-on: [self-hosted]
     steps:
-      - uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # pin@v3
-        # this avoids rate-limiting
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # pin@v4
       # TODO(bradh): debug and re-enable this; the caching is breaking the clippy build
       # Enable caching of the 'librocksdb-sys' crate by additionally caching the
diff --git a/.github/workflows/_vercel_deploy.yml b/.github/workflows/_vercel_deploy.yml
index 47f9d854598..b1efe39a2ea 100644
--- a/.github/workflows/_vercel_deploy.yml
+++ b/.github/workflows/_vercel_deploy.yml
@@ -36,7 +36,7 @@ jobs:
   explorer-preview:
     name: Vercel Explorer Preview
     if: inputs.shouldDeployPreview && inputs.isExplorer
-    uses: ./.github/workflows/apps-explorer.deploy.yml
+    uses: ./.github/workflows/apps_explorer_deploy.yml
     secrets: inherit
     with:
       isProd: false
@@ -44,7 +44,7 @@ jobs:
   explorer-prod:
     name: Vercel Explorer Production
     if: inputs.isDevelop
-    uses: ./.github/workflows/apps-explorer.deploy.yml
+    uses: ./.github/workflows/apps_explorer_deploy.yml
     secrets: inherit
     with:
       isProd: true
@@ -52,15 +52,15 @@ jobs:
   ui-kit-preview:
     name: Vercel UI Kit Preview
     if: inputs.shouldDeployPreview && inputs.isAppsUiKit
-    uses: ./.github/workflows/apps-ui-kit.deploy.yml
+    uses: ./.github/workflows/apps_ui_kit_deploy.yml
     secrets: inherit
     with:
       isProd: false
 
   ui-kit-prod:
-    name: Vercel UI Kit Preview
+    name: Vercel UI Kit Production
     if: inputs.isDevelop
-    uses: ./.github/workflows/apps-ui-kit.deploy.yml
+    uses: ./.github/workflows/apps_ui_kit_deploy.yml
     secrets: inherit
     with:
       isProd: true
@@ -68,7 +68,7 @@ jobs:
   wallet-dashboard-preview:
     name: Vercel Wallet Dashboard Preview
     if: inputs.shouldDeployPreview && inputs.isWalletDashboard
-    uses: ./.github/workflows/apps-wallet-dashboard.deploy.yml
+    uses: ./.github/workflows/apps_wallet_dashboard_deploy.yml
     secrets: inherit
     with:
       isProd: false
@@ -76,7 +76,7 @@ jobs:
   wallet-dashboard-prod:
     name: Vercel Wallet Dashboard Production
     if: inputs.isDevelop
-    uses: ./.github/workflows/apps-wallet-dashboard.deploy.yml
+    uses: ./.github/workflows/apps_wallet_dashboard_deploy.yml
     secrets: inherit
     with:
       isProd: true
@@ -84,7 +84,7 @@ jobs:
   apps-backend-preview:
     name: Vercel apps-backend Preview
     if: inputs.shouldDeployPreview && inputs.isAppsBackend
-    uses: ./.github/workflows/apps-backend.deploy.yml
+    uses: ./.github/workflows/apps_backend_deploy.yml
     secrets: inherit
     with:
       isProd: false
@@ -92,7 +92,7 @@ jobs:
   apps-backend-prod:
     name: Vercel apps-backend Production
     if: inputs.isDevelop
-    uses: ./.github/workflows/apps-backend.deploy.yml
+    uses: ./.github/workflows/apps_backend_deploy.yml
     secrets: inherit
     with:
       isProd: true
diff --git a/.github/workflows/apps-backend.deploy.yml b/.github/workflows/apps_backend_deploy.yml
similarity index 100%
rename from .github/workflows/apps-backend.deploy.yml
rename to .github/workflows/apps_backend_deploy.yml
diff --git a/.github/workflows/apps-explorer.deploy.yml b/.github/workflows/apps_explorer_deploy.yml
similarity index 100%
rename from .github/workflows/apps-explorer.deploy.yml
rename to .github/workflows/apps_explorer_deploy.yml
diff --git a/.github/workflows/apps-ui-kit.deploy.yml b/.github/workflows/apps_ui_kit_deploy.yml
similarity index 100%
rename from .github/workflows/apps-ui-kit.deploy.yml
rename to .github/workflows/apps_ui_kit_deploy.yml
diff --git a/.github/workflows/apps-wallet-dashboard.deploy.yml b/.github/workflows/apps_wallet_dashboard_deploy.yml
similarity index 100%
rename from .github/workflows/apps-wallet-dashboard.deploy.yml
rename to .github/workflows/apps_wallet_dashboard_deploy.yml
diff --git a/.github/workflows/apps-wallet-nightly.build.yml b/.github/workflows/apps_wallet_nightly_build.yml
similarity index 100%
rename from .github/workflows/apps-wallet-nightly.build.yml
rename to .github/workflows/apps_wallet_nightly_build.yml
diff --git a/.github/workflows/apps-wallet-rc.build.yml b/.github/workflows/apps_wallet_rc_build.yml
similarity index 100%
rename from .github/workflows/apps-wallet-rc.build.yml
rename to .github/workflows/apps_wallet_rc_build.yml
diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build_nightly.yml
similarity index 100%
rename from .github/workflows/build-nightly.yml
rename to .github/workflows/build_nightly.yml
diff --git a/.github/workflows/cargo-llvm-cov.yml b/.github/workflows/cargo_llvm_cov.yml
similarity index 100%
rename from .github/workflows/cargo-llvm-cov.yml
rename to .github/workflows/cargo_llvm_cov.yml
diff --git a/.github/workflows/changesets-ci.yml b/.github/workflows/changesets_ci.yml
similarity index 100%
rename from .github/workflows/changesets-ci.yml
rename to .github/workflows/changesets_ci.yml
diff --git a/.github/workflows/changesets-ci-comment.yml b/.github/workflows/changesets_ci_comment.yml
similarity index 100%
rename from .github/workflows/changesets-ci-comment.yml
rename to .github/workflows/changesets_ci_comment.yml
diff --git a/.github/workflows/changesets-publish.yml b/.github/workflows/changesets_publish.yml
similarity index 100%
rename from .github/workflows/changesets-publish.yml
rename to .github/workflows/changesets_publish.yml
diff --git a/.github/workflows/crate-docs.yml b/.github/workflows/crate_docs.yml
similarity index 100%
rename from .github/workflows/crate-docs.yml
rename to .github/workflows/crate_docs.yml
diff --git a/.github/workflows/develop-ci-slack-report.yml b/.github/workflows/develop_ci_slack_report.yml
similarity index 100%
rename from .github/workflows/develop-ci-slack-report.yml
rename to .github/workflows/develop_ci_slack_report.yml
diff --git a/.github/workflows/fastcrypto_pull.yml b/.github/workflows/fastcrypto_pull.yml
deleted file mode 100644
index 081a939c899..00000000000
--- a/.github/workflows/fastcrypto_pull.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Update the Fastcrypto pointer IOTA
-
-on:
-  ## Allow triggering this workflow manually via GitHub CLI/web
-  workflow_dispatch:
-  schedule:
-    # Update on every hour at 10 past the hour
-    - cron: "10 * * * *"
-
-jobs:
-  update-dep:
-    runs-on: self-hosted
-    # Important settings as we don't want to open a PR when the update fails
-    continue-on-error: false
-    steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # pin@v4
-      # Fork of 'Swatinem/rust-cache' which allows caching additional paths
-      - uses: bmwill/rust-cache@fb63fcd7a959767755b88b5af2f5cbf65fb8a127 # pin@v1
-      - name: Install cargo-hakari, and cache the binary
-        uses: baptiste0928/cargo-install@1cd874a5478fdca35d868ccc74640c5aabbb8f1b # pin@v3.0.0
-        with:
-          crate: cargo-hakari
-          locked: true
-      - name: Update the fastcrypto pointer
-        run: |
-          scripts/update_fastcrypto.sh
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # pin@v5
-        with:
-          # TODO: change the token to something FC-specific?
-          token: ${{ secrets.NW_AUTO_UPDATE }}
-          commit-message: chore(deps) Update the Fastcrypto pointer
-          title: chore(deps) Update the Fastcrypto pointer
-          body: |
-            - Update Fastcrypto
-
-            Auto-generated by [create-pull-request][1] and the scripts/update_fastcrypto.sh script
-
-            [1]: https://github.com/peter-evans/create-pull-request
-          branch: update-fastcrypto
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 94307357dfb..a50ba604472 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -29,6 +29,12 @@ env:
   RUST_BACKTRACE: short
 
 jobs:
+  cargo-deny-external:
+    uses: ./.github/workflows/_cargo_deny.yml
+    with:
+      manifest-path: external-crates/move/Cargo.toml
+    secrets: inherit
+
   release:
     name: build release binaries
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/preview-wiki.yml b/.github/workflows/preview_wiki.yml
similarity index 100%
rename from .github/workflows/preview-wiki.yml
rename to .github/workflows/preview_wiki.yml
diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release_docker.yml
similarity index 75%
rename from .github/workflows/release-docker.yml
rename to .github/workflows/release_docker.yml
index 62c6464c51e..5102bcdc25e 100644
--- a/.github/workflows/release-docker.yml
+++ b/.github/workflows/release_docker.yml
@@ -46,11 +46,19 @@ jobs:
         uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # pin@v5
         with:
           images: docker-registry.iota.org/iota-node
+          # mapping semver tags to networks
+          # v{MAJOR}.{MINOR}.{PATCH}-alpha -> alphanet
+          # v{MAJOR}.{MINOR}.{PATCH}-beta -> devnet
+          # v{MAJOR}.{MINOR}.{PATCH}-rc -> testnet
+          # v{MAJOR}.{MINOR}.{PATCH} -> mainnet
           tags: |
             type=raw,value={{sha}},enable=${{ github.event_name == 'workflow_dispatch' }}
             type=raw,value=latest,enable=${{ github.event_name == 'workflow_dispatch' }}
             type=raw,value={{tag}},enable=${{ github.event_name == 'release' }}
-            type=match,pattern=(.*)-v\d+\.\d+\.\d+,group=1,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-alpha.*\d*,group=0,value=alphanet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-beta.*\d*,group=0,value=devnet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-rc.*\d*,group=0,value=testnet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+$,group=0,value=mainnet,enable=${{ github.event_name == 'release' }}
 
       - name: Login to Docker Registry
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # pin@v3
@@ -97,11 +105,19 @@ jobs:
         uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # pin@v5
         with:
           images: docker-registry.iota.org/iota-indexer
+          # mapping semver tags to networks
+          # v{MAJOR}.{MINOR}.{PATCH}-alpha -> alphanet
+          # v{MAJOR}.{MINOR}.{PATCH}-beta -> devnet
+          # v{MAJOR}.{MINOR}.{PATCH}-rc -> testnet
+          # v{MAJOR}.{MINOR}.{PATCH} -> mainnet
           tags: |
             type=raw,value={{sha}},enable=${{ github.event_name == 'workflow_dispatch' }}
             type=raw,value=latest,enable=${{ github.event_name == 'workflow_dispatch' }}
             type=raw,value={{tag}},enable=${{ github.event_name == 'release' }}
-            type=match,pattern=(.*)-v\d+\.\d+\.\d+,group=1,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-alpha.*\d*,group=0,value=alphanet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-beta.*\d*,group=0,value=devnet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-rc.*\d*,group=0,value=testnet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+$,group=0,value=mainnet,enable=${{ github.event_name == 'release' }}
 
       - name: Login to Docker Registry
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # pin@v3
@@ -148,11 +164,19 @@ jobs:
         uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # pin@v5
         with:
           images: docker-registry.iota.org/iota-tools
+          # mapping semver tags to networks
+          # v{MAJOR}.{MINOR}.{PATCH}-alpha -> alphanet
+          # v{MAJOR}.{MINOR}.{PATCH}-beta -> devnet
+          # v{MAJOR}.{MINOR}.{PATCH}-rc -> testnet
+          # v{MAJOR}.{MINOR}.{PATCH} -> mainnet
           tags: |
             type=raw,value={{sha}},enable=${{ github.event_name == 'workflow_dispatch' }}
             type=raw,value=latest,enable=${{ github.event_name == 'workflow_dispatch' }}
             type=raw,value={{tag}},enable=${{ github.event_name == 'release' }}
-            type=match,pattern=(.*)-v\d+\.\d+\.\d+,group=1,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-alpha.*\d*,group=0,value=alphanet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-beta.*\d*,group=0,value=devnet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-rc.*\d*,group=0,value=testnet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+$,group=0,value=mainnet,enable=${{ github.event_name == 'release' }}
 
       - name: Login to Docker Registry
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # pin@v3
@@ -199,11 +223,19 @@ jobs:
         uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # pin@v5
         with:
           images: docker-registry.iota.org/iota-graphql-rpc
+          # mapping semver tags to networks
+          # v{MAJOR}.{MINOR}.{PATCH}-alpha -> alphanet
+          # v{MAJOR}.{MINOR}.{PATCH}-beta -> devnet
+          # v{MAJOR}.{MINOR}.{PATCH}-rc -> testnet
+          # v{MAJOR}.{MINOR}.{PATCH} -> mainnet
           tags: |
             type=raw,value={{sha}},enable=${{ github.event_name == 'workflow_dispatch' }}
             type=raw,value=latest,enable=${{ github.event_name == 'workflow_dispatch' }}
             type=raw,value={{tag}},enable=${{ github.event_name == 'release' }}
-            type=match,pattern=(.*)-v\d+\.\d+\.\d+,group=1,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-alpha.*\d*,group=0,value=alphanet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-beta.*\d*,group=0,value=devnet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+-rc.*\d*,group=0,value=testnet,enable=${{ github.event_name == 'release' }}
+            type=match,pattern=v\d+\.\d+\.\d+$,group=0,value=mainnet,enable=${{ github.event_name == 'release' }}
 
       - name: Login to Docker Registry
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # pin@v3
diff --git a/.github/workflows/release-notes-monitor.yml b/.github/workflows/release_notes_monitor.yml
similarity index 96%
rename from .github/workflows/release-notes-monitor.yml
rename to .github/workflows/release_notes_monitor.yml
index 8d3e3795053..f19fc19bb40 100644
--- a/.github/workflows/release-notes-monitor.yml
+++ b/.github/workflows/release_notes_monitor.yml
@@ -33,7 +33,7 @@ jobs:
           export previous_tag=$(git tag | grep -E 'iota_v1(.*)_rel_notes' | sort -rV | head -1)
           export previous_commit_hash=$(git rev-list -n 1 ${previous_tag})
 
-          export list_of_prs=$(git log --grep "\[x\]" --pretty=oneline --abbrev-commit ${previous_commit_hash}...${new_commit_hash} -- crates dashboards doc docker external-crates kiosk narwhal nre iota-execution | grep -o '#[0-9]\+' | grep -o '[0-9]\+' | jq -R -s -c 'split("\n")[:-1]')
+          export list_of_prs=$(git log --grep "\[x\]" --pretty=oneline --abbrev-commit ${previous_commit_hash}...${new_commit_hash} -- crates dashboards doc docker external-crates kiosk nre iota-execution | grep -o '#[0-9]\+' | grep -o '[0-9]\+' | jq -R -s -c 'split("\n")[:-1]')
 
           echo "matrix=${list_of_prs}" >> $GITHUB_OUTPUT
           echo "new_commit_hash=${new_commit_hash}" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/release-wiki.yml b/.github/workflows/release_wiki.yml
similarity index 100%
rename from .github/workflows/release-wiki.yml
rename to .github/workflows/release_wiki.yml
diff --git a/.github/workflows/simulator-nightly.yml b/.github/workflows/simulator_nightly.yml
similarity index 100%
rename from .github/workflows/simulator-nightly.yml
rename to .github/workflows/simulator_nightly.yml
diff --git a/.github/workflows/split-cluster.yml b/.github/workflows/split_cluster.yml
similarity index 100%
rename from .github/workflows/split-cluster.yml
rename to .github/workflows/split_cluster.yml
diff --git a/.github/workflows/trigger-builds.yml b/.github/workflows/trigger-builds.yml
deleted file mode 100644
index 644941eda69..00000000000
--- a/.github/workflows/trigger-builds.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Trigger builds for images and binaries
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "devnet"
-      - "testnet"
-      - "mainnet"
-      - "releases/iota-*-release"
-
-concurrency: ${{ github.workflow }}-${{ github.ref }}
-
-jobs:
-  docker-images:
-    runs-on: self-hosted
-    steps:
-      - name: Dispatch Docker Builds in iotaledger/iota-operations
-        uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # pin@v3
-        with:
-          repository: iotaledger/iota-operations
-          token: ${{ secrets.DOCKER_BINARY_BUILDS_DISPATCH }}
-          event-type: build-docker-images
-          client-payload: '{"iota_commit": "${{ github.sha }}", "docker_hub_tag": "${{ github.ref }}"}'
-
-  release-binaries:
-    runs-on: self-hosted
-    steps:
-      - name: Dispatch Release binaries builds in iotaledger/iota-operations
-        uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # pin@v3
-        with:
-          repository: iotaledger/iota-operations
-          token: ${{ secrets.DOCKER_BINARY_BUILDS_DISPATCH }}
-          event-type: build-release-binaries
-          client-payload: '{"iota_commit": "${{ github.sha }}"}'
diff --git a/Cargo.lock b/Cargo.lock
index c2fd51fc912..649fa531cbd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1085,9 +1085,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070"
+checksum = "cdd82dba44d209fddb11c190e0a94b78651f95299598e472215667417a03ff1d"
 dependencies = [
  "aws-lc-sys",
  "mirai-annotations",
@@ -1097,9 +1097,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.21.1"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234314bd569802ec87011d653d6815c6d7b9ffb969e9fee5b8b20ef860e8dce9"
+checksum = "df7a4168111d7eb622a31b214057b8509c0a7e1794f44c546d742330dc793972"
 dependencies = [
  "bindgen 0.69.5",
  "cc",
@@ -1813,7 +1813,7 @@ checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7"
 
 [[package]]
 name = "bin-version"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "const-str",
  "git-version",
@@ -1858,7 +1858,7 @@ dependencies = [
  "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
- "itertools 0.12.1",
+ "itertools 0.10.5",
  "lazy_static",
  "lazycell",
  "log",
@@ -3430,37 +3430,6 @@ dependencies = [
  "syn 2.0.77",
 ]
 
-[[package]]
-name = "derive_builder"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
-dependencies = [
- "derive_builder_macro",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
-dependencies = [
- "darling 0.14.4",
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "derive_builder_macro"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
-dependencies = [
- "derive_builder_core",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "derive_more"
 version = "0.99.18"
@@ -3661,14 +3630,14 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
 [[package]]
 name = "docs-examples"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "bcs",
  "bip32",
  "iota-keys",
  "iota-move-build",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "move-binary-format",
  "move-core-types",
  "serde_json",
@@ -4722,9 +4691,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -4732,9 +4701,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
@@ -4750,9 +4719,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-locks"
@@ -4766,9 +4735,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
@@ -4777,15 +4746,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-timer"
@@ -4799,9 +4768,9 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -5686,7 +5655,7 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"
 
 [[package]]
 name = "iota"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anemo",
  "anyhow",
@@ -5725,12 +5694,13 @@ dependencies = [
  "iota-json-rpc-types",
  "iota-keys",
  "iota-macros",
+ "iota-metrics",
  "iota-move",
  "iota-move-build",
  "iota-package-management",
  "iota-protocol-config",
  "iota-replay",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-simulator",
  "iota-source-validation",
  "iota-swarm",
@@ -5808,7 +5778,7 @@ dependencies = [
 
 [[package]]
 name = "iota-adapter-transactional-tests"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "datatest-stable",
  "iota-transactional-test-runner",
@@ -5843,7 +5813,7 @@ dependencies = [
 
 [[package]]
 name = "iota-analytics-indexer"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "arrow",
@@ -5894,7 +5864,7 @@ dependencies = [
 
 [[package]]
 name = "iota-analytics-indexer-derive"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
@@ -5903,7 +5873,7 @@ dependencies = [
 
 [[package]]
 name = "iota-archival"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "byteorder",
@@ -5935,7 +5905,7 @@ dependencies = [
 
 [[package]]
 name = "iota-authority-aggregation"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "futures",
  "iota-metrics",
@@ -5946,7 +5916,7 @@ dependencies = [
 
 [[package]]
 name = "iota-aws-orchestrator"
-version = "0.0.1"
+version = "0.5.0-alpha"
 dependencies = [
  "async-trait",
  "aws-config",
@@ -5977,7 +5947,7 @@ dependencies = [
 
 [[package]]
 name = "iota-benchmark"
-version = "0.0.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5999,7 +5969,7 @@ dependencies = [
  "iota-metrics",
  "iota-network",
  "iota-protocol-config",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-simulator",
  "iota-storage",
  "iota-surfer",
@@ -6027,7 +5997,7 @@ dependencies = [
 
 [[package]]
 name = "iota-bridge"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -6049,7 +6019,7 @@ dependencies = [
  "iota-json-rpc-types",
  "iota-keys",
  "iota-metrics",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-test-transaction-builder",
  "iota-types",
  "lru 0.12.4",
@@ -6076,7 +6046,7 @@ dependencies = [
 
 [[package]]
 name = "iota-bridge-cli"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "clap",
@@ -6087,7 +6057,7 @@ dependencies = [
  "iota-config",
  "iota-json-rpc-types",
  "iota-keys",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-types",
  "move-core-types",
  "reqwest 0.12.7",
@@ -6102,7 +6072,7 @@ dependencies = [
 
 [[package]]
 name = "iota-bridge-indexer"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6118,7 +6088,7 @@ dependencies = [
  "iota-indexer-builder",
  "iota-json-rpc-types",
  "iota-metrics",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-test-transaction-builder",
  "iota-types",
  "prometheus",
@@ -6132,7 +6102,7 @@ dependencies = [
 
 [[package]]
 name = "iota-cluster-test"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6150,7 +6120,7 @@ dependencies = [
  "iota-json",
  "iota-json-rpc-types",
  "iota-keys",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-swarm",
  "iota-swarm-config",
  "iota-test-transaction-builder",
@@ -6172,7 +6142,7 @@ dependencies = [
 
 [[package]]
 name = "iota-common"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "futures",
  "parking_lot 0.12.3",
@@ -6181,7 +6151,7 @@ dependencies = [
 
 [[package]]
 name = "iota-config"
-version = "0.0.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anemo",
  "anyhow",
@@ -6208,7 +6178,7 @@ dependencies = [
 
 [[package]]
 name = "iota-core"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anemo",
  "anyhow",
@@ -6268,7 +6238,6 @@ dependencies = [
  "move-core-types",
  "move-package",
  "move-symbol-pool",
- "narwhal-types",
  "nonempty",
  "num-bigint 0.4.6",
  "num_cpus",
@@ -6278,6 +6247,7 @@ dependencies = [
  "pprof",
  "pretty_assertions",
  "prometheus",
+ "quinn-proto",
  "rand 0.8.5",
  "rayon",
  "reqwest 0.12.7",
@@ -6300,6 +6270,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-stream",
+ "tower 0.4.13",
  "tracing",
  "twox-hash",
  "typed-store",
@@ -6309,7 +6280,7 @@ dependencies = [
 
 [[package]]
 name = "iota-cost"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "bcs",
@@ -6364,7 +6335,7 @@ dependencies = [
 
 [[package]]
 name = "iota-data-ingestion"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6398,7 +6369,7 @@ dependencies = [
 
 [[package]]
 name = "iota-data-ingestion-core"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6425,7 +6396,7 @@ dependencies = [
 
 [[package]]
 name = "iota-e2e-tests"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6456,7 +6427,7 @@ dependencies = [
  "iota-node",
  "iota-protocol-config",
  "iota-rest-api",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-simulator",
  "iota-storage",
  "iota-swarm",
@@ -6487,7 +6458,7 @@ dependencies = [
 
 [[package]]
 name = "iota-enum-compat-util"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "serde_yaml",
 ]
@@ -6530,7 +6501,7 @@ dependencies = [
 
 [[package]]
 name = "iota-faucet"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -6544,7 +6515,7 @@ dependencies = [
  "iota-json-rpc-types",
  "iota-keys",
  "iota-metrics",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-types",
  "parking_lot 0.12.3",
  "prometheus",
@@ -6568,7 +6539,7 @@ dependencies = [
 
 [[package]]
 name = "iota-framework"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "bcs",
@@ -6589,7 +6560,7 @@ dependencies = [
 
 [[package]]
 name = "iota-framework-snapshot"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "bcs",
@@ -6604,7 +6575,7 @@ dependencies = [
 
 [[package]]
 name = "iota-framework-tests"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "datatest-stable",
  "iota-adapter-latest",
@@ -6624,7 +6595,7 @@ dependencies = [
 
 [[package]]
 name = "iota-genesis-builder"
-version = "0.0.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "bcs",
@@ -6676,7 +6647,7 @@ dependencies = [
 
 [[package]]
 name = "iota-genesis-common"
-version = "0.0.0"
+version = "0.5.0-alpha"
 dependencies = [
  "iota-execution",
  "iota-protocol-config",
@@ -6686,7 +6657,7 @@ dependencies = [
 
 [[package]]
 name = "iota-graphql-config"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "quote 1.0.37",
  "syn 1.0.109",
@@ -6694,7 +6665,7 @@ dependencies = [
 
 [[package]]
 name = "iota-graphql-e2e-tests"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "datatest-stable",
  "iota-graphql-rpc",
@@ -6705,7 +6676,7 @@ dependencies = [
 
 [[package]]
 name = "iota-graphql-rpc"
-version = "2024.7.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-graphql",
@@ -6744,7 +6715,7 @@ dependencies = [
  "iota-package-resolver",
  "iota-protocol-config",
  "iota-rest-api",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-swarm-config",
  "iota-test-transaction-builder",
  "iota-types",
@@ -6784,7 +6755,7 @@ dependencies = [
 
 [[package]]
 name = "iota-graphql-rpc-client"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "async-graphql",
  "axum",
@@ -6797,14 +6768,14 @@ dependencies = [
 
 [[package]]
 name = "iota-graphql-rpc-headers"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "axum",
 ]
 
 [[package]]
 name = "iota-indexer"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6833,7 +6804,7 @@ dependencies = [
  "iota-package-resolver",
  "iota-protocol-config",
  "iota-rest-api",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-swarm-config",
  "iota-transaction-builder",
  "iota-types",
@@ -6864,7 +6835,7 @@ dependencies = [
 
 [[package]]
 name = "iota-indexer-builder"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6879,7 +6850,7 @@ dependencies = [
 
 [[package]]
 name = "iota-json"
-version = "0.0.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "bcs",
@@ -6898,7 +6869,7 @@ dependencies = [
 
 [[package]]
 name = "iota-json-rpc"
-version = "0.0.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -6951,7 +6922,7 @@ dependencies = [
 
 [[package]]
 name = "iota-json-rpc-api"
-version = "0.0.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "fastcrypto",
@@ -6970,7 +6941,7 @@ dependencies = [
 
 [[package]]
 name = "iota-json-rpc-tests"
-version = "0.0.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6984,11 +6955,12 @@ dependencies = [
  "iota-json-rpc-types",
  "iota-keys",
  "iota-macros",
+ "iota-metrics",
  "iota-move-build",
  "iota-open-rpc",
  "iota-open-rpc-macros",
  "iota-protocol-config",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-simulator",
  "iota-swarm-config",
  "iota-test-transaction-builder",
@@ -7007,7 +6979,7 @@ dependencies = [
 
 [[package]]
 name = "iota-json-rpc-types"
-version = "0.0.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "bcs",
@@ -7036,7 +7008,7 @@ dependencies = [
 
 [[package]]
 name = "iota-keys"
-version = "0.0.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "bip32",
@@ -7055,7 +7027,7 @@ dependencies = [
 
 [[package]]
 name = "iota-light-client"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7067,7 +7039,7 @@ dependencies = [
  "iota-json-rpc-types",
  "iota-package-resolver",
  "iota-rest-api",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-types",
  "move-binary-format",
  "move-core-types",
@@ -7079,7 +7051,7 @@ dependencies = [
 
 [[package]]
 name = "iota-macros"
-version = "0.7.0"
+version = "0.5.0-alpha"
 dependencies = [
  "futures",
  "iota-proc-macros",
@@ -7089,7 +7061,7 @@ dependencies = [
 
 [[package]]
 name = "iota-metric-checker"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "backoff",
@@ -7110,10 +7082,13 @@ dependencies = [
 
 [[package]]
 name = "iota-metrics"
-version = "0.7.0"
+version = "0.5.0-alpha"
 dependencies = [
+ "anemo",
+ "anemo-tower",
  "async-trait",
  "axum",
+ "bytes",
  "dashmap",
  "futures",
  "once_cell",
@@ -7130,7 +7105,7 @@ dependencies = [
 
 [[package]]
 name = "iota-move"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "better_any",
@@ -7168,7 +7143,7 @@ dependencies = [
 
 [[package]]
 name = "iota-move-build"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "fastcrypto",
@@ -7191,7 +7166,7 @@ dependencies = [
 
 [[package]]
 name = "iota-move-lsp"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "bin-version",
  "clap",
@@ -7244,7 +7219,7 @@ dependencies = [
 
 [[package]]
 name = "iota-network"
-version = "0.0.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anemo",
  "anemo-build",
@@ -7282,7 +7257,7 @@ dependencies = [
 
 [[package]]
 name = "iota-network-stack"
-version = "0.2.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anemo",
  "bcs",
@@ -7305,7 +7280,7 @@ dependencies = [
 
 [[package]]
 name = "iota-node"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anemo",
  "anemo-tower",
@@ -7340,7 +7315,6 @@ dependencies = [
  "iota-tls",
  "iota-types",
  "move-vm-profiler",
- "narwhal-network",
  "prometheus",
  "reqwest 0.12.7",
  "serde",
@@ -7356,7 +7330,7 @@ dependencies = [
 
 [[package]]
 name = "iota-open-rpc"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "bcs",
@@ -7380,7 +7354,7 @@ dependencies = [
 
 [[package]]
 name = "iota-open-rpc-macros"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "derive-syn-parse",
  "itertools 0.13.0",
@@ -7392,7 +7366,7 @@ dependencies = [
 
 [[package]]
 name = "iota-package-dump"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "bcs",
@@ -7409,11 +7383,11 @@ dependencies = [
 
 [[package]]
 name = "iota-package-management"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "iota-json-rpc-types",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-types",
  "move-core-types",
  "move-package",
@@ -7424,7 +7398,7 @@ dependencies = [
 
 [[package]]
 name = "iota-package-resolver"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "async-trait",
  "bcs",
@@ -7447,7 +7421,7 @@ dependencies = [
 
 [[package]]
 name = "iota-proc-macros"
-version = "0.7.0"
+version = "0.5.0-alpha"
 dependencies = [
  "msim-macros",
  "proc-macro2 1.0.86",
@@ -7457,7 +7431,7 @@ dependencies = [
 
 [[package]]
 name = "iota-protocol-config"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "clap",
  "insta",
@@ -7471,7 +7445,7 @@ dependencies = [
 
 [[package]]
 name = "iota-protocol-config-macros"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
@@ -7480,7 +7454,7 @@ dependencies = [
 
 [[package]]
 name = "iota-replay"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -7496,7 +7470,7 @@ dependencies = [
  "iota-json-rpc-api",
  "iota-json-rpc-types",
  "iota-protocol-config",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-storage",
  "iota-transaction-checks",
  "iota-types",
@@ -7527,7 +7501,7 @@ dependencies = [
 
 [[package]]
 name = "iota-rest-api"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7558,7 +7532,7 @@ dependencies = [
 
 [[package]]
 name = "iota-rosetta"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7576,7 +7550,7 @@ dependencies = [
  "iota-metrics",
  "iota-move-build",
  "iota-node",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-swarm-config",
  "iota-types",
  "move-core-types",
@@ -7600,7 +7574,7 @@ dependencies = [
 
 [[package]]
 name = "iota-rpc-loadgen"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7610,7 +7584,7 @@ dependencies = [
  "futures",
  "iota-json-rpc-types",
  "iota-keys",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-types",
  "itertools 0.13.0",
  "serde",
@@ -7626,7 +7600,7 @@ dependencies = [
 [[package]]
 name = "iota-rust-sdk"
 version = "0.0.0"
-source = "git+ssh://git@github.com/iotaledger/iota-rust-sdk.git?rev=46d46d64237e001e8e23f322caecb3211c9a8c97#46d46d64237e001e8e23f322caecb3211c9a8c97"
+source = "git+ssh://git@github.com/iotaledger/iota-rust-sdk.git?rev=dd7b331a5ec62fd5e810051d19f31dff90ea7e3f#dd7b331a5ec62fd5e810051d19f31dff90ea7e3f"
 dependencies = [
  "base64ct",
  "bcs",
@@ -7645,7 +7619,7 @@ dependencies = [
 
 [[package]]
 name = "iota-sdk"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7722,7 +7696,7 @@ dependencies = [
 
 [[package]]
 name = "iota-simulator"
-version = "0.7.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anemo",
  "anemo-tower",
@@ -7734,7 +7708,6 @@ dependencies = [
  "lru 0.12.4",
  "move-package",
  "msim",
- "narwhal-network",
  "rand 0.8.5",
  "serde",
  "telemetry-subscribers",
@@ -7745,7 +7718,7 @@ dependencies = [
 
 [[package]]
 name = "iota-single-node-benchmark"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "async-trait",
  "bcs",
@@ -7755,6 +7728,7 @@ dependencies = [
  "iota-config",
  "iota-core",
  "iota-macros",
+ "iota-metrics",
  "iota-move-build",
  "iota-protocol-config",
  "iota-simulator",
@@ -7779,7 +7753,7 @@ dependencies = [
 
 [[package]]
 name = "iota-snapshot"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "bcs",
@@ -7807,7 +7781,7 @@ dependencies = [
 
 [[package]]
 name = "iota-source-validation"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "colored",
@@ -7817,7 +7791,7 @@ dependencies = [
  "iota-json-rpc-types",
  "iota-move-build",
  "iota-package-management",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-test-transaction-builder",
  "iota-types",
  "move-binary-format",
@@ -7839,7 +7813,7 @@ dependencies = [
 
 [[package]]
 name = "iota-source-validation-service"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "axum",
@@ -7855,7 +7829,7 @@ dependencies = [
  "iota-metrics",
  "iota-move",
  "iota-move-build",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-source-validation",
  "jsonrpsee",
  "move-compiler",
@@ -7878,7 +7852,7 @@ dependencies = [
 
 [[package]]
 name = "iota-storage"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7932,7 +7906,7 @@ dependencies = [
 
 [[package]]
 name = "iota-surfer"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "async-trait",
  "bcs",
@@ -7942,6 +7916,7 @@ dependencies = [
  "iota-core",
  "iota-json-rpc-types",
  "iota-macros",
+ "iota-metrics",
  "iota-move-build",
  "iota-protocol-config",
  "iota-simulator",
@@ -7960,7 +7935,7 @@ dependencies = [
 
 [[package]]
 name = "iota-swarm"
-version = "0.0.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "futures",
@@ -7985,7 +7960,7 @@ dependencies = [
 
 [[package]]
 name = "iota-swarm-config"
-version = "0.0.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anemo",
  "anyhow",
@@ -8012,12 +7987,12 @@ dependencies = [
 
 [[package]]
 name = "iota-test-transaction-builder"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "bcs",
  "iota-genesis-builder",
  "iota-move-build",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-types",
  "move-core-types",
  "shared-crypto",
@@ -8025,7 +8000,7 @@ dependencies = [
 
 [[package]]
 name = "iota-tls"
-version = "0.0.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "axum",
@@ -8046,7 +8021,7 @@ dependencies = [
 
 [[package]]
 name = "iota-tool"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anemo",
  "anemo-cli",
@@ -8068,7 +8043,7 @@ dependencies = [
  "iota-package-dump",
  "iota-protocol-config",
  "iota-replay",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-snapshot",
  "iota-storage",
  "iota-types",
@@ -8091,7 +8066,7 @@ dependencies = [
 
 [[package]]
 name = "iota-transaction-builder"
-version = "0.0.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -8107,7 +8082,7 @@ dependencies = [
 
 [[package]]
 name = "iota-transaction-checks"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "fastcrypto-zkp",
  "iota-config",
@@ -8121,7 +8096,7 @@ dependencies = [
 
 [[package]]
 name = "iota-transactional-test-runner"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -8170,7 +8145,7 @@ dependencies = [
 
 [[package]]
 name = "iota-types"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anemo",
  "anyhow",
@@ -8201,6 +8176,7 @@ dependencies = [
  "iota-protocol-config",
  "iota-rust-sdk",
  "iota-sdk 1.1.5",
+ "iota-util-mem",
  "itertools 0.13.0",
  "lru 0.12.4",
  "move-binary-format",
@@ -8251,7 +8227,7 @@ dependencies = [
 
 [[package]]
 name = "iota-upgrade-compatibility-transactional-tests"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "datatest-stable",
@@ -8265,7 +8241,7 @@ dependencies = [
 
 [[package]]
 name = "iota-util-mem"
-version = "0.11.0"
+version = "0.5.0-alpha"
 dependencies = [
  "cfg-if",
  "ed25519-consensus",
@@ -8283,7 +8259,7 @@ dependencies = [
 
 [[package]]
 name = "iota-util-mem-derive"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "proc-macro2 1.0.86",
  "syn 1.0.109",
@@ -8307,7 +8283,7 @@ dependencies = [
 
 [[package]]
 name = "iota-verifier-transactional-tests"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "datatest-stable",
  "iota-transactional-test-runner",
@@ -9125,12 +9101,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
-[[package]]
-name = "match_opt"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "405ba1524a1e6ae755334d6966380c60ec40157e0155f9032dd3c294b6384da9"
-
 [[package]]
 name = "matchers"
 version = "0.1.0"
@@ -10195,122 +10165,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "narwhal-config"
-version = "0.1.0"
-dependencies = [
- "fastcrypto",
- "insta",
- "iota-network-stack",
- "iota-util-mem",
- "match_opt",
- "narwhal-crypto",
- "narwhal-test-utils",
- "rand 0.8.5",
- "serde",
- "serde_json",
- "tempfile",
- "thiserror",
- "tracing",
-]
-
-[[package]]
-name = "narwhal-crypto"
-version = "0.1.0"
-dependencies = [
- "bcs",
- "bincode",
- "fastcrypto",
- "serde",
- "serde_json",
- "shared-crypto",
-]
-
-[[package]]
-name = "narwhal-network"
-version = "0.1.0"
-dependencies = [
- "anemo",
- "anemo-tower",
- "anyhow",
- "async-trait",
- "axum",
- "bincode",
- "bytes",
- "dashmap",
- "futures",
- "iota-common",
- "iota-metrics",
- "narwhal-crypto",
- "narwhal-types",
- "parking_lot 0.12.3",
- "prometheus",
- "quinn-proto",
- "rand 0.8.5",
- "tokio",
- "tower 0.4.13",
- "tracing",
-]
-
-[[package]]
-name = "narwhal-test-utils"
-version = "0.1.0"
-dependencies = [
- "anemo",
- "fastcrypto",
- "fdlimit",
- "indexmap 2.5.0",
- "iota-network-stack",
- "iota-protocol-config",
- "narwhal-config",
- "narwhal-crypto",
- "narwhal-types",
- "once_cell",
- "rand 0.8.5",
- "tempfile",
- "tokio",
- "tonic",
- "tracing",
-]
-
-[[package]]
-name = "narwhal-types"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "base64 0.21.7",
- "bcs",
- "bytes",
- "criterion",
- "derive_builder",
- "enum_dispatch",
- "fastcrypto",
- "futures",
- "indexmap 2.5.0",
- "iota-common",
- "iota-metrics",
- "iota-network-stack",
- "iota-util-mem",
- "narwhal-config",
- "narwhal-crypto",
- "narwhal-test-utils",
- "once_cell",
- "prometheus",
- "proptest",
- "proptest-derive",
- "prost",
- "rand 0.8.5",
- "roaring",
- "serde",
- "serde_test",
- "serde_with",
- "thiserror",
- "tokio",
- "tonic",
- "tonic-build",
- "tracing",
-]
-
 [[package]]
 name = "neptune"
 version = "13.0.0"
@@ -11929,7 +11783,7 @@ dependencies = [
 
 [[package]]
 name = "prometheus-closure-metric"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "prometheus",
@@ -13539,15 +13393,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_test"
-version = "1.0.177"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f901ee573cab6b3060453d2d5f0bae4e6d628c23c0a962ff9b5f1d7c8d4f1ed"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -13716,7 +13561,7 @@ dependencies = [
 
 [[package]]
 name = "shared-crypto"
-version = "0.0.0"
+version = "0.5.0-alpha"
 dependencies = [
  "bcs",
  "eyre",
@@ -13839,7 +13684,7 @@ dependencies = [
 
 [[package]]
 name = "simulacrum"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -14543,7 +14388,7 @@ dependencies = [
 
 [[package]]
 name = "telemetry-subscribers"
-version = "0.2.0"
+version = "0.5.0-alpha"
 dependencies = [
  "atomic_float",
  "bytes",
@@ -14619,7 +14464,7 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "test-cluster"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "anyhow",
  "bcs",
@@ -14636,9 +14481,10 @@ dependencies = [
  "iota-json-rpc-types",
  "iota-keys",
  "iota-macros",
+ "iota-metrics",
  "iota-node",
  "iota-protocol-config",
- "iota-sdk 0.4.0",
+ "iota-sdk 0.5.0-alpha",
  "iota-simulator",
  "iota-swarm",
  "iota-swarm-config",
@@ -15101,23 +14947,22 @@ dependencies = [
 
 [[package]]
 name = "tonic-build"
-version = "0.12.3"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11"
+checksum = "fe4ee8877250136bd7e3d2331632810a4df4ea5e004656990d8d66d2f5ee8a67"
 dependencies = [
  "prettyplease",
  "proc-macro2 1.0.86",
  "prost-build",
- "prost-types",
  "quote 1.0.37",
  "syn 2.0.77",
 ]
 
 [[package]]
 name = "tonic-health"
-version = "0.12.3"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1eaf34ddb812120f5c601162d5429933c9b527d901ab0e7f930d3147e33a09b2"
+checksum = "ec0a34e6f706bae26b2b490e1da5c3f6a6ff87cae442bcbc7c881bab9631b5a7"
 dependencies = [
  "async-stream",
  "prost",
@@ -15360,7 +15205,7 @@ dependencies = [
 
 [[package]]
 name = "transaction-fuzzer"
-version = "0.1.0"
+version = "0.5.0-alpha"
 dependencies = [
  "iota-core",
  "iota-move-build",
@@ -15466,7 +15311,7 @@ dependencies = [
 
 [[package]]
 name = "typed-store"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "async-trait",
  "bcs",
@@ -15497,7 +15342,7 @@ dependencies = [
 
 [[package]]
 name = "typed-store-derive"
-version = "0.3.0"
+version = "0.5.0-alpha"
 dependencies = [
  "itertools 0.13.0",
  "proc-macro2 1.0.86",
@@ -15507,7 +15352,7 @@ dependencies = [
 
 [[package]]
 name = "typed-store-error"
-version = "0.4.0"
+version = "0.5.0-alpha"
 dependencies = [
  "serde",
  "thiserror",
@@ -15515,7 +15360,7 @@ dependencies = [
 
 [[package]]
 name = "typed-store-workspace-hack"
-version = "0.0.0"
+version = "0.5.0-alpha"
 dependencies = [
  "libc",
  "memchr",
diff --git a/Cargo.toml b/Cargo.toml
index 141904a44f1..b8fdc8cecde 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -165,13 +165,11 @@ members = [
   "iota-execution/v0/iota-adapter",
   "iota-execution/v0/iota-move-natives",
   "iota-execution/v0/iota-verifier",
-  "narwhal/network",
-  "narwhal/types",
 ]
 
 [workspace.package]
 # This version string will be inherited by iota-core, iota-faucet, iota-node, iota-tools, iota-sdk, iota-move-build, and iota crates.
-version = "0.4.0"
+version = "0.5.0-alpha"
 
 [profile.release]
 # debug = 1 means line charts only, which is minimum needed for good stack traces
@@ -418,8 +416,8 @@ iota-rest-api = { path = "crates/iota-rest-api" }
 iota-rosetta = { path = "crates/iota-rosetta" }
 iota-rpc-loadgen = { path = "crates/iota-rpc-loadgen" }
 iota-sdk = { path = "crates/iota-sdk" }
-# core-types with json format for REST api
-iota-sdk2 = { package = "iota-rust-sdk", git = "ssh://git@github.com/iotaledger/iota-rust-sdk.git", rev = "46d46d64237e001e8e23f322caecb3211c9a8c97", features = ["hash", "serde", "schemars"] }
+# core-types with json format for REST API
+iota-sdk2 = { package = "iota-rust-sdk", git = "ssh://git@github.com/iotaledger/iota-rust-sdk.git", rev = "dd7b331a5ec62fd5e810051d19f31dff90ea7e3f", features = ["hash", "serde", "schemars"] }
 iota-simulator = { path = "crates/iota-simulator" }
 iota-snapshot = { path = "crates/iota-snapshot" }
 iota-source-validation = { path = "crates/iota-source-validation" }
@@ -462,8 +460,6 @@ move-vm-config = { path = "external-crates/move/crates/move-vm-config" }
 move-vm-profiler = { path = "external-crates/move/crates/move-vm-profiler" }
 move-vm-test-utils = { path = "external-crates/move/crates/move-vm-test-utils/", features = ["tiered-gas"] }
 move-vm-types = { path = "external-crates/move/crates/move-vm-types" }
-narwhal-network = { path = "narwhal/network" }
-narwhal-types = { path = "narwhal/types" }
 prometheus-closure-metric = { path = "crates/prometheus-closure-metric" }
 shared-crypto = { path = "crates/shared-crypto" }
 simulacrum = { path = "crates/simulacrum" }
diff --git a/apps/apps-backend/src/features/features.controller.ts b/apps/apps-backend/src/features/features.controller.ts
index e1400b1d57a..e71e4b326a4 100644
--- a/apps/apps-backend/src/features/features.controller.ts
+++ b/apps/apps-backend/src/features/features.controller.ts
@@ -64,6 +64,12 @@ export class FeaturesController {
                 [Feature.AccountFinder]: {
                     defaultValue: false,
                 },
+                [Feature.WalletDashboardMigration]: {
+                    defaultValue: false,
+                },
+                [Feature.WalletDashboardSupplyIncreaseVesting]: {
+                    defaultValue: false,
+                },
             },
             dateUpdated: new Date().toISOString(),
         };
diff --git a/apps/core/src/constants/features.enum.ts b/apps/core/src/constants/features.enum.ts
index 615c80386e3..3670db4edc1 100644
--- a/apps/core/src/constants/features.enum.ts
+++ b/apps/core/src/constants/features.enum.ts
@@ -18,4 +18,6 @@ export enum Feature {
     NetworkOutageOverride = 'network-outage-override',
     ModuleSourceVerification = 'module-source-verification',
     WalletEffectsOnlySharedTransaction = 'wallet-effects-only-shared-transaction',
+    StardustMigration = 'migration',
+    SupplyIncreaseVesting = 'supply-increase-vesting',
 }
diff --git a/apps/wallet-dashboard/app/(protected)/components/sidebar/Sidebar.tsx b/apps/wallet-dashboard/app/(protected)/components/sidebar/Sidebar.tsx
index 0f49225192d..03742f9e8e4 100644
--- a/apps/wallet-dashboard/app/(protected)/components/sidebar/Sidebar.tsx
+++ b/apps/wallet-dashboard/app/(protected)/components/sidebar/Sidebar.tsx
@@ -4,13 +4,24 @@
 import { PROTECTED_ROUTES } from '@/lib/constants/routes.constants';
 import { IotaLogoMark } from '@iota/ui-icons';
 import { SidebarItem } from './SidebarItem';
+import { Feature } from '@iota/core';
+import { useFeature } from '@growthbook/growthbook-react';
 
 export function Sidebar() {
+    const featureFlags = {
+        Migrations: useFeature<boolean>(Feature.StardustMigration).value,
+        Vesting: useFeature<boolean>(Feature.SupplyIncreaseVesting).value,
+    };
+
+    const filteredRoutes = PROTECTED_ROUTES.filter(({ title }) => {
+        return title in featureFlags ? featureFlags[title as keyof typeof featureFlags] : true;
+    });
+
     return (
         <nav className="flex h-screen flex-col items-center gap-y-2xl bg-neutral-100 py-xl dark:bg-neutral-6">
             <IotaLogoMark className="h-10 w-10 text-neutral-10 dark:text-neutral-92" />
             <div className="flex flex-col gap-y-xs">
-                {PROTECTED_ROUTES.map((route) => (
+                {filteredRoutes.map((route) => (
                     <SidebarItem key={route.path} {...route} />
                 ))}
             </div>
diff --git a/apps/wallet-dashboard/app/(protected)/home/page.tsx b/apps/wallet-dashboard/app/(protected)/home/page.tsx
index 53c3d8433b3..51dbf3277ce 100644
--- a/apps/wallet-dashboard/app/(protected)/home/page.tsx
+++ b/apps/wallet-dashboard/app/(protected)/home/page.tsx
@@ -2,30 +2,40 @@
 // SPDX-License-Identifier: Apache-2.0
 'use client';
 
-import { AccountBalance, MyCoins, Button, NewStakePopup } from '@/components';
-import { usePopups } from '@/hooks';
+import { AccountBalance, MyCoins } from '@/components';
 import { useCurrentAccount, useCurrentWallet } from '@iota/dapp-kit';
 
 function HomeDashboardPage(): JSX.Element {
     const { connectionStatus } = useCurrentWallet();
     const account = useCurrentAccount();
-    const { openPopup, closePopup } = usePopups();
-
-    const addNewStake = () => {
-        openPopup(<NewStakePopup onClose={closePopup} />);
-    };
-
     return (
-        <main className="flex flex-1 flex-col items-center space-y-8 p-24">
-            <p>Connection status: {connectionStatus}</p>
+        <main className="flex flex-1 flex-col items-center space-y-8 py-md">
             {connectionStatus === 'connected' && account && (
-                <div className="flex flex-col items-center justify-center space-y-2">
-                    <h1>Welcome</h1>
-                    <div>Address: {account.address}</div>
-                    <AccountBalance />
-                    <MyCoins />
-                    <Button onClick={addNewStake}>New Stake</Button>
-                </div>
+                <>
+                    <div className="home-page-grid-container h-full w-full">
+                        <div style={{ gridArea: 'balance' }} className="flex grow overflow-hidden">
+                            <AccountBalance />
+                        </div>
+                        <div style={{ gridArea: 'staking' }} className="flex grow overflow-hidden">
+                            Staking
+                        </div>
+                        <div
+                            style={{ gridArea: 'migration' }}
+                            className="flex grow overflow-hidden"
+                        >
+                            Migration
+                        </div>
+                        <div style={{ gridArea: 'coins' }}>
+                            <MyCoins />
+                        </div>
+                        <div style={{ gridArea: 'vesting' }} className="flex grow overflow-hidden">
+                            Vesting
+                        </div>
+                        <div style={{ gridArea: 'activity' }} className="flex grow overflow-hidden">
+                            Activity
+                        </div>
+                    </div>
+                </>
             )}
         </main>
     );
diff --git a/apps/wallet-dashboard/app/(protected)/migrations/page.tsx b/apps/wallet-dashboard/app/(protected)/migrations/page.tsx
index b57170a8ed6..01f8a8fbb4f 100644
--- a/apps/wallet-dashboard/app/(protected)/migrations/page.tsx
+++ b/apps/wallet-dashboard/app/(protected)/migrations/page.tsx
@@ -1,7 +1,22 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
+'use client';
+
+import { useFeature } from '@growthbook/growthbook-react';
+import { Feature } from '@iota/core';
+import { useRouter } from 'next/navigation';
+import { useEffect } from 'react';
 
 function MigrationDashboardPage(): JSX.Element {
+    const router = useRouter();
+    const stardustMigrationEnabled = useFeature<boolean>(Feature.StardustMigration).value;
+
+    useEffect(() => {
+        if (!stardustMigrationEnabled) {
+            router.push('/');
+        }
+    }, [stardustMigrationEnabled, router]);
+
     return (
         <div className="flex items-center justify-center pt-12">
             <h1>MIGRATIONS</h1>
diff --git a/apps/wallet-dashboard/app/(protected)/staking/page.tsx b/apps/wallet-dashboard/app/(protected)/staking/page.tsx
index a073465e96c..4286e9a7cc9 100644
--- a/apps/wallet-dashboard/app/(protected)/staking/page.tsx
+++ b/apps/wallet-dashboard/app/(protected)/staking/page.tsx
@@ -3,7 +3,7 @@
 
 'use client';
 
-import { AmountBox, Box, StakeCard, NewStakePopup, StakeDetailsPopup, Button } from '@/components';
+import { AmountBox, Box, StakeCard, StakeDialog, StakeDetailsPopup, Button } from '@/components';
 import { usePopups } from '@/hooks';
 import {
     ExtendedDelegatedStake,
@@ -17,9 +17,12 @@ import {
 } from '@iota/core';
 import { useCurrentAccount } from '@iota/dapp-kit';
 import { IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
+import { useState } from 'react';
 
 function StakingDashboardPage(): JSX.Element {
     const account = useCurrentAccount();
+    const [isDialogStakeOpen, setIsDialogStakeOpen] = useState(false);
+
     const { openPopup, closePopup } = usePopups();
     const { data: delegatedStakeData } = useGetDelegatedStake({
         address: account?.address || '',
@@ -42,37 +45,41 @@ function StakingDashboardPage(): JSX.Element {
     const viewStakeDetails = (extendedStake: ExtendedDelegatedStake) => {
         openPopup(<StakeDetailsPopup extendedStake={extendedStake} onClose={closePopup} />);
     };
-
-    const addNewStake = () => {
-        openPopup(<NewStakePopup onClose={closePopup} />);
-    };
+    function handleNewStake() {
+        setIsDialogStakeOpen(true);
+    }
 
     return (
-        <div className="flex flex-col items-center justify-center gap-4 pt-12">
-            <AmountBox
-                title="Currently staked"
-                amount={stakeResult.isPending ? '-' : `${formattedDelegatedStake} ${stakeSymbol}`}
-            />
-            <AmountBox
-                title="Earned"
-                amount={`${
-                    rewardsResult.isPending ? '-' : formattedDelegatedRewards
-                } ${rewardsSymbol}`}
-            />
-            <Box title="Stakes">
-                <div className="flex flex-col items-center gap-4">
-                    <h1>List of stakes</h1>
-                    {extendedStakes?.map((extendedStake) => (
-                        <StakeCard
-                            key={extendedStake.stakedIotaId}
-                            extendedStake={extendedStake}
-                            onDetailsClick={viewStakeDetails}
-                        />
-                    ))}
-                </div>
-            </Box>
-            <Button onClick={addNewStake}>New Stake</Button>
-        </div>
+        <>
+            <div className="flex flex-col items-center justify-center gap-4 pt-12">
+                <AmountBox
+                    title="Currently staked"
+                    amount={
+                        stakeResult.isPending ? '-' : `${formattedDelegatedStake} ${stakeSymbol}`
+                    }
+                />
+                <AmountBox
+                    title="Earned"
+                    amount={`${
+                        rewardsResult.isPending ? '-' : formattedDelegatedRewards
+                    } ${rewardsSymbol}`}
+                />
+                <Box title="Stakes">
+                    <div className="flex flex-col items-center gap-4">
+                        <h1>List of stakes</h1>
+                        {extendedStakes?.map((extendedStake) => (
+                            <StakeCard
+                                key={extendedStake.stakedIotaId}
+                                extendedStake={extendedStake}
+                                onDetailsClick={viewStakeDetails}
+                            />
+                        ))}
+                    </div>
+                </Box>
+                <Button onClick={handleNewStake}>New Stake</Button>
+            </div>
+            <StakeDialog isOpen={isDialogStakeOpen} setOpen={setIsDialogStakeOpen} />;
+        </>
     );
 }
 
diff --git a/apps/wallet-dashboard/app/(protected)/vesting/page.tsx b/apps/wallet-dashboard/app/(protected)/vesting/page.tsx
index c83b89b7962..d04c672a705 100644
--- a/apps/wallet-dashboard/app/(protected)/vesting/page.tsx
+++ b/apps/wallet-dashboard/app/(protected)/vesting/page.tsx
@@ -3,7 +3,7 @@
 
 'use client';
 
-import { Button, NewStakePopup, TimelockedUnstakePopup } from '@/components';
+import { Button, TimelockedUnstakePopup } from '@/components';
 import { useGetCurrentEpochStartTimestamp, useNotifications, usePopups } from '@/hooks';
 import {
     formatDelegatedTimelockedStake,
@@ -14,7 +14,9 @@ import {
     TimelockedStakedObjectsGrouped,
 } from '@/lib/utils';
 import { NotificationType } from '@/stores/notificationStore';
+import { useFeature } from '@growthbook/growthbook-react';
 import {
+    Feature,
     TIMELOCK_IOTA_TYPE,
     useGetActiveValidatorsInfo,
     useGetAllOwnedObjects,
@@ -24,11 +26,14 @@ import {
 import { useCurrentAccount, useIotaClient, useSignAndExecuteTransaction } from '@iota/dapp-kit';
 import { IotaValidatorSummary } from '@iota/iota-sdk/client';
 import { useQueryClient } from '@tanstack/react-query';
+import { useRouter } from 'next/navigation';
+import { useEffect } from 'react';
 
 function VestingDashboardPage(): JSX.Element {
     const account = useCurrentAccount();
     const queryClient = useQueryClient();
     const iotaClient = useIotaClient();
+    const router = useRouter();
     const { addNotification } = useNotifications();
     const { openPopup, closePopup } = usePopups();
     const { data: currentEpochMs } = useGetCurrentEpochStartTimestamp();
@@ -39,6 +44,8 @@ function VestingDashboardPage(): JSX.Element {
     const { data: timelockedStakedObjects } = useGetTimelockedStakedObjects(account?.address || '');
     const { mutateAsync: signAndExecuteTransaction } = useSignAndExecuteTransaction();
 
+    const supplyIncreaseVestingEnabled = useFeature<boolean>(Feature.SupplyIncreaseVesting).value;
+
     const timelockedMapped = mapTimelockObjects(timelockedObjects || []);
     const timelockedstakedMapped = formatDelegatedTimelockedStake(timelockedStakedObjects || []);
 
@@ -128,11 +135,11 @@ function VestingDashboardPage(): JSX.Element {
         );
     }
 
-    function handleStake(): void {
-        openPopup(
-            <NewStakePopup onClose={closePopup} onSuccess={handleOnSuccess} isTimelockedStaking />,
-        );
-    }
+    useEffect(() => {
+        if (!supplyIncreaseVestingEnabled) {
+            router.push('/');
+        }
+    }, [router, supplyIncreaseVestingEnabled]);
 
     return (
         <div className="flex flex-row">
@@ -205,9 +212,6 @@ function VestingDashboardPage(): JSX.Element {
                         {vestingSchedule.availableClaiming ? (
                             <Button onClick={handleCollect}>Collect</Button>
                         ) : null}
-                        {vestingSchedule.availableStaking ? (
-                            <Button onClick={handleStake}>Stake</Button>
-                        ) : null}
                     </div>
                 )}
             </div>
diff --git a/apps/wallet-dashboard/app/globals.css b/apps/wallet-dashboard/app/globals.css
index f20990e2944..a5cf2ad80f6 100644
--- a/apps/wallet-dashboard/app/globals.css
+++ b/apps/wallet-dashboard/app/globals.css
@@ -1,3 +1,5 @@
+@import '@iota/apps-ui-kit/styles';
+
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
@@ -14,3 +16,37 @@ body {
         text-wrap: balance;
     }
 }
+
+@layer components {
+    .home-page-grid-container {
+        @apply grid grid-cols-1 gap-lg;
+        grid-template-areas:
+            'balance'
+            'staking'
+            'migration'
+            'coins'
+            'vesting'
+            'activity';
+    }
+
+    @screen sm {
+        .home-page-grid-container {
+            @apply grid-cols-2;
+            grid-template-areas:
+                'balance coins'
+                'staking migration'
+                'vesting vesting'
+                'activity activity';
+        }
+    }
+
+    @screen md {
+        .home-page-grid-container {
+            @apply grid-cols-3;
+            grid-template-areas:
+                'balance staking migration'
+                'coins vesting vesting'
+                'coins activity activity';
+        }
+    }
+}
diff --git a/apps/wallet-dashboard/app/layout.tsx b/apps/wallet-dashboard/app/layout.tsx
index dadbd552dbf..a4c71f018d6 100644
--- a/apps/wallet-dashboard/app/layout.tsx
+++ b/apps/wallet-dashboard/app/layout.tsx
@@ -5,16 +5,18 @@
 import { Inter } from 'next/font/google';
 
 import './globals.css';
-
+import { GrowthBookProvider } from '@growthbook/growthbook-react';
 import { IotaClientProvider, lightTheme, darkTheme, WalletProvider } from '@iota/dapp-kit';
 import { getAllNetworks, getDefaultNetwork } from '@iota/iota-sdk/client';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import React from 'react';
-
 import '@iota/dapp-kit/dist/index.css';
 import { Popup, PopupProvider } from '@/components/Popup';
+import { growthbook } from '@/lib/utils';
+import { Toaster } from 'react-hot-toast';
 
 const inter = Inter({ subsets: ['latin'] });
+growthbook.init();
 
 export default function RootLayout({
     children,
@@ -30,26 +32,29 @@ export default function RootLayout({
     return (
         <html lang="en">
             <body className={inter.className} ref={bodyRef}>
-                <QueryClientProvider client={queryClient}>
-                    <IotaClientProvider networks={allNetworks} defaultNetwork={defaultNetwork}>
-                        <WalletProvider
-                            theme={[
-                                {
-                                    variables: lightTheme,
-                                },
-                                {
-                                    selector: '.dark',
-                                    variables: darkTheme,
-                                },
-                            ]}
-                        >
-                            <PopupProvider>
-                                {children}
-                                <Popup />
-                            </PopupProvider>
-                        </WalletProvider>
-                    </IotaClientProvider>
-                </QueryClientProvider>
+                <GrowthBookProvider growthbook={growthbook}>
+                    <QueryClientProvider client={queryClient}>
+                        <IotaClientProvider networks={allNetworks} defaultNetwork={defaultNetwork}>
+                            <WalletProvider
+                                theme={[
+                                    {
+                                        variables: lightTheme,
+                                    },
+                                    {
+                                        selector: '.dark',
+                                        variables: darkTheme,
+                                    },
+                                ]}
+                            >
+                                <PopupProvider>
+                                    {children}
+                                    <Toaster />
+                                    <Popup />
+                                </PopupProvider>
+                            </WalletProvider>
+                        </IotaClientProvider>
+                    </QueryClientProvider>
+                </GrowthBookProvider>
             </body>
         </html>
     );
diff --git a/apps/wallet-dashboard/components/AccountBalance/AccountBalance.tsx b/apps/wallet-dashboard/components/AccountBalance/AccountBalance.tsx
deleted file mode 100644
index accc76d43e3..00000000000
--- a/apps/wallet-dashboard/components/AccountBalance/AccountBalance.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-import { useCurrentAccount } from '@iota/dapp-kit';
-import { IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
-
-import { useBalance, useFormatCoin } from '@iota/core';
-
-export const AccountBalance = () => {
-    const account = useCurrentAccount();
-    const address = account?.address;
-    const { data: coinBalance, isPending } = useBalance(address!);
-    const [formatted, symbol] = useFormatCoin(coinBalance?.totalBalance, IOTA_TYPE_ARG);
-    return (
-        <div>
-            {isPending && <p>Loading...</p>}
-            {!isPending && (
-                <p>
-                    Balance: {formatted} {symbol}
-                </p>
-            )}
-        </div>
-    );
-};
diff --git a/apps/wallet-dashboard/components/Coins/CoinItem.tsx b/apps/wallet-dashboard/components/Coins/CoinItem.tsx
deleted file mode 100644
index a055f87def1..00000000000
--- a/apps/wallet-dashboard/components/Coins/CoinItem.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-import { useFormatCoin } from '@iota/core';
-import React from 'react';
-
-interface CoinItemProps {
-    coinType: string;
-    balance: bigint;
-    onClick?: () => void;
-}
-
-function CoinItem({ coinType, balance, onClick }: CoinItemProps): React.JSX.Element {
-    const [formattedCoin, coinSymbol, { data: coinMeta }] = useFormatCoin(balance, coinType);
-
-    return (
-        <div
-            onClick={onClick}
-            className="flex w-full cursor-pointer items-center justify-between gap-4 rounded border px-6 py-3"
-        >
-            <div className="flex flex-1 items-center justify-between gap-1.5">
-                <div className="max-w-token-width">
-                    <span className="truncate uppercase">{coinMeta?.name}</span>
-                </div>
-                <div className="flex flex-row items-center justify-center">
-                    <span>
-                        {formattedCoin} {coinSymbol}
-                    </span>
-                </div>
-            </div>
-        </div>
-    );
-}
-
-export default CoinItem;
diff --git a/apps/wallet-dashboard/components/Coins/MyCoins.tsx b/apps/wallet-dashboard/components/Coins/MyCoins.tsx
deleted file mode 100644
index 6fb6e8eed49..00000000000
--- a/apps/wallet-dashboard/components/Coins/MyCoins.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-import React from 'react';
-import { useCurrentAccount, useIotaClientQuery } from '@iota/dapp-kit';
-import { CoinItem, SendCoinPopup } from '@/components';
-import { usePopups } from '@/hooks';
-import { CoinBalance } from '@iota/iota-sdk/client';
-import {
-    COINS_QUERY_REFETCH_INTERVAL,
-    COINS_QUERY_STALE_TIME,
-    filterAndSortTokenBalances,
-    useSortedCoinsByCategories,
-} from '@iota/core';
-
-function MyCoins(): React.JSX.Element {
-    const { openPopup, closePopup } = usePopups();
-    const account = useCurrentAccount();
-    const activeAccountAddress = account?.address;
-
-    const { data: coinBalances } = useIotaClientQuery(
-        'getAllBalances',
-        { owner: activeAccountAddress! },
-        {
-            enabled: !!activeAccountAddress,
-            staleTime: COINS_QUERY_STALE_TIME,
-            refetchInterval: COINS_QUERY_REFETCH_INTERVAL,
-            select: filterAndSortTokenBalances,
-        },
-    );
-    const { recognized, unrecognized } = useSortedCoinsByCategories(coinBalances ?? []);
-
-    function openSendTokenPopup(coin: CoinBalance, address: string): void {
-        if (coinBalances) {
-            openPopup(
-                <SendCoinPopup
-                    coin={coin}
-                    senderAddress={address}
-                    onClose={closePopup}
-                    coins={coinBalances}
-                />,
-            );
-        }
-    }
-
-    return (
-        <div className="flex w-2/3 flex-col items-center space-y-2">
-            <h3>My Coins:</h3>
-            {recognized?.map((coin, index) => {
-                return (
-                    <CoinItem
-                        key={index}
-                        coinType={coin.coinType}
-                        balance={BigInt(coin.totalBalance)}
-                        onClick={() => openSendTokenPopup(coin, account?.address ?? '')}
-                    />
-                );
-            })}
-            <span>Unrecognized coins</span>
-            {unrecognized?.map((coin, index) => {
-                return (
-                    <CoinItem
-                        key={index}
-                        coinType={coin.coinType}
-                        balance={BigInt(coin.totalBalance)}
-                        onClick={() => openSendTokenPopup(coin, account?.address ?? '')}
-                    />
-                );
-            })}
-        </div>
-    );
-}
-
-export default MyCoins;
diff --git a/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx b/apps/wallet-dashboard/components/Dialogs/Staking/StakeDialog.tsx
similarity index 72%
rename from apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx
rename to apps/wallet-dashboard/components/Dialogs/Staking/StakeDialog.tsx
index 69c43eef735..d7e9d1cbc75 100644
--- a/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/NewStakePopup.tsx
+++ b/apps/wallet-dashboard/components/Dialogs/Staking/StakeDialog.tsx
@@ -20,11 +20,13 @@ import { useCurrentAccount, useSignAndExecuteTransaction } from '@iota/dapp-kit'
 import { IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
 import { NotificationType } from '@/stores/notificationStore';
 import { prepareObjectsForTimelockedStakingTransaction } from '@/lib/utils';
+import { Dialog, DialogBody, DialogContent, DialogPosition, Header } from '@iota/apps-ui-kit';
 
-interface NewStakePopupProps {
-    onClose: () => void;
+interface StakeDialogProps {
     isTimelockedStaking?: boolean;
     onSuccess?: (digest: string) => void;
+    isOpen: boolean;
+    setOpen: (bool: boolean) => void;
 }
 
 enum Step {
@@ -32,11 +34,12 @@ enum Step {
     EnterAmount,
 }
 
-function NewStakePopup({
-    onClose,
+function StakeDialog({
     onSuccess,
     isTimelockedStaking,
-}: NewStakePopupProps): JSX.Element {
+    isOpen,
+    setOpen,
+}: StakeDialogProps): JSX.Element {
     const [step, setStep] = useState<Step>(Step.SelectValidator);
     const [selectedValidator, setSelectedValidator] = useState<string>('');
     const [amount, setAmount] = useState<string>('');
@@ -109,7 +112,6 @@ function NewStakePopup({
             },
         )
             .then(() => {
-                onClose();
                 addNotification('Stake transaction has been sent');
             })
             .catch(() => {
@@ -118,22 +120,30 @@ function NewStakePopup({
     }
 
     return (
-        <div className="flex min-w-[300px] flex-col gap-2">
-            {step === Step.SelectValidator && (
-                <SelectValidatorView validators={validators} onSelect={handleValidatorSelect} />
-            )}
-            {step === Step.EnterAmount && (
-                <EnterAmountView
-                    selectedValidator={selectedValidator}
-                    amount={amount}
-                    onChange={(e) => setAmount(e.target.value)}
-                    onBack={handleBack}
-                    onStake={handleStake}
-                    isStakeDisabled={!amount}
-                />
-            )}
-        </div>
+        <Dialog open={isOpen} onOpenChange={setOpen}>
+            <DialogContent containerId="overlay-portal-container" position={DialogPosition.Right}>
+                <Header title="Receive" onClose={() => setOpen(false)} />
+                <DialogBody>
+                    {step === Step.SelectValidator && (
+                        <SelectValidatorView
+                            validators={validators}
+                            onSelect={handleValidatorSelect}
+                        />
+                    )}
+                    {step === Step.EnterAmount && (
+                        <EnterAmountView
+                            selectedValidator={selectedValidator}
+                            amount={amount}
+                            onChange={(e) => setAmount(e.target.value)}
+                            onBack={handleBack}
+                            onStake={handleStake}
+                            isStakeDisabled={!amount}
+                        />
+                    )}
+                </DialogBody>
+            </DialogContent>
+        </Dialog>
     );
 }
 
-export default NewStakePopup;
+export default StakeDialog;
diff --git a/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/index.ts b/apps/wallet-dashboard/components/Dialogs/Staking/index.ts
similarity index 55%
rename from apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/index.ts
rename to apps/wallet-dashboard/components/Dialogs/Staking/index.ts
index dde44a23020..1e5ad764bbc 100644
--- a/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/index.ts
+++ b/apps/wallet-dashboard/components/Dialogs/Staking/index.ts
@@ -1,4 +1,4 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-export { default as NewStakePopup } from './NewStakePopup';
+export { default as StakeDialog } from './StakeDialog';
diff --git a/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/views/EnterAmountView.tsx b/apps/wallet-dashboard/components/Dialogs/Staking/views/EnterAmountView.tsx
similarity index 100%
rename from apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/views/EnterAmountView.tsx
rename to apps/wallet-dashboard/components/Dialogs/Staking/views/EnterAmountView.tsx
diff --git a/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/views/SelectValidatorView.tsx b/apps/wallet-dashboard/components/Dialogs/Staking/views/SelectValidatorView.tsx
similarity index 100%
rename from apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/views/SelectValidatorView.tsx
rename to apps/wallet-dashboard/components/Dialogs/Staking/views/SelectValidatorView.tsx
diff --git a/apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/views/index.ts b/apps/wallet-dashboard/components/Dialogs/Staking/views/index.ts
similarity index 100%
rename from apps/wallet-dashboard/components/Popup/Popups/NewStakePopup/views/index.ts
rename to apps/wallet-dashboard/components/Dialogs/Staking/views/index.ts
diff --git a/apps/wallet-dashboard/components/Dialogs/index.ts b/apps/wallet-dashboard/components/Dialogs/index.ts
new file mode 100644
index 00000000000..3f350d11b78
--- /dev/null
+++ b/apps/wallet-dashboard/components/Dialogs/index.ts
@@ -0,0 +1,4 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+export * from './Staking';
diff --git a/apps/wallet-dashboard/components/ImageIcon.tsx b/apps/wallet-dashboard/components/ImageIcon.tsx
new file mode 100644
index 00000000000..06939516971
--- /dev/null
+++ b/apps/wallet-dashboard/components/ImageIcon.tsx
@@ -0,0 +1,80 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { useState } from 'react';
+import Image from 'next/image';
+import cn from 'clsx';
+
+export enum ImageIconSize {
+    Small = 'w-5 h-5',
+    Medium = 'w-8 h-8',
+    Large = 'w-10 h-10',
+    Full = 'w-full h-full',
+}
+
+interface FallBackAvatarProps {
+    text: string;
+    rounded?: boolean;
+    size?: ImageIconSize;
+}
+function FallBackAvatar({ text, rounded, size = ImageIconSize.Large }: FallBackAvatarProps) {
+    const textSize = (() => {
+        switch (size) {
+            case ImageIconSize.Small:
+                return 'text-label-sm';
+            case ImageIconSize.Medium:
+                return 'text-label-md';
+            case ImageIconSize.Large:
+                return 'text-title-md';
+            case ImageIconSize.Full:
+                return 'text-title-lg';
+        }
+    })();
+
+    return (
+        <div
+            className={cn(
+                'flex h-full w-full items-center justify-center bg-neutral-96 bg-gradient-to-r capitalize dark:bg-neutral-20',
+                { 'rounded-full': rounded },
+                textSize,
+            )}
+        >
+            {text.slice(0, 2)}
+        </div>
+    );
+}
+export interface ImageIconProps {
+    src: string | null | undefined;
+    label: string;
+    fallbackText: string;
+    alt?: string;
+    rounded?: boolean;
+    size?: ImageIconSize;
+}
+
+export function ImageIcon({
+    src,
+    label,
+    alt = label,
+    fallbackText,
+    rounded,
+    size,
+}: ImageIconProps) {
+    const [error, setError] = useState(false);
+    return (
+        <div role="img" aria-label={label} className={size}>
+            {error || !src ? (
+                <FallBackAvatar rounded={rounded} text={fallbackText} size={size} />
+            ) : (
+                <Image
+                    src={src}
+                    alt={alt}
+                    className="flex h-full w-full items-center justify-center rounded-full object-cover"
+                    onError={() => setError(true)}
+                    layout="fill"
+                    objectFit="cover"
+                />
+            )}
+        </div>
+    );
+}
diff --git a/apps/wallet-dashboard/components/Popup/Popups/index.ts b/apps/wallet-dashboard/components/Popup/Popups/index.ts
index 095ffa1220a..e91b80061b2 100644
--- a/apps/wallet-dashboard/components/Popup/Popups/index.ts
+++ b/apps/wallet-dashboard/components/Popup/Popups/index.ts
@@ -1,7 +1,6 @@
 // Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-export { default as NewStakePopup } from './NewStakePopup/NewStakePopup';
 export { default as TransactionDetailsPopup } from './TransactionDetailsPopup';
 export { default as StakeDetailsPopup } from './StakeDetailsPopup';
 export { default as UnstakePopup } from './UnstakePopup';
@@ -10,4 +9,3 @@ export { default as SendAssetPopup } from './SendAssetPopup';
 
 export * from './SendCoinPopup';
 export * from './VestingPopup';
-export * from './NewStakePopup';
diff --git a/apps/wallet-dashboard/components/account-balance/AccountBalance.tsx b/apps/wallet-dashboard/components/account-balance/AccountBalance.tsx
new file mode 100644
index 00000000000..23707407541
--- /dev/null
+++ b/apps/wallet-dashboard/components/account-balance/AccountBalance.tsx
@@ -0,0 +1,101 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { useCurrentAccount, useIotaClientContext, useIotaClientQuery } from '@iota/dapp-kit';
+import { formatAddress, IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
+import {
+    COINS_QUERY_REFETCH_INTERVAL,
+    COINS_QUERY_STALE_TIME,
+    filterAndSortTokenBalances,
+    useBalance,
+    useFormatCoin,
+} from '@iota/core';
+import { Address, Button, ButtonSize, ButtonType, Panel } from '@iota/apps-ui-kit';
+import { CoinBalance, getNetwork } from '@iota/iota-sdk/client';
+import { SendCoinPopup } from '../Popup';
+import { usePopups } from '@/hooks';
+import toast from 'react-hot-toast';
+
+export function AccountBalance() {
+    const account = useCurrentAccount();
+    const address = account?.address;
+    const { openPopup, closePopup } = usePopups();
+    const { network } = useIotaClientContext();
+    const { explorer } = getNetwork(network);
+    const { data: coinBalance, isPending } = useBalance(address!);
+    const formattedAddress = formatAddress(address!);
+    const [formatted, symbol] = useFormatCoin(coinBalance?.totalBalance, IOTA_TYPE_ARG);
+    const { data: coinBalances } = useIotaClientQuery(
+        'getAllBalances',
+        { owner: address! },
+        {
+            enabled: !!address,
+            staleTime: COINS_QUERY_STALE_TIME,
+            refetchInterval: COINS_QUERY_REFETCH_INTERVAL,
+            select: filterAndSortTokenBalances,
+        },
+    );
+    const explorerLink = `${explorer}/address/${address}`;
+
+    function openSendTokenPopup(coin: CoinBalance, address: string): void {
+        if (coinBalances) {
+            openPopup(
+                <SendCoinPopup
+                    coin={coin}
+                    senderAddress={address}
+                    onClose={closePopup}
+                    coins={coinBalances}
+                />,
+            );
+        }
+    }
+
+    function handleOnCopySuccess() {
+        toast.success('Address copied');
+    }
+
+    return (
+        <Panel>
+            {isPending && <p>Loading...</p>}
+            {!isPending && (
+                <div className="flex h-full flex-col items-center justify-center gap-y-lg p-lg">
+                    <div className="flex h-full flex-col items-center justify-center gap-y-xs">
+                        {address && (
+                            <Address
+                                text={formattedAddress}
+                                isCopyable
+                                copyText={address}
+                                isExternal
+                                externalLink={explorerLink}
+                                onCopySuccess={handleOnCopySuccess}
+                            />
+                        )}
+                        <span className="text-headline-lg text-neutral-10 dark:text-neutral-92">
+                            {formatted} {symbol}
+                        </span>
+                    </div>
+                    <div className="flex w-full max-w-56 gap-xs">
+                        <Button
+                            onClick={() =>
+                                coinBalance &&
+                                openSendTokenPopup(coinBalance, account?.address ?? '')
+                            }
+                            text="Send"
+                            size={ButtonSize.Small}
+                            disabled={!address}
+                            testId="send-coin-button"
+                            fullWidth
+                        />
+                        <Button
+                            onClick={() => {}}
+                            type={ButtonType.Secondary}
+                            text="Receive"
+                            size={ButtonSize.Small}
+                            fullWidth
+                        />
+                    </div>
+                </div>
+            )}
+        </Panel>
+    );
+}
diff --git a/apps/wallet-dashboard/components/coins/CoinIcon.tsx b/apps/wallet-dashboard/components/coins/CoinIcon.tsx
new file mode 100644
index 00000000000..a5c24107baa
--- /dev/null
+++ b/apps/wallet-dashboard/components/coins/CoinIcon.tsx
@@ -0,0 +1,45 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { useCoinMetadata } from '@iota/core';
+import { IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
+import { IotaLogoMark } from '@iota/ui-icons';
+import cx from 'clsx';
+import { ImageIcon, ImageIconSize } from '../ImageIcon';
+
+interface NonIotaCoinProps {
+    coinType: string;
+    size?: ImageIconSize;
+    rounded?: boolean;
+}
+
+function NonIotaCoin({ coinType, size = ImageIconSize.Full, rounded }: NonIotaCoinProps) {
+    const { data: coinMeta } = useCoinMetadata(coinType);
+    return (
+        <div className="flex h-full w-full items-center justify-center rounded-full bg-neutral-96 text-neutral-10 dark:bg-neutral-20 dark:text-neutral-100">
+            <ImageIcon
+                src={coinMeta?.iconUrl}
+                label={coinMeta?.name || coinType}
+                fallbackText={coinMeta?.name || coinType}
+                size={size}
+                rounded={rounded}
+            />
+        </div>
+    );
+}
+
+export interface CoinIconProps {
+    coinType: string;
+    size?: ImageIconSize;
+    rounded?: boolean;
+}
+
+export function CoinIcon({ coinType, size = ImageIconSize.Full, rounded }: CoinIconProps) {
+    return coinType === IOTA_TYPE_ARG ? (
+        <div className="flex h-full w-full items-center justify-center border border-shader-neutral-light-8 bg-neutral-100 text-neutral-10 dark:bg-neutral-0 dark:text-neutral-100">
+            <IotaLogoMark className={cx(size)} />
+        </div>
+    ) : (
+        <NonIotaCoin rounded={rounded} size={size} coinType={coinType} />
+    );
+}
diff --git a/apps/wallet-dashboard/components/coins/CoinItem.tsx b/apps/wallet-dashboard/components/coins/CoinItem.tsx
new file mode 100644
index 00000000000..29e8be5aa35
--- /dev/null
+++ b/apps/wallet-dashboard/components/coins/CoinItem.tsx
@@ -0,0 +1,61 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import {
+    Card,
+    CardAction,
+    CardActionType,
+    CardBody,
+    CardImage,
+    CardType,
+    ImageType,
+} from '@iota/apps-ui-kit';
+import { useFormatCoin } from '@iota/core';
+import { IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
+import { type ReactNode } from 'react';
+import { ImageIconSize } from '../ImageIcon';
+import { CoinIcon } from './CoinIcon';
+
+interface CoinItemProps {
+    coinType: string;
+    balance: bigint;
+    onClick?: () => void;
+    icon?: ReactNode;
+    clickableAction?: ReactNode;
+    usd?: number;
+}
+
+function CoinItem({
+    coinType,
+    balance,
+    onClick,
+    icon,
+    clickableAction,
+    usd,
+}: CoinItemProps): React.JSX.Element {
+    const [formatted, symbol, { data: coinMeta }] = useFormatCoin(balance, coinType);
+    const isIota = coinType === IOTA_TYPE_ARG;
+
+    return (
+        <Card type={CardType.Default} onClick={onClick}>
+            <CardImage type={ImageType.BgTransparent}>
+                <div className="flex h-10 w-10 items-center justify-center rounded-full ">
+                    <CoinIcon coinType={coinType} rounded size={ImageIconSize.Small} />
+                </div>
+            </CardImage>
+            <CardBody
+                title={isIota ? (coinMeta?.name || '').toUpperCase() : coinMeta?.name || symbol}
+                subtitle={symbol}
+                clickableAction={clickableAction}
+                icon={icon}
+            />
+            <CardAction
+                type={CardActionType.SupportingText}
+                title={`${formatted} ${symbol}`}
+                subtitle={usd?.toLocaleString('en-US')}
+            />
+        </Card>
+    );
+}
+
+export default CoinItem;
diff --git a/apps/wallet-dashboard/components/coins/MyCoins.tsx b/apps/wallet-dashboard/components/coins/MyCoins.tsx
new file mode 100644
index 00000000000..bf3a3d6a8f7
--- /dev/null
+++ b/apps/wallet-dashboard/components/coins/MyCoins.tsx
@@ -0,0 +1,145 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import React, { useState } from 'react';
+import { useCurrentAccount, useIotaClientQuery } from '@iota/dapp-kit';
+import { CoinItem, SendCoinPopup } from '@/components';
+import { usePopups } from '@/hooks';
+import { CoinBalance } from '@iota/iota-sdk/client';
+import {
+    COINS_QUERY_REFETCH_INTERVAL,
+    COINS_QUERY_STALE_TIME,
+    filterAndSortTokenBalances,
+    useSortedCoinsByCategories,
+} from '@iota/core';
+import {
+    ButtonSegment,
+    Panel,
+    SegmentedButton,
+    SegmentedButtonType,
+    Title,
+} from '@iota/apps-ui-kit';
+import { RecognizedBadge } from '@iota/ui-icons';
+
+enum TokenCategory {
+    All = 'All',
+    Recognized = 'Recognized',
+    Unrecognized = 'Unrecognized',
+}
+
+const TOKEN_CATEGORIES = [
+    {
+        label: 'All',
+        value: TokenCategory.All,
+    },
+    {
+        label: 'Recognized',
+        value: TokenCategory.Recognized,
+    },
+    {
+        label: 'Unrecognized',
+        value: TokenCategory.Unrecognized,
+    },
+];
+
+function MyCoins(): React.JSX.Element {
+    const [selectedTokenCategory, setSelectedTokenCategory] = useState(TokenCategory.All);
+
+    const { openPopup, closePopup } = usePopups();
+    const account = useCurrentAccount();
+    const activeAccountAddress = account?.address;
+
+    const { data: coinBalances } = useIotaClientQuery(
+        'getAllBalances',
+        { owner: activeAccountAddress! },
+        {
+            enabled: !!activeAccountAddress,
+            staleTime: COINS_QUERY_STALE_TIME,
+            refetchInterval: COINS_QUERY_REFETCH_INTERVAL,
+            select: filterAndSortTokenBalances,
+        },
+    );
+    const { recognized, unrecognized } = useSortedCoinsByCategories(coinBalances ?? []);
+
+    function openSendTokenPopup(coin: CoinBalance, address: string): void {
+        if (coinBalances) {
+            openPopup(
+                <SendCoinPopup
+                    coin={coin}
+                    senderAddress={address}
+                    onClose={closePopup}
+                    coins={coinBalances}
+                />,
+            );
+        }
+    }
+
+    return (
+        <Panel>
+            <div className="flex w-full flex-col">
+                <Title title="My Coins" />
+                <div className="px-sm pb-md pt-sm">
+                    <div className="inline-flex">
+                        <SegmentedButton type={SegmentedButtonType.Filled}>
+                            {TOKEN_CATEGORIES.map(({ label, value }) => {
+                                const recognizedButEmpty =
+                                    value === TokenCategory.Recognized ? !recognized.length : false;
+                                const notRecognizedButEmpty =
+                                    value === TokenCategory.Unrecognized
+                                        ? !unrecognized?.length
+                                        : false;
+
+                                return (
+                                    <ButtonSegment
+                                        key={value}
+                                        onClick={() => setSelectedTokenCategory(value)}
+                                        label={label}
+                                        selected={selectedTokenCategory === value}
+                                        disabled={recognizedButEmpty || notRecognizedButEmpty}
+                                    />
+                                );
+                            })}
+                        </SegmentedButton>
+                    </div>
+                    <div className="pb-md pt-sm">
+                        {[TokenCategory.All, TokenCategory.Recognized].includes(
+                            selectedTokenCategory,
+                        ) &&
+                            recognized?.map((coin, index) => {
+                                return (
+                                    <CoinItem
+                                        key={index}
+                                        coinType={coin.coinType}
+                                        balance={BigInt(coin.totalBalance)}
+                                        onClick={() =>
+                                            openSendTokenPopup(coin, account?.address ?? '')
+                                        }
+                                        icon={
+                                            <RecognizedBadge className="h-4 w-4 text-primary-40" />
+                                        }
+                                    />
+                                );
+                            })}
+                        {[TokenCategory.All, TokenCategory.Unrecognized].includes(
+                            selectedTokenCategory,
+                        ) &&
+                            unrecognized?.map((coin, index) => {
+                                return (
+                                    <CoinItem
+                                        key={index}
+                                        coinType={coin.coinType}
+                                        balance={BigInt(coin.totalBalance)}
+                                        onClick={() =>
+                                            openSendTokenPopup(coin, account?.address ?? '')
+                                        }
+                                    />
+                                );
+                            })}
+                    </div>
+                </div>
+            </div>
+        </Panel>
+    );
+}
+
+export default MyCoins;
diff --git a/apps/wallet-dashboard/components/Coins/index.ts b/apps/wallet-dashboard/components/coins/index.ts
similarity index 86%
rename from apps/wallet-dashboard/components/Coins/index.ts
rename to apps/wallet-dashboard/components/coins/index.ts
index d1519105eec..51468194c31 100644
--- a/apps/wallet-dashboard/components/Coins/index.ts
+++ b/apps/wallet-dashboard/components/coins/index.ts
@@ -3,3 +3,4 @@
 
 export { default as MyCoins } from './MyCoins';
 export { default as CoinItem } from './CoinItem';
+export * from './CoinIcon';
diff --git a/apps/wallet-dashboard/components/index.ts b/apps/wallet-dashboard/components/index.ts
index 92c10096966..3aad048346d 100644
--- a/apps/wallet-dashboard/components/index.ts
+++ b/apps/wallet-dashboard/components/index.ts
@@ -12,9 +12,11 @@ export { default as ExternalImage } from './ExternalImage';
 export { default as TransactionIcon } from './TransactionIcon';
 export { default as Dropdown } from './Dropdown';
 
-export * from './AccountBalance/AccountBalance';
-export * from './Coins';
+export * from './account-balance/AccountBalance';
+export * from './coins';
 export * from './Popup';
 export * from './AppList';
 export * from './Cards';
 export * from './Buttons';
+export * from './Dialogs';
+export * from './ImageIcon';
diff --git a/apps/wallet-dashboard/lib/constants/vesting.constants.ts b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
index 2dda152bd31..28bf1a4e026 100644
--- a/apps/wallet-dashboard/lib/constants/vesting.constants.ts
+++ b/apps/wallet-dashboard/lib/constants/vesting.constants.ts
@@ -28,7 +28,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0xfe755ca67e3a0714f97ec3c49cfc6f3ecdab2673d96b5840294d3a5db376c99',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1697320800000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -38,7 +38,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x682d14613231dd1dde39397977cdfafb6b6263b5683b6782348c597c104b834',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1698530400000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -48,7 +48,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x93f2bf2d044e45e1a85c010c22357892d1625436b8c95b26dcdb6f309319064',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1699740000000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -58,7 +58,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x44fa510ba216cd555ecd6b99d1ebd612f82e2bf421091c973bca49b064dc72b',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1700949600000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -68,7 +68,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0xacd861b6dc5d108af03655a2175545ac6d432c526bcbe294b90e722fa36b459',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1702159200000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -78,7 +78,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x8f9eeb5953c77d53dcff3057619af7a29be1d9ce67bf66c86ad5309379d17e5',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1703368800000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -88,7 +88,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x70b1063c1104760afc06df5217bebdf02f937e1aff51211fc0472e677ba8c74',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1704578400000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -98,7 +98,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0xb0aa6f655d08f630c15a2cfb4e3e13e307ce9d96c52c1e91c65a71a204819bd',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1705788000000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -108,7 +108,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x65224b9a3b9eadc55be4cb6efa363f283b924607496d60c02deef2aa6bf9e22',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1706997600000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -118,7 +118,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x68f9a2af0ebd0bcd9e3cc836ac7103670a9602e8dca8fd28e7b2b5a693898f2',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1708207200000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -128,7 +128,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x637e6b758efdb8d49ee96397ca909d579bb77b79f8b64e7e7f1af13ad4f7ce4',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1709416800000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -138,7 +138,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0xbd0f349c21b67faec992b6c9a1b9b6343b4ff1f2ad5f33b0b4cd0fc31be2b31',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1710626400000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -148,7 +148,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0xfb8c3539b22e4086bd03417027e70515e6fb6d18f366876ad5ad0d8da3bde0f',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1711836000000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -158,7 +158,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0xbfb7c1a941885cc55a191e579c7c6d5dc345d6b5b9cfa439f724a343d354032',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1713045600000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -168,7 +168,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x8935a904f90e23f6f453cb0c85a03859e07f1c9e5a5d1644b2fbe7005d8e158',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1714255200000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -178,7 +178,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x73be6f8df4b73b83f8ccf909d61aabb56c56c56aa597d2806eccf3ab4fac66b',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1715464800000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -188,7 +188,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x20075cc2ebd5fa6e069829e58e55e6e010ad115e8cbc48d7a3d98d079ce649a',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1716674400000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -198,7 +198,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0xce03433d496cb231ead90a661fe08b924eb9b0cfb43dd560ea02a8060f6afd0',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1717884000000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -208,7 +208,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0xf111b8705ba276f8c6b76bdf72a4a46889cb8207cc5a80d3df0f40d9576116a',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1719093600000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -218,7 +218,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0xbc27940fb9c6f96ae9e2c11ad151446e30de5281172e48aac7f600d1da92c10',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1720303200000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -228,7 +228,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x016fae8797d3d12a26e215ec1815ee8adce70bb93149b4d55eb06a81c476ff9',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1721512800000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -238,7 +238,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x06f1e354ff551d76da8dc890eab728a65319defb3608991b4c70a1a2b30e8f1',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1722722400000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -248,7 +248,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0xc4cf3ea32480aab7d78784c6f00b9210ce0ffaabbcbb8cddd846073e7455386',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1723932000000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -258,7 +258,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x6dc10a8008855549b8d92e7704c799253a953d9835af001970426414fdd3ba7',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1725141600000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -268,7 +268,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0xa5f7a66c575db3f74c5fe7043c28f7231a2127aec4dc2de88f5b9d3cf020511',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1726351200000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -278,7 +278,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0xde0a4c2e0f16541983302c596339815ffa4d4743509e8115bc06fcf7f71ea8f',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1727560800000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -288,7 +288,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0xccc5d23ab69789b934b9bf7f5006e43eef45c2d7a251e3eec8b7dd24bc20a07',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1728770400000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -298,7 +298,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x503dc8844b0cd6e74e735433751328e8283569e81b4602aaa6941ce3fe826bb',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1729980000000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -308,7 +308,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x0fac98b5ac955644dffa0700933aababe438fae6fc58b8a4bd1f740c8aba941',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1731189600000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -318,7 +318,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x756483e3c7dd3491ea405f682df6c5dc1e4a59d8b5c9725b0d194815a25ea95',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1732399200000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -328,7 +328,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x72c4318876f51bed94c2228b395d18f5dce5f243039c7e3d8fad690dfe918fc',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1733608800000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -338,7 +338,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x37f68fd72af05b4c923268b64a0baa7511f27bc4cbd90641e444e7116f02604',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1734818400000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
@@ -348,7 +348,7 @@ export const MOCKED_SUPPLY_INCREASE_VESTING_TIMELOCKED_OBJECTS: TimelockedObject
             id: '0x97bedf66e48392a0b9baf8a8280e72fcce9b32ff980832edfe1a90a14ce9047',
         },
         locked: {
-            value: 1000,
+            value: 2_000_000_000,
         },
         expirationTimestampMs: 1736028000000,
         label: SUPPLY_INCREASE_VESTING_LABEL,
diff --git a/apps/wallet-dashboard/lib/utils/growthbook.ts b/apps/wallet-dashboard/lib/utils/growthbook.ts
new file mode 100644
index 00000000000..ee2eed0addf
--- /dev/null
+++ b/apps/wallet-dashboard/lib/utils/growthbook.ts
@@ -0,0 +1,11 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+import { GrowthBook } from '@growthbook/growthbook';
+import { getAppsBackend } from '@iota/iota-sdk/client';
+
+export const growthbook = new GrowthBook({
+    apiHost: getAppsBackend(),
+    clientKey: process.env.NODE_ENV === 'production' ? 'production' : 'development',
+    enableDevMode: process.env.NODE_ENV === 'development',
+});
diff --git a/apps/wallet-dashboard/lib/utils/index.ts b/apps/wallet-dashboard/lib/utils/index.ts
index d52fd5f097b..78b0f2eb9c5 100644
--- a/apps/wallet-dashboard/lib/utils/index.ts
+++ b/apps/wallet-dashboard/lib/utils/index.ts
@@ -6,3 +6,4 @@ export * from './vesting';
 export * from './time';
 export * from './timelock';
 export * from './transaction';
+export * from './growthbook';
diff --git a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
index 157914ecca9..da2a5bbe80e 100644
--- a/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
+++ b/apps/wallet-dashboard/lib/utils/vesting/vesting.ts
@@ -175,7 +175,8 @@ export function getVestingOverview(
     );
     const totalAvailableStakingAmount = timelockedObjects.reduce(
         (acc, current) =>
-            current.expirationTimestampMs > currentEpochTimestamp
+            current.expirationTimestampMs > currentEpochTimestamp &&
+            current.locked.value > MIN_STAKING_THRESHOLD
                 ? acc + current.locked.value
                 : acc,
         0,
diff --git a/apps/wallet-dashboard/package.json b/apps/wallet-dashboard/package.json
index 6807f6fda94..9093f6da53e 100644
--- a/apps/wallet-dashboard/package.json
+++ b/apps/wallet-dashboard/package.json
@@ -15,6 +15,8 @@
         "node": ">= v18.17.0"
     },
     "dependencies": {
+        "@growthbook/growthbook": "^1.0.0",
+        "@growthbook/growthbook-react": "^1.0.0",
         "@iota/apps-ui-kit": "workspace:*",
         "@iota/core": "workspace:*",
         "@iota/dapp-kit": "workspace:*",
@@ -25,6 +27,7 @@
         "clsx": "^2.1.1",
         "next": "14.2.10",
         "react": "^18.3.1",
+        "react-hot-toast": "^2.4.1",
         "zustand": "^4.4.1"
     },
     "devDependencies": {
diff --git a/apps/wallet/src/ui/app/shared/dapp-status/index.tsx b/apps/wallet/src/ui/app/shared/dapp-status/index.tsx
index 9be9679f472..dd6901acbb8 100644
--- a/apps/wallet/src/ui/app/shared/dapp-status/index.tsx
+++ b/apps/wallet/src/ui/app/shared/dapp-status/index.tsx
@@ -109,7 +109,7 @@ function DappStatus() {
                         ref={refs.setFloating}
                     >
                         <div className="flex flex-col items-center gap-xs">
-                            <div className="flex flex-row items-start gap-xs">
+                            <div className="flex w-full flex-row items-start gap-xs">
                                 {activeOriginFavIcon ? (
                                     <div className="h-7 w-7 shrink-0 rounded-full border border-shader-neutral-light-8 p-xxs">
                                         <img
@@ -129,13 +129,13 @@ function DappStatus() {
                                 </div>
                             </div>
                             <Loading loading={disconnecting}>
-                                <div className="self-end">
+                                <div className="self-center">
                                     <Button
                                         onClick={handleDisconnect}
                                         disabled={disconnecting}
                                         size={ButtonSize.Small}
                                         text="Disconnect App"
-                                        type={ButtonType.Ghost}
+                                        type={ButtonType.Destructive}
                                     />
                                 </div>
                             </Loading>
diff --git a/crates/iota-adapter-transactional-tests/Cargo.toml b/crates/iota-adapter-transactional-tests/Cargo.toml
index e83a36b63e7..cbbf533c426 100644
--- a/crates/iota-adapter-transactional-tests/Cargo.toml
+++ b/crates/iota-adapter-transactional-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-adapter-transactional-tests"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-authority-aggregation/Cargo.toml b/crates/iota-authority-aggregation/Cargo.toml
index d3806d75bbf..96933a2db1a 100644
--- a/crates/iota-authority-aggregation/Cargo.toml
+++ b/crates/iota-authority-aggregation/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-authority-aggregation"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-aws-orchestrator/Cargo.toml b/crates/iota-aws-orchestrator/Cargo.toml
index 9f1feb3fb82..f1e379bf55f 100644
--- a/crates/iota-aws-orchestrator/Cargo.toml
+++ b/crates/iota-aws-orchestrator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-aws-orchestrator"
-version = "0.0.1"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-aws-orchestrator/README.md b/crates/iota-aws-orchestrator/README.md
index cf0d8289bd8..f7c4016aabb 100644
--- a/crates/iota-aws-orchestrator/README.md
+++ b/crates/iota-aws-orchestrator/README.md
@@ -90,22 +90,7 @@ Instances listed with a green number are available and ready for use, while inst
 Also keep in mind that there is nothing stopping you from running the `deploy` command multiple times if you find your self
 needing more instances down the line.
 
-## Step 4. Choose protocol
-
-There is support to benchmark either Iota or Narwhal only. To choose which protocol to benchmark, you can set the `Protocol` & `BenchmarkType` field [here](https://github.com/iotaledger/iota/blob/develop/crates/iota-aws-orchestrator/src/main.rs#L33-L34)
-
-```
-// Iota
-use protocol::iota::{IotaBenchmarkType, IotaProtocol};
-type Protocol = IotaProtocol;
-type BenchmarkType = IotaBenchmarkType;
-// Narwhal
-use protocol::narwhal::{NarwhalBenchmarkType, NarwhalProtocol};
-type Protocol = NarwhalProtocol;
-type BenchmarkType = NarwhalBenchmarkType;
-```
-
-## Step 5. Running benchmarks
+## Step 4. Running benchmarks
 
 Running benchmarks involves installing the specified version of the codebase on the remote machines and running one validator and one load generator per instance. For example, the following command benchmarks a committee of 10 validators under a constant load of 200 tx/s for 3 minutes:
 
@@ -115,7 +100,7 @@ cargo run --bin iota-aws-orchestrator -- benchmark --committee 10 fixed-load --l
 
 In a network of 10 validators, each with a corresponding load generator, each load generator submits a fixed load of 20 tx/s. Performance measurements are collected by regularly scraping the Prometheus metrics exposed by the load generators. The `iota-aws-orchestrator` binary provides additional commands to run a specific number of load generators on separate machines.
 
-## Step 6. Monitoring
+## Step 5. Monitoring
 
 The orchestrator provides facilities to monitor metrics on clients and nodes. The orchestrator deploys a [Prometheus](https://prometheus.io) instance and a [Grafana](https://grafana.com) instance on a dedicated remote machine. Grafana is then available on the address printed on stdout (e.g., `http://3.83.97.12:3000`) with the default username and password both set to `admin`. You can either create a [new dashboard](https://grafana.com/docs/grafana/latest/getting-started/build-first-dashboard/) or [import](https://grafana.com/docs/grafana/latest/dashboards/manage-dashboards/#import-a-dashboard) the example dashboards located in the `./assets` folder.
 
diff --git a/crates/iota-aws-orchestrator/assets/grafana-dashboard-narwhal-only.json b/crates/iota-aws-orchestrator/assets/grafana-dashboard-narwhal-only.json
deleted file mode 100644
index 8e841c72a12..00000000000
--- a/crates/iota-aws-orchestrator/assets/grafana-dashboard-narwhal-only.json
+++ /dev/null
@@ -1,6604 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": {
-          "type": "grafana",
-          "uid": "-- Grafana --"
-        },
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "target": {
-          "limit": 100,
-          "matchAny": false,
-          "tags": [],
-          "type": "dashboard"
-        },
-        "type": "dashboard"
-      }
-    ]
-  },
-  "description": "",
-  "editable": true,
-  "fiscalYearStartMonth": 0,
-  "graphTooltip": 0,
-  "id": 1,
-  "links": [],
-  "liveNow": false,
-  "panels": [
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "id": 266,
-      "panels": [],
-      "title": "Client",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 0,
-        "y": 1
-      },
-      "id": 268,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "disableTextWrap": false,
-          "editorMode": "code",
-          "expr": "sum(rate(narwhal_client_num_submitted{job=~\"$validator\"}[$__rate_interval]))",
-          "fullMetaSearch": false,
-          "hide": false,
-          "includeNullMetadata": true,
-          "legendFormat": "num_submitted",
-          "range": true,
-          "refId": "B",
-          "useBackend": false
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "sum(rate(num_success{job=~\"$validator\"}[$__rate_interval]))",
-          "fullMetaSearch": false,
-          "hide": false,
-          "includeNullMetadata": true,
-          "instant": false,
-          "legendFormat": "num_success",
-          "range": true,
-          "refId": "A",
-          "useBackend": false
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "sum by() (rate(num_error{job=~\"$validator\"}[$__interval]))",
-          "fullMetaSearch": false,
-          "hide": false,
-          "includeNullMetadata": true,
-          "instant": false,
-          "legendFormat": "num_error",
-          "range": true,
-          "refId": "C",
-          "useBackend": false
-        }
-      ],
-      "title": "Client TPS",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 8,
-        "y": 1
-      },
-      "id": 270,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "disableTextWrap": false,
-          "editorMode": "code",
-          "expr": "avg(rate(consensus_output_transactions{job=~\"$validator\"}[$__rate_interval]))",
-          "fullMetaSearch": false,
-          "hide": false,
-          "includeNullMetadata": true,
-          "legendFormat": "num_submitted",
-          "range": true,
-          "refId": "B",
-          "useBackend": false
-        }
-      ],
-      "title": "Consensus TPS",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 1
-      },
-      "id": 269,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "disableTextWrap": false,
-          "editorMode": "code",
-          "expr": "avg(benchmark_duration{job=~\"$validator\"})",
-          "fullMetaSearch": false,
-          "hide": false,
-          "includeNullMetadata": true,
-          "instant": false,
-          "legendFormat": "benchmark_duration",
-          "range": true,
-          "refId": "A",
-          "useBackend": false
-        }
-      ],
-      "title": "Duration",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 11
-      },
-      "id": 78,
-      "panels": [],
-      "title": "Health overview",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "Fixed-UID-testbed"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "dashed+area"
-            }
-          },
-          "mappings": [],
-          "min": 0.5,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 0.667
-              }
-            ]
-          },
-          "unit": "percentunit"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 0,
-        "y": 12
-      },
-      "id": 258,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "Fixed-UID-testbed"
-          },
-          "editorMode": "code",
-          "expr": "sum(current_voting_right{job=~\"$validator\"} and rate(current_round{job=~\"$validator\"}[$__interval]) > 0) / 10000",
-          "instant": false,
-          "legendFormat": "{{label_name}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Percentage of stake that increments consensus rounds",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The rate of the current round growth. This is reported by the proposer - which forms the next header to be broadcasted by a node.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Round / sec",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 8,
-        "y": 12
-      },
-      "id": 81,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by(job) (rate(current_round{job=~\"$validator\"}[5m]))",
-          "hide": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Current round growth speed",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The current round the node is in. This is reported by the proposer - which forms the next header to be broadcasted by a node. The numbers across the nodes shouldn't differ much - if not the same.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Round",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "dash": [
-                0,
-                10
-              ],
-              "fill": "dot"
-            },
-            "lineWidth": 2,
-            "pointSize": 6,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 12
-      },
-      "id": 26,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by(job) (current_round{job=~\"$validator\"})",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Current round (timeline)",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "Fixed-UID-testbed"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percentunit"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 0,
-        "y": 22
-      },
-      "id": 260,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "Fixed-UID-testbed"
-          },
-          "editorMode": "code",
-          "expr": "current_voting_right{job=~\"$validator\"} / 10000",
-          "instant": false,
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Voting power distribution",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Epoch number",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 2,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "line+area"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "transparent",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 8,
-        "y": 22
-      },
-      "id": 197,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "current_epoch{job=~\"$validator\"}",
-          "hide": false,
-          "legendFormat": "{{host}}",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Current Epoch",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Num of primary peers connected per host",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Num peers connected",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "dash": [
-                0,
-                10
-              ],
-              "fill": "dot"
-            },
-            "lineWidth": 3,
-            "pointSize": 6,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "line+area"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "transparent",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 22
-      },
-      "id": 244,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (job) (primary_network_peer_connected{job=~\"$validator\", type=\"other_primary\"})",
-          "hide": false,
-          "legendFormat": "{{label_name}}",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Primary network connectivity",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Shows the lag (diff) between the median reported last committed round and the specific host's last committed round. The color scheme shows how far behind nodes are.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {
-            "fillOpacity": 70,
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineWidth": 1
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "dark-green"
-              },
-              {
-                "color": "yellow",
-                "value": 100
-              },
-              {
-                "color": "orange",
-                "value": 150
-              },
-              {
-                "color": "red",
-                "value": 200
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 25,
-        "w": 8,
-        "x": 0,
-        "y": 32
-      },
-      "id": 185,
-      "interval": "2m",
-      "options": {
-        "colWidth": 0.9,
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "rowHeight": 0.9,
-        "showValue": "never",
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.2.5",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by(job) (last_committed_round{job=~\"$validator\"})",
-          "format": "time_series",
-          "hide": true,
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "quantile(0.5, last_committed_round{job=~\"$validator\"})",
-          "format": "time_series",
-          "hide": true,
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "conditions": [
-            {
-              "evaluator": {
-                "params": [
-                  0,
-                  0
-                ],
-                "type": "gt"
-              },
-              "operator": {
-                "type": "and"
-              },
-              "query": {
-                "params": []
-              },
-              "reducer": {
-                "params": [],
-                "type": "avg"
-              },
-              "type": "query"
-            }
-          ],
-          "datasource": {
-            "name": "Expression",
-            "type": "__expr__",
-            "uid": "__expr__"
-          },
-          "expression": "$B - $A",
-          "hide": false,
-          "reducer": "max",
-          "refId": "*",
-          "type": "math"
-        }
-      ],
-      "title": "Last commit round lag",
-      "type": "status-history"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The nodes that are proposing in rounds during time. When a node advances a round then this will be a green box with \"YES\" text in it. Otherwise a red box with \"NO\" text will be rendered",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {
-            "fillOpacity": 70,
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineWidth": 1
-          },
-          "mappings": [
-            {
-              "options": {
-                "from": 1.5,
-                "result": {
-                  "color": "dark-green",
-                  "index": 0
-                },
-                "to": 1000
-              },
-              "type": "range"
-            },
-            {
-              "options": {
-                "from": 1,
-                "result": {
-                  "color": "super-light-green",
-                  "index": 1
-                },
-                "to": 1.5
-              },
-              "type": "range"
-            },
-            {
-              "options": {
-                "from": 0.5,
-                "result": {
-                  "color": "yellow",
-                  "index": 2
-                },
-                "to": 1
-              },
-              "type": "range"
-            },
-            {
-              "options": {
-                "from": 0.1,
-                "result": {
-                  "color": "orange",
-                  "index": 3
-                },
-                "to": 0.5
-              },
-              "type": "range"
-            },
-            {
-              "options": {
-                "from": 0,
-                "result": {
-                  "color": "red",
-                  "index": 4
-                },
-                "to": 0.1
-              },
-              "type": "range"
-            },
-            {
-              "options": {
-                "match": "null+nan",
-                "result": {
-                  "color": "transparent",
-                  "index": 5
-                }
-              },
-              "type": "special"
-            }
-          ],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red"
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 25,
-        "w": 8,
-        "x": 8,
-        "y": 32
-      },
-      "id": 184,
-      "interval": "2m",
-      "options": {
-        "colWidth": 0.9,
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "rowHeight": 0.9,
-        "showValue": "never",
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by (job) (rate(certificates_created{job=~\"$validator\"}[5m]))",
-          "format": "time_series",
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Nodes proposing certified headers",
-      "type": "status-history"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {
-            "fillOpacity": 70,
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineWidth": 1
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "dark-red"
-              },
-              {
-                "color": "dark-orange",
-                "value": 70
-              },
-              {
-                "color": "dark-yellow",
-                "value": 80
-              },
-              {
-                "color": "dark-green",
-                "value": 90
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 25,
-        "w": 8,
-        "x": 16,
-        "y": 32
-      },
-      "id": 203,
-      "options": {
-        "colWidth": 0.9,
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "rowHeight": 0.9,
-        "showValue": "never",
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.2.5",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": " sum by(job) (primary_network_peer_connected{job=~\"$validator\", type=\"other_primary\"})",
-          "interval": "2m",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Primary connected to other primaries (number)",
-      "type": "status-history"
-    },
-    {
-      "collapsed": true,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 57
-      },
-      "id": 43,
-      "panels": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "description": "Consensus ordering attempts per sec",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisBorderShow": false,
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "txn / sec",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "insertNulls": false,
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              }
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 10,
-            "w": 8,
-            "x": 0,
-            "y": 47
-          },
-          "id": 69,
-          "interval": "1m",
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
-            }
-          },
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${Environment}"
-              },
-              "editorMode": "code",
-              "expr": "quantile(0.5, sum by (job) (rate(sequencing_certificate_attempt{job=~\"$validator\"}[5m])))",
-              "legendFormat": "Consensus adapter input rate",
-              "range": true,
-              "refId": "A"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${Environment}"
-              },
-              "editorMode": "code",
-              "expr": "quantile(0.5, sum (rate(sequencing_acknowledge_latency_count{job=~\"$validator\"}[5m])))",
-              "hide": false,
-              "legendFormat": "NW input rate",
-              "range": true,
-              "refId": "B"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${Environment}"
-              },
-              "editorMode": "code",
-              "expr": "quantile(0.5, sum by (job) (rate(consensus_handler_processed{job=~\"$validator\"}[5m])))",
-              "hide": false,
-              "legendFormat": "NW output rate",
-              "range": true,
-              "refId": "C"
-            }
-          ],
-          "title": "Input / output rate",
-          "type": "timeseries"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "Fixed-UID-testbed"
-          },
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisBorderShow": false,
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "insertNulls": false,
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              },
-              "unit": "s"
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 10,
-            "w": 8,
-            "x": 8,
-            "y": 47
-          },
-          "id": 256,
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
-            }
-          },
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "Fixed-UID-testbed"
-              },
-              "editorMode": "code",
-              "expr": "clamp(quantile(0.67, histogram_quantile(0.5, sum(rate(sequencing_certificate_latency_bucket{job=~\"$validator\"}[5m])) by(job, le))), 0, 30)",
-              "instant": false,
-              "legendFormat": "p50",
-              "range": true,
-              "refId": "A"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "Fixed-UID-testbed"
-              },
-              "editorMode": "code",
-              "expr": "clamp(quantile(0.67, histogram_quantile(0.95, sum(rate(sequencing_certificate_latency_bucket{job=~\"$validator\"}[5m])) by(job, le))), 0, 30)",
-              "hide": false,
-              "instant": false,
-              "legendFormat": "p95",
-              "range": true,
-              "refId": "B"
-            }
-          ],
-          "title": "p50 and p95 Consensus Adapter e2e latency",
-          "type": "timeseries"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "Fixed-UID-testbed"
-          },
-          "description": "Percentage of requests that got submitted more than once",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisBorderShow": false,
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 10,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "insertNulls": false,
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "normal"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              },
-              "unit": "percentunit"
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 10,
-            "w": 8,
-            "x": 16,
-            "y": 47
-          },
-          "id": 212,
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
-            }
-          },
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "Fixed-UID-testbed"
-              },
-              "editorMode": "code",
-              "expr": "sum (rate(sequencing_certificate_latency_count{job=~\"$validator\", position=\"1\"}[5m]))\n/\nsum (rate(sequencing_certificate_latency_count{job=~\"$validator\", position!=\"not_submitted\"}[5m]))",
-              "hide": false,
-              "legendFormat": "Attempt #2",
-              "range": true,
-              "refId": "B"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "Fixed-UID-testbed"
-              },
-              "editorMode": "code",
-              "expr": "sum (rate(sequencing_certificate_latency_count{job=~\"$validator\", position=\"2\"}[5m]))\n/\nsum (rate(sequencing_certificate_latency_count{job=~\"$validator\", position!=\"not_submitted\"}[5m]))",
-              "hide": false,
-              "legendFormat": "Attempt #3",
-              "range": true,
-              "refId": "C"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "Fixed-UID-testbed"
-              },
-              "editorMode": "code",
-              "expr": "sum (rate(sequencing_certificate_latency_count{job=~\"$validator\", position=\"3\"}[5m]))\n/\nsum (rate(sequencing_certificate_latency_count{job=~\"$validator\", position!=\"not_submitted\"}[5m]))",
-              "hide": false,
-              "legendFormat": "Attempt #4",
-              "range": true,
-              "refId": "A"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "Fixed-UID-testbed"
-              },
-              "editorMode": "code",
-              "expr": "sum (rate(sequencing_certificate_latency_count{job=~\"$validator\", position=\"4\"}[5m]))\n/\nsum (rate(sequencing_certificate_latency_count{job=~\"$validator\", position!=\"not_submitted\"}[5m]))",
-              "hide": false,
-              "legendFormat": "Attempt #5",
-              "range": true,
-              "refId": "D"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "Fixed-UID-testbed"
-              },
-              "editorMode": "code",
-              "expr": "sum (rate(sequencing_certificate_latency_count{job=~\"$validator\", position!~\"(0|1|2|3|4|not_submitted)\"}[5m]))\n/\nsum (rate(sequencing_certificate_latency_count{job=~\"$validator\", position!=\"not_submitted\"}[5m]))",
-              "hide": false,
-              "legendFormat": "Attempt #6+",
-              "range": true,
-              "refId": "E"
-            }
-          ],
-          "title": "Submission amplification",
-          "type": "timeseries"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "description": "Ideally we want the low-score NW validators to not submit transactions",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisBorderShow": false,
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "Transactions / sec",
-                "axisPlacement": "left",
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "insertNulls": false,
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "decimals": 1,
-              "mappings": [],
-              "min": 0,
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              },
-              "unit": "ops"
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 10,
-            "w": 8,
-            "x": 0,
-            "y": 57
-          },
-          "id": 45,
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": false
-            },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
-            }
-          },
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${Environment}"
-              },
-              "editorMode": "code",
-              "expr": "sum by (job) (rate(sequencing_acknowledge_latency_count{job=~\"$validator\"}[5m]))",
-              "hide": false,
-              "legendFormat": "__auto",
-              "range": true,
-              "refId": "B"
-            }
-          ],
-          "title": "Submission rate by authority",
-          "type": "timeseries"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisBorderShow": false,
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "insertNulls": false,
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "blue"
-                  },
-                  {
-                    "color": "#6ED0E0",
-                    "value": 1
-                  },
-                  {
-                    "color": "purple",
-                    "value": 100
-                  },
-                  {
-                    "color": "#EAB839",
-                    "value": 200
-                  }
-                ]
-              }
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 10,
-            "w": 8,
-            "x": 8,
-            "y": 57
-          },
-          "id": 233,
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
-            }
-          },
-          "pluginVersion": "9.4.7",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${Environment}"
-              },
-              "editorMode": "code",
-              "expr": "avg by (authority) (consensus_handler_scores{job=~\"$validator\"})",
-              "legendFormat": "__auto",
-              "range": true,
-              "refId": "A"
-            }
-          ],
-          "title": "Avg score per host",
-          "type": "timeseries"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "thresholds"
-              },
-              "custom": {
-                "fillOpacity": 70,
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "insertNulls": false,
-                "lineWidth": 0,
-                "spanNulls": false
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "dark-red"
-                  },
-                  {
-                    "color": "red",
-                    "value": 50
-                  },
-                  {
-                    "color": "orange",
-                    "value": 100
-                  },
-                  {
-                    "color": "green",
-                    "value": 200
-                  }
-                ]
-              }
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 10,
-            "w": 8,
-            "x": 16,
-            "y": 57
-          },
-          "id": 241,
-          "options": {
-            "alignValue": "left",
-            "legend": {
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "mergeValues": true,
-            "rowHeight": 0.9,
-            "showValue": "auto",
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
-            }
-          },
-          "pluginVersion": "9.4.7",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${Environment}"
-              },
-              "editorMode": "code",
-              "expr": "avg by (authority) (consensus_handler_scores{job=~\"$validator\"})",
-              "legendFormat": "{{authority}}",
-              "range": true,
-              "refId": "A"
-            }
-          ],
-          "title": "Score per host change",
-          "transformations": [
-            {
-              "id": "renameByRegex",
-              "options": {
-                "regex": "PeerId\\(([a-z0-9]{5}).*\\)",
-                "renamePattern": "$1..."
-              }
-            }
-          ],
-          "type": "state-timeline"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "description": "As reported by consensus handler to every host",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "blue"
-                  },
-                  {
-                    "color": "#6ED0E0",
-                    "value": 1
-                  },
-                  {
-                    "color": "purple",
-                    "value": 100
-                  },
-                  {
-                    "color": "#EAB839",
-                    "value": 200
-                  }
-                ]
-              }
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 10,
-            "w": 8,
-            "x": 0,
-            "y": 67
-          },
-          "id": 240,
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": false
-            },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
-            }
-          },
-          "pluginVersion": "9.4.7",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${Environment}"
-              },
-              "editorMode": "code",
-              "expr": "avg by (job) (consensus_handler_num_low_scoring_authorities{job=~\"$validator\"})",
-              "legendFormat": "{{host}}",
-              "range": true,
-              "refId": "A"
-            }
-          ],
-          "title": "Num low scoring authorities",
-          "type": "timeseries"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "description": "",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "blue"
-                  },
-                  {
-                    "color": "#6ED0E0",
-                    "value": 1
-                  },
-                  {
-                    "color": "purple",
-                    "value": 100
-                  },
-                  {
-                    "color": "#EAB839",
-                    "value": 200
-                  }
-                ]
-              }
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 10,
-            "w": 8,
-            "x": 8,
-            "y": 67
-          },
-          "id": 265,
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": false
-            },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
-            }
-          },
-          "pluginVersion": "9.4.7",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${Environment}"
-              },
-              "editorMode": "code",
-              "expr": "avg by (job) (num_of_bad_nodes{job=~\"$validator\"})",
-              "legendFormat": "{{host}}",
-              "range": true,
-              "refId": "A"
-            }
-          ],
-          "title": "Num of bad nodes",
-          "type": "timeseries"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "description": "This is a median value across validators",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "normal"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              },
-              "unit": "s"
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 10,
-            "w": 8,
-            "x": 16,
-            "y": 67
-          },
-          "id": 228,
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
-            }
-          },
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${Environment}"
-              },
-              "editorMode": "code",
-              "expr": "quantile(0.5, histogram_quantile(0.95, sum by(le, job) (rate(created_batch_latency_bucket{job=~\"$validator\"}[5m]))))",
-              "hide": false,
-              "legendFormat": "batch_creation",
-              "range": true,
-              "refId": "B"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${Environment}"
-              },
-              "editorMode": "code",
-              "expr": "quantile(0.5, histogram_quantile(0.95, sum by(le, job) (rate(proposer_batch_latency_bucket{job=~\"$validator\"}[5m]))))",
-              "hide": false,
-              "legendFormat": "batch_to_header",
-              "range": true,
-              "refId": "A"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${Environment}"
-              },
-              "editorMode": "code",
-              "expr": "quantile(0.5, histogram_quantile(0.95, sum by(job,le) (rate(header_to_certificate_latency_bucket{job=~\"$validator\"}[5m]))))",
-              "hide": false,
-              "legendFormat": "header_to_cert",
-              "range": true,
-              "refId": "C"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${Environment}"
-              },
-              "editorMode": "code",
-              "expr": "quantile(0.5, histogram_quantile(0.95, sum by(job,le) (rate(certificate_commit_latency_bucket{job=~\"$validator\"}[5m]))))",
-              "hide": false,
-              "legendFormat": "cert_to_commit",
-              "range": true,
-              "refId": "D"
-            }
-          ],
-          "title": "p95: txn to commit stacked breakdown",
-          "type": "timeseries"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "description": "Individual submissions by each authority",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "blue"
-                  },
-                  {
-                    "color": "#6ED0E0",
-                    "value": 1
-                  },
-                  {
-                    "color": "purple",
-                    "value": 100
-                  },
-                  {
-                    "color": "#EAB839",
-                    "value": 200
-                  }
-                ]
-              }
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 10,
-            "w": 8,
-            "x": 0,
-            "y": 77
-          },
-          "id": 242,
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
-            }
-          },
-          "pluginVersion": "9.4.7",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${Environment}"
-              },
-              "editorMode": "code",
-              "expr": "quantile(0.5, sequencing_in_flight_submissions{job=~\"$validator\"})",
-              "hide": false,
-              "legendFormat": "p50",
-              "range": true,
-              "refId": "B"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${Environment}"
-              },
-              "editorMode": "code",
-              "expr": "quantile(0.75, sequencing_in_flight_submissions{job=~\"$validator\"})",
-              "hide": false,
-              "legendFormat": "p75",
-              "range": true,
-              "refId": "A"
-            }
-          ],
-          "title": "Inflight submissions per validator",
-          "type": "timeseries"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "description": "Each authority is doing latency estimates in order to determine the retry intervals.",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              },
-              "unit": "dtdurationms"
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 10,
-            "w": 8,
-            "x": 8,
-            "y": 77
-          },
-          "id": 237,
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": false
-            },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
-            }
-          },
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${Environment}"
-              },
-              "editorMode": "code",
-              "expr": "clamp(sequencing_estimated_latency{job=~\"$validator\"}, 0, 60000)",
-              "hide": false,
-              "legendFormat": "{{host}}",
-              "range": true,
-              "refId": "B"
-            }
-          ],
-          "title": "Consensus Adapter latency estimates",
-          "type": "timeseries"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "description": "",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "Load Fractions",
-                "axisPlacement": "left",
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "lineInterpolation": "linear",
-                "lineWidth": 1,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "off"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "green"
-                  },
-                  {
-                    "color": "red",
-                    "value": 80
-                  }
-                ]
-              }
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 10,
-            "w": 8,
-            "x": 16,
-            "y": 77
-          },
-          "id": 217,
-          "interval": "1m",
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
-            }
-          },
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${Environment}"
-              },
-              "editorMode": "code",
-              "expr": "avg by (name) (sum by(job,name) (rate(monitored_scope_duration_ns{job=~\"$validator\", name=~\"HandleConsensusOutput|HandleConsensusTransaction|VerifyConsensusTransaction\"}[5m])) / 1000000000)",
-              "hide": false,
-              "legendFormat": "__auto",
-              "range": true,
-              "refId": "B"
-            }
-          ],
-          "title": "Consensus Handler Utilization",
-          "type": "timeseries"
-        }
-      ],
-      "title": "NW behavior from Iota POV",
-      "type": "row"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 58
-      },
-      "id": 89,
-      "panels": [],
-      "title": "Channel and Critical Section Utilizations",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Num of processed entries per sec per validator",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Entries / sec",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 59
-      },
-      "id": 87,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (job,channel) (rate(label_replace({__name__=~\"tx.*total\", job=~\"$validator\"},\"channel\",\"$1\",\"__name__\", \"(.+)\")[5m:])) ",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Internal channels throughput",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Num of pending entries per channel per validator",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Entries",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "dashed+area"
-            }
-          },
-          "mappings": [],
-          "max": 1100,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 700
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 59
-      },
-      "id": 90,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (job,channel) (label_replace({__name__=~\"tx_.*\", __name__!~\"tx.*total\", job=~\"$validator\"}, \"channel\", \"$1\", \"__name__\", \"(.+)\"))",
-          "hide": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Internal channels: num pending elements",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "When we receive a certificate for processing we are checking for their parents in our internal storage. If we are missing those, we suspend the processing (with reason \"missing_parents\") and we are trying to fetch those from the other primary nodes. The processing of the certificate resumes only when all their parents are fetched.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Load Fractions",
-            "axisPlacement": "left",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 16,
-        "y": 59
-      },
-      "id": 5,
-      "interval": "1m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "avg by (name) (sum by(job,name) (rate(monitored_scope_duration_ns{job=~\"$validator\", name!~\"CheckpointNotifyRead|ValidateBatch\"}[5m])) / 1000000000)",
-          "hide": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Critical Section Load",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 70
-      },
-      "id": 11,
-      "panels": [],
-      "title": "Consensus Advance",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "All the even rounds that failed to commit because of leader not found or not supported",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percentunit"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 0,
-        "y": 71
-      },
-      "id": 205,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum (rate(leader_election{job=~\"$validator\", outcome=\"not_found\"}[5m])) / sum (rate(leader_election{job=~\"$validator\"}[5m]))",
-          "hide": false,
-          "legendFormat": "Leader not found",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum (rate(leader_election{job=~\"$validator\", outcome=\"not_enough_support\"}[5m])) / sum (rate(leader_election{job=~\"$validator\"}[5m]))",
-          "hide": false,
-          "legendFormat": "Not enough support for leader",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Pct of rounds that fail to commit",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The latest committed round by consensus. On a healthy cluster those numbers shouldn't differ much from each other - if not being almost the exact same",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "percentage",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 0
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 8,
-        "y": 71
-      },
-      "id": 53,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.3",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by(host) (last_committed_round{job=~\"$validator\"})",
-          "hide": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Last committed round",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Delta between current round and last committed round. Should not grow.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Rounds",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 71
-      },
-      "id": 85,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (job) (current_round) - sum by (job) (last_committed_round{job=~\"$validator\"})",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Commit round depth",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The latest committed round by consensus. On a healthy cluster those numbers shouldn't differ much from each other - if not being almost the exact same",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {
-            "align": "auto",
-            "cellOptions": {
-              "type": "auto"
-            },
-            "filterable": true,
-            "inspect": false
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "percentage",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 0
-              }
-            ]
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Time"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 199
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 0,
-        "y": 81
-      },
-      "id": 13,
-      "options": {
-        "cellHeight": "sm",
-        "footer": {
-          "countRows": false,
-          "enablePagination": true,
-          "fields": "",
-          "reducer": [
-            "sum"
-          ],
-          "show": false
-        },
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": true,
-            "displayName": "Value"
-          }
-        ]
-      },
-      "pluginVersion": "10.2.3",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by(job) (last_committed_round{jjob=~\"$validator\"})",
-          "format": "table",
-          "hide": false,
-          "instant": true,
-          "legendFormat": "__auto",
-          "range": false,
-          "refId": "B"
-        }
-      ],
-      "title": "Last committed round",
-      "type": "table"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "In a perfect case every even NW round should generate a commit.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 8,
-        "y": 81
-      },
-      "id": 206,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.95, sum(rate(consensus_commit_rounds_latency_bucket{job=~\"$validator\"}[5m])) by (le))",
-          "hide": false,
-          "legendFormat": "{{host}}-commit",
-          "range": true,
-          "refId": "C"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "1 / rate(current_round{job=~\"$validator\"}[5m])",
-          "hide": false,
-          "legendFormat": "{{host}}-round",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Average interval of NW rounds and p95 NW commits",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The number of NW certificates in the committed sub-dag",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 81
-      },
-      "id": 163,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "committed_certificates{job=~\"$validator\",pct=\"50\"}",
-          "hide": false,
-          "legendFormat": "{{host}}-p50",
-          "range": true,
-          "refId": "E"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "committed_certificates{job=~\"$validator\",pct=\"95\"}",
-          "hide": false,
-          "legendFormat": "{{host}}-p95",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "NW cert distribution per committed sub-dag",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 91
-      },
-      "id": 73,
-      "panels": [],
-      "title": "Data dissemination",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Since both certs and batches are processed in the consensus handler we can do the math",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 92
-      },
-      "id": 161,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (job) (rate(consensus_handler_processed{job=~\"$validator\"}[5m]))\n/\nsum by (job) (rate(consensus_handler_processed_batches{job=~\"$validator\"}[5m]))",
-          "hide": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Average num of certificates per batch",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Batch composition, sealing and delivering to the primary",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "decimals": 1,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 92
-      },
-      "id": 151,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.99, sum by(le) (rate(created_batch_latency_bucket{job=~\"$validator\"}[5m])))",
-          "legendFormat": "p99",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.5, sum by(le) (rate(created_batch_latency_bucket{job=~\"$validator\"}[5m])))",
-          "hide": false,
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Batch generation latency",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "decbytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 16,
-        "y": 92
-      },
-      "id": 107,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.05, sum(rate(created_batch_size_bucket{job=~\"$validator\"}[5m])) by (le))",
-          "legendFormat": "p05",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.25, sum(rate(created_batch_size_bucket{job=~\"$validator\"}[5m])) by (le))",
-          "hide": false,
-          "legendFormat": "p25",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.5, sum(rate(created_batch_size_bucket{job=~\"$validator\"}[5m])) by (le))",
-          "hide": false,
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "C"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.75, sum(rate(created_batch_size_bucket{job=~\"$validator\"}[5m])) by (le))",
-          "hide": false,
-          "legendFormat": "p75",
-          "range": true,
-          "refId": "D"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.99, sum(rate(created_batch_size_bucket{job=~\"$validator\"}[5m])) by (le))",
-          "hide": false,
-          "legendFormat": "p99",
-          "range": true,
-          "refId": "E"
-        }
-      ],
-      "title": "Batch size distribution",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Each batch should be delivered to 2f+1 of other workers prior to further processing",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "decimals": 0,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 103
-      },
-      "id": 214,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "parallel_worker_batches{job=~\"$validator\"}",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Inflight Batches ",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 114
-      },
-      "id": 222,
-      "panels": [],
-      "title": "Proposer",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Time between batch creation and the moment it's included in a header proposal (both p50 and p95 are medians across validators).",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 115
-      },
-      "id": 145,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.5, sum by(le, job) (rate(proposer_batch_latency_bucket{job=~\"$validator\"}[5m]))))",
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.95, sum by(le, job) (rate(proposer_batch_latency_bucket{job=~\"$validator\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "p95",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Batch to Header Latency",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The number of batches waiting to be included in headers in the proposer. A high number shows that batches are not assigned to headers - or the proposed headers don't make it to a successful commit , thus they are returned back to the proposer for re-proposal",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Num batches",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 115
-      },
-      "id": 209,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, sum by(job) (num_of_pending_batches_in_proposer{job=~\"$validator\"}))",
-          "hide": false,
-          "legendFormat": "pct50",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.95, sum by(job) (num_of_pending_batches_in_proposer{job=~\"$validator\"}))",
-          "hide": false,
-          "legendFormat": "pct95",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Num of pending batches in proposer",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The distribution of the batches per header across the validators.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Num batches",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 16,
-        "y": 115
-      },
-      "id": 220,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.5, sum by (reason, le) (rate(num_of_batch_digests_in_header_bucket{job=~\"$validator\"}[5m])))",
-          "hide": false,
-          "legendFormat": "{{reason}}-p50",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.95, sum by (reason, le) (rate(num_of_batch_digests_in_header_bucket{job=~\"$validator\"}[5m])))",
-          "hide": false,
-          "legendFormat": "{{reason}}-p95",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Num batches per header",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The time it takes for a certificate from the moment it gets created up to the moment it gets committed (median across validators).",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "decimals": 0,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 126
-      },
-      "id": 136,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.5, sum by(job,le) (rate(certificate_commit_latency_bucket{job=~\"$validator\"}[5m]))))",
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.95, sum by(job,le) (rate(certificate_commit_latency_bucket{job=~\"$validator\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "p95",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Certificate to Commit Latency",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 137
-      },
-      "id": 224,
-      "panels": [],
-      "title": "DAG advancement",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Time it takes for a header to be materialized to a certificate (median across validators)",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "decimals": 1,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 138
-      },
-      "id": 148,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.5, sum by(job,le) (rate(header_to_certificate_latency_bucket{job=~\"$validator\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.95, sum by(job,le) (rate(header_to_certificate_latency_bucket{job=~\"$validator\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "p95",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Header to Certificate Latency",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Time it takes for a new proposal to be generated",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "decimals": 1,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 138
-      },
-      "id": 243,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.5, sum by(job,le) (rate(proposal_latency_bucket{job=~\"$validator\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.95, sum by(job,le) (rate(proposal_latency_bucket{job=~\"$validator\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "p95",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Round advancement latency",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 16,
-        "y": 138
-      },
-      "id": 168,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.95, sum by(le, route) (rate(primary_outbound_request_latency_bucket{job=~\"$validator\",route=~\".*PrimaryToPrimary.*\"}[5m])))",
-          "hide": false,
-          "legendFormat": "{{route}}-p95",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Primary to Primary Latency by Route",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Certificate is suspended until its parents are retrieved by the node. The dedup and dedup_locked correspond to the cases, in which the same certificate is received while being suspended.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Certificate per sec",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 149
-      },
-      "id": 219,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "avg by(reason) (rate(certificates_suspended{job=~\"$validator\"}[5m]))",
-          "hide": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Suspended certificates by reason (avg across validators)",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Percentiles across validators\nThe value might be larger than 1 in case the same cert is suspended multiple times.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Certificate per sec",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 149
-      },
-      "id": 229,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5,\nsum by (job) (rate(certificates_suspended{job=~\"$validator\"}[5m]))\n/\nsum by (job) (rate(certificates_processed{job=~\"$validator\"}[5m]))\n)",
-          "hide": false,
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.75,\nsum by (job) (rate(certificates_suspended{job=~\"$validator\"}[5m]))\n/\nsum by (job) (rate(certificates_processed{job=~\"$validator\"}[5m]))\n)",
-          "hide": false,
-          "legendFormat": "p75",
-          "range": true,
-          "refId": "C"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.95,\nsum by (job) (rate(certificates_suspended{job=~\"$validator\"}[5m]))\n/\nsum by (job) (rate(certificates_processed{job=~\"$validator\"}[5m]))\n)",
-          "hide": false,
-          "legendFormat": "p95",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Ratio of suspended to processed certificates",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 16,
-        "y": 149
-      },
-      "id": 175,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.95, sum by(le, route) (rate(worker_outbound_request_latency_bucket{job=~\"$validator\", route=~\".*WorkerToWorker.*\"}[5m])))",
-          "hide": false,
-          "legendFormat": "{{route}}-p95",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Worker to Worker Request Latency by Route",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Counts all the processed fetched certificates, triggered by the missing parents.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Certificate per sec",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 160
-      },
-      "id": 236,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, rate(certificate_fetcher_num_certificates_processed{job=~\"$validator\"}[5m]))",
-          "hide": false,
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.75, rate(certificate_fetcher_num_certificates_processed{job=~\"$validator\"}[5m]))",
-          "hide": false,
-          "legendFormat": "p75",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.95, rate(certificate_fetcher_num_certificates_processed{job=~\"$validator\"}[5m]))",
-          "hide": false,
-          "legendFormat": "p95",
-          "range": true,
-          "refId": "C"
-        }
-      ],
-      "title": "Fetched certificates per sec for missing ancestors",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 160
-      },
-      "id": 250,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (job) (rate(certificates_processed{job=~\"$validator\", source=\"other\"}[5m]))",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Certificates processed (other)",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "bytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 16,
-        "y": 160
-      },
-      "id": 262,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.99, sum(rate(primary_inbound_response_size_bucket{route=\"/narwhal.PrimaryToPrimary/FetchCertificates\", job=~\"$validator\"}[5m])) by (le, job))",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Fetch Certificates Response Size - p99",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 171
-      },
-      "id": 249,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (job) (rate(certificates_processed{job=~\"$validator\", source=\"own\"}[5m]))",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Certificates processed (own)",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "In case the delta between outbound and inbound latencies is high, it could be a sign of rate limiting or contention on the handler.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 171
-      },
-      "id": 230,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by(route) (rate(primary_outbound_request_latency_sum{job=~\"$validator\",route=~\".*PrimaryToPrimary.*\"}[5m])) / sum by(route) (rate(primary_outbound_request_latency_count{job=~\"$validator\",route=~\".*PrimaryToPrimary.*\"}[5m]))\n-\nsum by(route) (rate(primary_inbound_request_latency_sum{job=~\"$validator\",route=~\".*PrimaryToPrimary.*\"}[5m])) / sum by(route) (rate(primary_inbound_request_latency_count{job=~\"$validator\",route=~\".*PrimaryToPrimary.*\"}[5m]))",
-          "hide": false,
-          "legendFormat": "{{route}}",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by(route) (rate(worker_outbound_request_latency_sum{job=~\"$validator\", route=~\".*WorkerToWorker.*\"}[5m])) / sum by(route) (rate(worker_outbound_request_latency_count{job=~\"$validator\", route=~\".*WorkerToWorker.*\"}[5m]))\n-\nsum by(route) (rate(worker_inbound_request_latency_sum{job=~\"$validator\", route=~\".*WorkerToWorker.*\"}[5m])) / sum by(route) (rate(worker_inbound_request_latency_count{job=~\"$validator\", route=~\".*WorkerToWorker.*\"}[5m]))",
-          "hide": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Outbound vs Inbound Latency Gap",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "RPS",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 16,
-        "y": 171
-      },
-      "id": 231,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, sum by(job) (rate(primary_outbound_request_latency_count{job=~\"$validator\"}[5m])))",
-          "hide": false,
-          "legendFormat": "primary_outbound",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, sum by(job) (rate(worker_outbound_request_latency_count{job=~\"$validator\"}[5m])))\n",
-          "hide": false,
-          "legendFormat": "worker_outbound",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, sum by(job) (rate(primary_inbound_request_latency_count{job=~\"$validator\"}[5m])))",
-          "hide": false,
-          "legendFormat": "primary_inbound",
-          "range": true,
-          "refId": "C"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, sum by(job) (rate(worker_inbound_request_latency_count{job=~\"$validator\"}[5m])))",
-          "hide": false,
-          "legendFormat": "worker_inbound",
-          "range": true,
-          "refId": "D"
-        }
-      ],
-      "title": "Anemo rps per validator",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 182
-      },
-      "id": 132,
-      "panels": [],
-      "title": "Executor",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Time between cert creation and the moment it has reached the executor (median across validators).",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 183
-      },
-      "id": 139,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.5, sum by(job,le) (rate(subscriber_certificate_latency_bucket{job=~\"$validator\"}[5m]))))",
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.95, sum by(job,le) (rate(subscriber_certificate_latency_bucket{job=~\"$validator\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "p95",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Certificate to Subscriber Latency",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Latency between the time when the batch has been created and the moment it has been fetched for execution (median across validators)",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 183
-      },
-      "id": 142,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.5, sum by(job,le) (rate(batch_execution_latency_bucket{job=~\"$validator\"}[5m]))))",
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.95, sum by(job,le) (rate(batch_execution_latency_bucket{job=~\"$validator\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "p95",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Batch to Execution Latency",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 194
-      },
-      "id": 109,
-      "panels": [],
-      "title": "NW Network",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Num of primary peers connected per host",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Num peers connected",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "dash": [
-                0,
-                10
-              ],
-              "fill": "dot"
-            },
-            "lineWidth": 3,
-            "pointSize": 6,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "line+area"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "transparent"
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 0,
-        "y": 195
-      },
-      "id": 261,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (job) (worker_network_peer_connected{job=~\"$validator\", type=\"other_worker\"})",
-          "hide": false,
-          "legendFormat": "{{label_name}}",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Worker network connectivity",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Congestion events for primary and worker connections",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 8,
-        "y": 195
-      },
-      "id": 254,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by(job) (rate(worker_network_peer_congestion_events{job=~\"$validator\"}[5m]))",
-          "hide": false,
-          "instant": false,
-          "key": "Q-a68ca97d-edc4-4cc5-bc7f-003175cce0c3-8",
-          "legendFormat": "worker-{{host}}",
-          "range": true,
-          "refId": "worker_network_peer_congestion_events"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by(job) (rate(primary_network_peer_congestion_events{job=~\"$validator\"}[5m]))",
-          "hide": false,
-          "instant": false,
-          "key": "Q-a68ca97d-edc4-4cc5-bc7f-003175cce0c3-8",
-          "legendFormat": "primary-{{host}}",
-          "range": true,
-          "refId": "primary_network_peer_congestion_events"
-        }
-      ],
-      "title": "Congestion Events ",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Packet loss for primary and worker connections",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 195
-      },
-      "id": 252,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by(job) (rate(worker_network_peer_lost_packets{job=~\"$validator\"}[5m])) / sum by(job) (rate(worker_network_peer_sent_packets{job=~\"$validator\"}[5m])) * 100",
-          "hide": false,
-          "instant": false,
-          "key": "Q-a68ca97d-edc4-4cc5-bc7f-003175cce0c3-8",
-          "legendFormat": "worker-{{host}}",
-          "range": true,
-          "refId": "worker_network_peer_lost_packets"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by(job) (rate(primary_network_peer_lost_packets{job=~\"$validator\"}[5m])) / sum by(job) (rate(primary_network_peer_sent_packets{job=~\"$validator\"}[5m])) * 100",
-          "hide": false,
-          "instant": false,
-          "key": "Q-a68ca97d-edc4-4cc5-bc7f-003175cce0c3-8",
-          "legendFormat": "primary-{{host}}",
-          "range": true,
-          "refId": "primary_network_peer_lost_packets"
-        }
-      ],
-      "title": "Packet Loss %",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "bytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 0,
-        "y": 205
-      },
-      "id": 271,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "(sum by (job)(rate(primary_inbound_request_size_sum{ job=~\"$validator\"}[$__rate_interval])) +\n sum by (job)(rate(primary_inbound_response_size_sum{ job=~\"$validator\"}[$__rate_interval])) +\n sum by (job)(rate(worker_inbound_request_size_sum{ job=~\"$validator\"}[$__rate_interval])) +\n sum by (job)(rate(worker_inbound_response_size_sum{ job=~\"$validator\"}[$__rate_interval]))) * 8",
-          "hide": false,
-          "instant": false,
-          "key": "Q-a68ca97d-edc4-4cc5-bc7f-003175cce0c3-8",
-          "legendFormat": "primary-{{host}}",
-          "range": true,
-          "refId": "primary_network_peer_congestion_events"
-        }
-      ],
-      "title": "Anemo per-host ingress",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "bytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 8,
-        "y": 205
-      },
-      "id": 272,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "(sum by (job)(rate(primary_outbound_request_size_sum{ job=~\"$validator\"}[$__rate_interval])) +\n sum by (job)(rate(primary_outbound_response_size_sum{ job=~\"$validator\"}[$__rate_interval])) +\n sum by (job)(rate(worker_outbound_request_size_sum{ job=~\"$validator\"}[$__rate_interval])) +\n sum by (job)(rate(worker_outbound_response_size_sum{ job=~\"$validator\"}[$__rate_interval]))) * 8",
-          "hide": false,
-          "instant": false,
-          "key": "Q-a68ca97d-edc4-4cc5-bc7f-003175cce0c3-8",
-          "legendFormat": "primary-{{host}}",
-          "range": true,
-          "refId": "primary_network_peer_congestion_events"
-        }
-      ],
-      "title": "Anemo per-host egress",
-      "type": "timeseries"
-    }
-  ],
-  "refresh": "1m",
-  "revision": 1,
-  "schemaVersion": 39,
-  "tags": [],
-  "templating": {
-    "list": [
-      {
-        "current": {
-          "selected": false,
-          "text": "testbed",
-          "value": "Fixed-UID-testbed"
-        },
-        "hide": 0,
-        "includeAll": false,
-        "label": "Datasource",
-        "multi": false,
-        "name": "Environment",
-        "options": [],
-        "query": "prometheus",
-        "queryValue": "",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "type": "datasource"
-      },
-      {
-        "current": {
-          "selected": true,
-          "text": [
-            "All"
-          ],
-          "value": [
-            "$__all"
-          ]
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${Environment}"
-        },
-        "definition": "label_values(job)",
-        "hide": 0,
-        "includeAll": true,
-        "label": "Validator",
-        "multi": true,
-        "name": "validator",
-        "options": [],
-        "query": {
-          "qryType": 1,
-          "query": "label_values(job)",
-          "refId": "PrometheusVariableQueryEditor-VariableQuery"
-        },
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
-      }
-    ]
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "Iota Validators - Narwhal Only",
-  "uid": "SpRJIxL4z",
-  "version": 3,
-  "weekStart": ""
-}
\ No newline at end of file
diff --git a/crates/iota-aws-orchestrator/assets/grafana-dashboard-narwhal.json b/crates/iota-aws-orchestrator/assets/grafana-dashboard-narwhal.json
deleted file mode 100644
index 0856898ca1c..00000000000
--- a/crates/iota-aws-orchestrator/assets/grafana-dashboard-narwhal.json
+++ /dev/null
@@ -1,6035 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": {
-          "type": "grafana",
-          "uid": "-- Grafana --"
-        },
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "target": {
-          "limit": 100,
-          "matchAny": false,
-          "tags": [],
-          "type": "dashboard"
-        },
-        "type": "dashboard"
-      }
-    ]
-  },
-  "description": "",
-  "editable": true,
-  "fiscalYearStartMonth": 0,
-  "graphTooltip": 0,
-  "id": 2,
-  "links": [],
-  "liveNow": false,
-  "panels": [
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "id": 78,
-      "panels": [],
-      "title": "Health overview",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "Fixed-UID-testbed"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "dashed+area"
-            }
-          },
-          "mappings": [],
-          "min": 0.5,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 0.667
-              }
-            ]
-          },
-          "unit": "percentunit"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 0,
-        "y": 1
-      },
-      "id": 258,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "Fixed-UID-testbed"
-          },
-          "editorMode": "code",
-          "expr": "sum(current_voting_right{job=~\"$validator\", network=\"$network\"} and rate(current_round{job=~\"$validator\", network=\"$network\"}[$__interval]) > 0) / 10000",
-          "instant": false,
-          "legendFormat": "{{label_name}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Percentage of stake that increments consensus rounds",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The rate of the current round growth. This is reported by the proposer - which forms the next header to be broadcasted by a node.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Round / sec",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 8,
-        "y": 1
-      },
-      "id": 81,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by(job) (rate(current_round{job=~\"$validator\", network=\"$network\"}[5m]))",
-          "hide": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Current round growth speed",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The current round the node is in. This is reported by the proposer - which forms the next header to be broadcasted by a node. The numbers across the nodes shouldn't differ much - if not the same.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Round",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "dash": [
-                0,
-                10
-              ],
-              "fill": "dot"
-            },
-            "lineWidth": 2,
-            "pointSize": 6,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 1
-      },
-      "id": 26,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by(host) (current_round{network=\"$network\", job=~\"$validator\"})",
-          "hide": false,
-          "legendFormat": "{{label_name}}",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Current round (timeline)",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "Fixed-UID-testbed"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percentunit"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 0,
-        "y": 11
-      },
-      "id": 260,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "Fixed-UID-testbed"
-          },
-          "editorMode": "code",
-          "expr": "current_voting_right{job=~\"$validator\", network=\"$network\"} / 10000",
-          "instant": false,
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Voting power distribution",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Epoch number",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 2,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "line+area"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "transparent",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 8,
-        "y": 11
-      },
-      "id": 197,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "current_epoch{job=~\"$validator\", network=\"$network\"}",
-          "hide": false,
-          "legendFormat": "{{host}}",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Current Epoch",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Num of primary peers connected per host",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Num peers connected",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "dash": [
-                0,
-                10
-              ],
-              "fill": "dot"
-            },
-            "lineWidth": 3,
-            "pointSize": 6,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "line+area"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "transparent",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 11
-      },
-      "id": 244,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (host) (primary_network_peer_connected{job=~\"$validator\", network=\"$network\", type=\"other_primary\"})",
-          "hide": false,
-          "legendFormat": "{{label_name}}",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Primary network connectivity",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Shows the lag (diff) between the median reported last committed round and the specific host's last committed round. The color scheme shows how far behind nodes are.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {
-            "fillOpacity": 70,
-            "lineWidth": 1
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "dark-green",
-                "value": null
-              },
-              {
-                "color": "yellow",
-                "value": 100
-              },
-              {
-                "color": "orange",
-                "value": 150
-              },
-              {
-                "color": "red",
-                "value": 200
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 25,
-        "w": 8,
-        "x": 0,
-        "y": 21
-      },
-      "id": 185,
-      "interval": "2m",
-      "options": {
-        "colWidth": 0.9,
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "rowHeight": 0.9,
-        "showValue": "never",
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.2.5",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by(job) (last_committed_round{job=~\"$validator\",network=\"$network\"})",
-          "format": "time_series",
-          "hide": true,
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "quantile(0.5, last_committed_round{job=~\"$validator\", network=\"$network\"})",
-          "format": "time_series",
-          "hide": true,
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "conditions": [
-            {
-              "evaluator": {
-                "params": [
-                  0,
-                  0
-                ],
-                "type": "gt"
-              },
-              "operator": {
-                "type": "and"
-              },
-              "query": {
-                "params": []
-              },
-              "reducer": {
-                "params": [],
-                "type": "avg"
-              },
-              "type": "query"
-            }
-          ],
-          "datasource": {
-            "name": "Expression",
-            "type": "__expr__",
-            "uid": "__expr__"
-          },
-          "expression": "$B - $A",
-          "hide": false,
-          "reducer": "max",
-          "refId": "*",
-          "type": "math"
-        }
-      ],
-      "title": "Last commit round lag",
-      "type": "status-history"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The nodes that are proposing in rounds during time. When a node advances a round then this will be a green box with \"YES\" text in it. Otherwise a red box with \"NO\" text will be rendered",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {
-            "fillOpacity": 70,
-            "lineWidth": 1
-          },
-          "mappings": [
-            {
-              "options": {
-                "from": 1.5,
-                "result": {
-                  "color": "dark-green",
-                  "index": 0
-                },
-                "to": 1000
-              },
-              "type": "range"
-            },
-            {
-              "options": {
-                "from": 1,
-                "result": {
-                  "color": "super-light-green",
-                  "index": 1
-                },
-                "to": 1.5
-              },
-              "type": "range"
-            },
-            {
-              "options": {
-                "from": 0.5,
-                "result": {
-                  "color": "yellow",
-                  "index": 2
-                },
-                "to": 1
-              },
-              "type": "range"
-            },
-            {
-              "options": {
-                "from": 0.1,
-                "result": {
-                  "color": "orange",
-                  "index": 3
-                },
-                "to": 0.5
-              },
-              "type": "range"
-            },
-            {
-              "options": {
-                "from": 0,
-                "result": {
-                  "color": "red",
-                  "index": 4
-                },
-                "to": 0.1
-              },
-              "type": "range"
-            },
-            {
-              "options": {
-                "match": "null+nan",
-                "result": {
-                  "color": "transparent",
-                  "index": 5
-                }
-              },
-              "type": "special"
-            }
-          ],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 25,
-        "w": 8,
-        "x": 8,
-        "y": 21
-      },
-      "id": 184,
-      "interval": "2m",
-      "options": {
-        "colWidth": 0.9,
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "rowHeight": 0.9,
-        "showValue": "never",
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by (job) (rate(certificates_created{network=~\"$network\", job=~\"$validator\"}[5m]))",
-          "format": "time_series",
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Nodes proposing certified headers",
-      "type": "status-history"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {
-            "fillOpacity": 70,
-            "lineWidth": 1
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "dark-red",
-                "value": null
-              },
-              {
-                "color": "dark-orange",
-                "value": 70
-              },
-              {
-                "color": "dark-yellow",
-                "value": 80
-              },
-              {
-                "color": "dark-green",
-                "value": 90
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 25,
-        "w": 8,
-        "x": 16,
-        "y": 21
-      },
-      "id": 203,
-      "options": {
-        "colWidth": 0.9,
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "rowHeight": 0.9,
-        "showValue": "never",
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.2.5",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": " sum by(job) (primary_network_peer_connected{job=~\"$validator\", network=\"$network\", type=\"other_primary\"})",
-          "interval": "2m",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Primary connected to other primaries (number)",
-      "type": "status-history"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 46
-      },
-      "id": 43,
-      "panels": [],
-      "title": "NW behavior from Iota POV",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Consensus ordering attempts per sec",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "txn / sec",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 0,
-        "y": 47
-      },
-      "id": 69,
-      "interval": "1m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, sum by (job) (rate(sequencing_certificate_attempt{job=~\"$validator\",network=\"$network\"}[5m])))",
-          "legendFormat": "Consensus adapter input rate",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, sum (rate(sequencing_acknowledge_latency_count{job=~\"$validator\",network=\"$network\"}[5m])))",
-          "hide": false,
-          "legendFormat": "NW input rate",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, sum by (host) (rate(consensus_handler_processed{host=~\"$validator\", network=\"$network\"}[5m])))",
-          "hide": false,
-          "legendFormat": "NW output rate",
-          "range": true,
-          "refId": "C"
-        }
-      ],
-      "title": "Input / output rate",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "Fixed-UID-testbed"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 8,
-        "y": 47
-      },
-      "id": 256,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "Fixed-UID-testbed"
-          },
-          "editorMode": "code",
-          "expr": "clamp(quantile(0.67, histogram_quantile(0.5, sum(rate(sequencing_certificate_latency_bucket{job=~\"$validator\", network=\"$network\"}[5m])) by(job, le))), 0, 30)",
-          "instant": false,
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "Fixed-UID-testbed"
-          },
-          "editorMode": "code",
-          "expr": "clamp(quantile(0.67, histogram_quantile(0.95, sum(rate(sequencing_certificate_latency_bucket{job=~\"$validator\", network=\"$network\"}[5m])) by(job, le))), 0, 30)",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "p95",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "p50 and p95 Consensus Adapter e2e latency",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "Fixed-UID-testbed"
-      },
-      "description": "Percentage of requests that got submitted more than once",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "normal"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percentunit"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 47
-      },
-      "id": 212,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "Fixed-UID-testbed"
-          },
-          "editorMode": "code",
-          "expr": "sum (rate(sequencing_certificate_latency_count{job=~\"$validator\", network=\"$network\", position=\"1\"}[5m]))\n/\nsum (rate(sequencing_certificate_latency_count{job=~\"$validator\", network=\"$network\", position!=\"not_submitted\"}[5m]))",
-          "hide": false,
-          "legendFormat": "Attempt #2",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "Fixed-UID-testbed"
-          },
-          "editorMode": "code",
-          "expr": "sum (rate(sequencing_certificate_latency_count{job=~\"$validator\", network=\"$network\", position=\"2\"}[5m]))\n/\nsum (rate(sequencing_certificate_latency_count{job=~\"$validator\", network=\"$network\", position!=\"not_submitted\"}[5m]))",
-          "hide": false,
-          "legendFormat": "Attempt #3",
-          "range": true,
-          "refId": "C"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "Fixed-UID-testbed"
-          },
-          "editorMode": "code",
-          "expr": "sum (rate(sequencing_certificate_latency_count{job=~\"$validator\", network=\"$network\", position=\"3\"}[5m]))\n/\nsum (rate(sequencing_certificate_latency_count{job=~\"$validator\", network=\"$network\", position!=\"not_submitted\"}[5m]))",
-          "hide": false,
-          "legendFormat": "Attempt #4",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "Fixed-UID-testbed"
-          },
-          "editorMode": "code",
-          "expr": "sum (rate(sequencing_certificate_latency_count{host=~\"$validator\", network=\"$network\", position=\"4\"}[5m]))\n/\nsum (rate(sequencing_certificate_latency_count{host=~\"$validator\", network=\"$network\", position!=\"not_submitted\"}[5m]))",
-          "hide": false,
-          "legendFormat": "Attempt #5",
-          "range": true,
-          "refId": "D"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "Fixed-UID-testbed"
-          },
-          "editorMode": "code",
-          "expr": "sum (rate(sequencing_certificate_latency_count{host=~\"$validator\", network=\"$network\", position!~\"(0|1|2|3|4|not_submitted)\"}[5m]))\n/\nsum (rate(sequencing_certificate_latency_count{host=~\"$validator\", network=\"$network\", position!=\"not_submitted\"}[5m]))",
-          "hide": false,
-          "legendFormat": "Attempt #6+",
-          "range": true,
-          "refId": "E"
-        }
-      ],
-      "title": "Submission amplification",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Ideally we want the low-score NW validators to not submit transactions",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Transactions / sec",
-            "axisPlacement": "left",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "decimals": 1,
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "ops"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 0,
-        "y": 57
-      },
-      "id": 45,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (job) (rate(sequencing_acknowledge_latency_count{job=~\"$validator\",network=\"$network\"}[5m]))",
-          "hide": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Submission rate by authority",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "#6ED0E0",
-                "value": 1
-              },
-              {
-                "color": "purple",
-                "value": 100
-              },
-              {
-                "color": "#EAB839",
-                "value": 200
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 8,
-        "y": 57
-      },
-      "id": 233,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.4.7",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "avg by (authority) (consensus_handler_scores{job=~\"$validator\", network=\"$network\"})",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Avg score per host",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {
-            "fillOpacity": 70,
-            "lineWidth": 0,
-            "spanNulls": false
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "dark-red",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 50
-              },
-              {
-                "color": "orange",
-                "value": 100
-              },
-              {
-                "color": "green",
-                "value": 200
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 57
-      },
-      "id": 241,
-      "options": {
-        "alignValue": "left",
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "mergeValues": true,
-        "rowHeight": 0.9,
-        "showValue": "auto",
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.4.7",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "avg by (authority) (consensus_handler_scores{job=~\"$validator\", network=\"$network\"})",
-          "legendFormat": "{{authority}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Score per host change",
-      "transformations": [
-        {
-          "id": "renameByRegex",
-          "options": {
-            "regex": "PeerId\\(([a-z0-9]{5}).*\\)",
-            "renamePattern": "$1..."
-          }
-        }
-      ],
-      "type": "state-timeline"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "As reported by consensus handler to every host",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "#6ED0E0",
-                "value": 1
-              },
-              {
-                "color": "purple",
-                "value": 100
-              },
-              {
-                "color": "#EAB839",
-                "value": 200
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 0,
-        "y": 67
-      },
-      "id": 240,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.4.7",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "avg by (job) (consensus_handler_num_low_scoring_authorities{network=\"$network\", job=~\"$validator\"})",
-          "legendFormat": "{{host}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Num low scoring authorities",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "#6ED0E0",
-                "value": 1
-              },
-              {
-                "color": "purple",
-                "value": 100
-              },
-              {
-                "color": "#EAB839",
-                "value": 200
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 8,
-        "y": 67
-      },
-      "id": 265,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.4.7",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "avg by (job) (num_of_bad_nodes{network=\"$network\", job=~\"$validator\"})",
-          "legendFormat": "{{host}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Num of bad nodes",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "This is a median value across validators",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "normal"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 67
-      },
-      "id": 228,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.95, sum by(le, job) (rate(created_batch_latency_bucket{job=~\"$validator\", network=\"$network\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "batch_creation",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.95, sum by(le, job) (rate(proposer_batch_latency_bucket{job=~\"$validator\",network=\"$network\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "batch_to_header",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.95, sum by(job,le) (rate(header_to_certificate_latency_bucket{job=~\"$validator\",network=\"$network\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "header_to_cert",
-          "range": true,
-          "refId": "C"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.95, sum by(job,le) (rate(certificate_commit_latency_bucket{job=~\"$validator\",network=\"$network\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "cert_to_commit",
-          "range": true,
-          "refId": "D"
-        }
-      ],
-      "title": "p95: txn to commit stacked breakdown",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Individual submissions by each authority",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "#6ED0E0",
-                "value": 1
-              },
-              {
-                "color": "purple",
-                "value": 100
-              },
-              {
-                "color": "#EAB839",
-                "value": 200
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 0,
-        "y": 77
-      },
-      "id": 242,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.4.7",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, sequencing_in_flight_submissions{network=\"$network\", job=~\"$validator\"})",
-          "hide": false,
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.75, sequencing_in_flight_submissions{network=\"$network\", job=~\"$validator\"})",
-          "hide": false,
-          "legendFormat": "p75",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Inflight submissions per validator",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Each authority is doing latency estimates in order to determine the retry intervals.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "dtdurationms"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 8,
-        "y": 77
-      },
-      "id": 237,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "clamp(sequencing_estimated_latency{job=~\"$validator\", network=\"$network\"}, 0, 60000)",
-          "hide": false,
-          "legendFormat": "{{host}}",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Consensus Adapter latency estimates",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Load Fractions",
-            "axisPlacement": "left",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 77
-      },
-      "id": 217,
-      "interval": "1m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "avg by (name) (sum by(job,name) (rate(monitored_scope_duration_ns{job=~\"$validator\", network=\"$network\", name=~\"HandleConsensusOutput|HandleConsensusTransaction|VerifyConsensusTransaction\"}[5m])) / 1000000000)",
-          "hide": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Consensus Handler Utilization",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 87
-      },
-      "id": 89,
-      "panels": [],
-      "title": "Channel and Critical Section Utilizations",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Num of processed entries per sec per validator",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Entries / sec",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 88
-      },
-      "id": 87,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (job,channel) (rate(label_replace({__name__=~\"tx.*total\", job=~\"$validator\",network=\"$network\"},\"channel\",\"$1\",\"__name__\", \"(.+)\")[5m:])) ",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Internal channels throughput",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Num of pending entries per channel per validator",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Entries",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "dashed+area"
-            }
-          },
-          "mappings": [],
-          "max": 1100,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 700
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 88
-      },
-      "id": 90,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (job,channel) (label_replace({__name__=~\"tx_.*\", __name__!~\"tx.*total\", job=~\"$validator\",network=\"$network\"}, \"channel\", \"$1\", \"__name__\", \"(.+)\"))",
-          "hide": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Internal channels: num pending elements",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "When we receive a certificate for processing we are checking for their parents in our internal storage. If we are missing those, we suspend the processing (with reason \"missing_parents\") and we are trying to fetch those from the other primary nodes. The processing of the certificate resumes only when all their parents are fetched.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Load Fractions",
-            "axisPlacement": "left",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 16,
-        "y": 88
-      },
-      "id": 5,
-      "interval": "1m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "avg by (name) (sum by(job,name) (rate(monitored_scope_duration_ns{job=~\"$validator\", network=\"$network\", name!~\"CheckpointNotifyRead|ValidateBatch\"}[5m])) / 1000000000)",
-          "hide": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Critical Section Load",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 99
-      },
-      "id": 11,
-      "panels": [],
-      "title": "Consensus Advance",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "All the even rounds that failed to commit because of leader not found or not supported",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percentunit"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 0,
-        "y": 100
-      },
-      "id": 205,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum (rate(leader_election{job=~\"$validator\", network=\"$network\", outcome=\"not_found\"}[5m])) / sum (rate(leader_election{job=~\"$validator\", network=\"$network\"}[5m]))",
-          "hide": false,
-          "legendFormat": "Leader not found",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum (rate(leader_election{job=~\"$validator\", network=\"$network\", outcome=\"not_enough_support\"}[5m])) / sum (rate(leader_election{job=~\"$validator\", network=\"$network\"}[5m]))",
-          "hide": false,
-          "legendFormat": "Not enough support for leader",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Pct of rounds that fail to commit",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The latest committed round by consensus. On a healthy cluster those numbers shouldn't differ much from each other - if not being almost the exact same",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "percentage",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 0
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 8,
-        "y": 100
-      },
-      "id": 53,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.3",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by(host) (last_committed_round{host=~\"$validator\",network=\"$network\"})",
-          "hide": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Last committed round",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Delta between current round and last committed round. Should not grow.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Rounds",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 100
-      },
-      "id": 85,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (job) (current_round) - sum by (job) (last_committed_round{job=~\"$validator\",network=\"$network\"})",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Commit round depth",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The latest committed round by consensus. On a healthy cluster those numbers shouldn't differ much from each other - if not being almost the exact same",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {
-            "align": "auto",
-            "cellOptions": {
-              "type": "auto"
-            },
-            "filterable": true,
-            "inspect": false
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "percentage",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 0
-              }
-            ]
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Time"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 199
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 0,
-        "y": 110
-      },
-      "id": 13,
-      "options": {
-        "cellHeight": "sm",
-        "footer": {
-          "countRows": false,
-          "enablePagination": true,
-          "fields": "",
-          "reducer": [
-            "sum"
-          ],
-          "show": false
-        },
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": true,
-            "displayName": "Value"
-          }
-        ]
-      },
-      "pluginVersion": "10.0.3",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by(job) (last_committed_round{job=~\"$validator\",network=\"$network\"})",
-          "format": "table",
-          "hide": false,
-          "instant": true,
-          "legendFormat": "__auto",
-          "range": false,
-          "refId": "B"
-        }
-      ],
-      "title": "Last committed round",
-      "type": "table"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "In a perfect case every even NW round should generate a commit.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 8,
-        "y": 110
-      },
-      "id": 206,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.95, sum(rate(consensus_commit_rounds_latency_bucket{network=~\"$network\", job=~\"$validator\"}[5m])) by (le))",
-          "hide": false,
-          "legendFormat": "{{host}}-commit",
-          "range": true,
-          "refId": "C"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "1 / rate(current_round{job=~\"$validator\", network=\"$network\"}[5m])",
-          "hide": false,
-          "legendFormat": "{{host}}-round",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Average interval of NW rounds and p95 NW commits",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The number of NW certificates in the committed sub-dag",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 110
-      },
-      "id": 163,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "committed_certificates{job=~\"$validator\",network=\"$network\",pct=\"50\"}",
-          "hide": false,
-          "legendFormat": "{{host}}-p50",
-          "range": true,
-          "refId": "E"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "committed_certificates{job=~\"$validator\",network=\"$network\",pct=\"95\"}",
-          "hide": false,
-          "legendFormat": "{{host}}-p95",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "NW cert distribution per committed sub-dag",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 120
-      },
-      "id": 73,
-      "panels": [],
-      "title": "Data dissemination",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Since both certs and batches are processed in the consensus handler we can do the math",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 121
-      },
-      "id": 161,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (job) (rate(consensus_handler_processed{job=~\"$validator\", network=\"$network\"}[5m]))\n/\nsum by (job) (rate(consensus_handler_processed_batches{job=~\"$validator\",network=\"$network\"}[5m]))",
-          "hide": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Average num of certificates per batch",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Batch composition, sealing and delivering to the primary",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "decimals": 1,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 121
-      },
-      "id": 151,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.99, sum by(le) (rate(created_batch_latency_bucket{job=~\"$validator\",network=\"$network\"}[5m])))",
-          "legendFormat": "p99",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.5, sum by(le) (rate(created_batch_latency_bucket{job=~\"$validator\",network=\"$network\"}[5m])))",
-          "hide": false,
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Batch generation latency",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "decbytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 16,
-        "y": 121
-      },
-      "id": 107,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.05, sum(rate(created_batch_size_bucket{job=~\"$validator\",network=\"$network\"}[5m])) by (le))",
-          "legendFormat": "p05",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.25, sum(rate(created_batch_size_bucket{job=~\"$validator\",network=\"$network\"}[5m])) by (le))",
-          "hide": false,
-          "legendFormat": "p25",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.5, sum(rate(created_batch_size_bucket{job=~\"$validator\",network=\"$network\"}[5m])) by (le))",
-          "hide": false,
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "C"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.75, sum(rate(created_batch_size_bucket{job=~\"$validator\",network=\"$network\"}[5m])) by (le))",
-          "hide": false,
-          "legendFormat": "p75",
-          "range": true,
-          "refId": "D"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.99, sum(rate(created_batch_size_bucket{job=~\"$validator\",network=\"$network\"}[5m])) by (le))",
-          "hide": false,
-          "legendFormat": "p99",
-          "range": true,
-          "refId": "E"
-        }
-      ],
-      "title": "Batch size distribution",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Each batch should be delivered to 2f+1 of other workers prior to further processing",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "decimals": 0,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 132
-      },
-      "id": 214,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "parallel_worker_batches{job=~\"$validator\",network=\"$network\"}",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Inflight Batches ",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 143
-      },
-      "id": 222,
-      "panels": [],
-      "title": "Proposer",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Time between batch creation and the moment it's included in a header proposal (both p50 and p95 are medians across validators).",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 144
-      },
-      "id": 145,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.5, sum by(le, job) (rate(proposer_batch_latency_bucket{job=~\"$validator\",network=\"$network\"}[5m]))))",
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.95, sum by(le, job) (rate(proposer_batch_latency_bucket{job=~\"$validator\",network=\"$network\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "p95",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Batch to Header Latency",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The number of batches waiting to be included in headers in the proposer. A high number shows that batches are not assigned to headers - or the proposed headers don't make it to a successful commit , thus they are returned back to the proposer for re-proposal",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Num batches",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 144
-      },
-      "id": 209,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, sum by(job) (num_of_pending_batches_in_proposer{network=\"$network\", job=~\"$validator\"}))",
-          "hide": false,
-          "legendFormat": "pct50",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.95, sum by(job) (num_of_pending_batches_in_proposer{network=\"$network\", job=~\"$validator\"}))",
-          "hide": false,
-          "legendFormat": "pct95",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Num of pending batches in proposer",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The distribution of the batches per header across the validators.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Num batches",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 16,
-        "y": 144
-      },
-      "id": 220,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.5, sum by (reason, le) (rate(num_of_batch_digests_in_header_bucket{job=~\"$validator\", network=\"$network\"}[5m])))",
-          "hide": false,
-          "legendFormat": "{{reason}}-p50",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.95, sum by (reason, le) (rate(num_of_batch_digests_in_header_bucket{job=~\"$validator\", network=\"$network\"}[5m])))",
-          "hide": false,
-          "legendFormat": "{{reason}}-p95",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Num batches per header",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "The time it takes for a certificate from the moment it gets created up to the moment it gets committed (median across validators).",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "decimals": 0,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 155
-      },
-      "id": 136,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.5, sum by(job,le) (rate(certificate_commit_latency_bucket{job=~\"$validator\",network=\"$network\"}[5m]))))",
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.95, sum by(job,le) (rate(certificate_commit_latency_bucket{job=~\"$validator\",network=\"$network\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "p95",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Certificate to Commit Latency",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 166
-      },
-      "id": 224,
-      "panels": [],
-      "title": "DAG advancement",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Time it takes for a header to be materialized to a certificate (median across validators)",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "decimals": 1,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 167
-      },
-      "id": 148,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.5, sum by(job,le) (rate(header_to_certificate_latency_bucket{job=~\"$validator\",network=\"$network\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.95, sum by(job,le) (rate(header_to_certificate_latency_bucket{job=~\"$validator\",network=\"$network\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "p95",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Header to Certificate Latency",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Time it takes for a new proposal to be generated",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "decimals": 1,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 167
-      },
-      "id": 243,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.5, sum by(job,le) (rate(proposal_latency_bucket{job=~\"$validator\",network=\"$network\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.95, sum by(job,le) (rate(proposal_latency_bucket{job=~\"$validator\",network=\"$network\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "p95",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Round advancement latency",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 16,
-        "y": 167
-      },
-      "id": 168,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.95, sum by(le, route) (rate(primary_outbound_request_latency_bucket{job=~\"$validator\",network=\"$network\",route=~\".*PrimaryToPrimary.*\"}[5m])))",
-          "hide": false,
-          "legendFormat": "{{route}}-p95",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Primary to Primary Latency by Route",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Certificate is suspended until its parents are retrieved by the node. The dedup and dedup_locked correspond to the cases, in which the same certificate is received while being suspended.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Certificate per sec",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 178
-      },
-      "id": 219,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "avg by(reason) (rate(certificates_suspended{network=\"$network\", job=~\"$validator\"}[5m]))",
-          "hide": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Suspended certificates by reason (avg across validators)",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Percentiles across validators\nThe value might be larger than 1 in case the same cert is suspended multiple times.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Certificate per sec",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 178
-      },
-      "id": 229,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5,\nsum by (job) (rate(certificates_suspended{network=\"$network\", job=~\"$validator\"}[5m]))\n/\nsum by (job) (rate(certificates_processed{network=\"$network\", job=~\"$validator\"}[5m]))\n)",
-          "hide": false,
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.75,\nsum by (job) (rate(certificates_suspended{network=\"$network\", job=~\"$validator\"}[5m]))\n/\nsum by (job) (rate(certificates_processed{network=\"$network\", job=~\"$validator\"}[5m]))\n)",
-          "hide": false,
-          "legendFormat": "p75",
-          "range": true,
-          "refId": "C"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.95,\nsum by (job) (rate(certificates_suspended{network=\"$network\", job=~\"$validator\"}[5m]))\n/\nsum by (job) (rate(certificates_processed{network=\"$network\", job=~\"$validator\"}[5m]))\n)",
-          "hide": false,
-          "legendFormat": "p95",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Ratio of suspended to processed certificates",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 16,
-        "y": 178
-      },
-      "id": 175,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.95, sum by(le, route) (rate(worker_outbound_request_latency_bucket{job=~\"$validator\",network=\"$network\", route=~\".*WorkerToWorker.*\"}[5m])))",
-          "hide": false,
-          "legendFormat": "{{route}}-p95",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Worker to Worker Request Latency by Route",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Counts all the processed fetched certificates, triggered by the missing parents.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Certificate per sec",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 189
-      },
-      "id": 236,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, rate(certificate_fetcher_num_certificates_processed{network=\"$network\", job=~\"$validator\"}[5m]))",
-          "hide": false,
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.75, rate(certificate_fetcher_num_certificates_processed{network=\"$network\", job=~\"$validator\"}[5m]))",
-          "hide": false,
-          "legendFormat": "p75",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.95, rate(certificate_fetcher_num_certificates_processed{network=\"$network\", job=~\"$validator\"}[5m]))",
-          "hide": false,
-          "legendFormat": "p95",
-          "range": true,
-          "refId": "C"
-        }
-      ],
-      "title": "Fetched certificates per sec for missing ancestors",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 189
-      },
-      "id": 250,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (job) (rate(certificates_processed{job=~\"$validator\",network=\"$network\", source=\"other\"}[5m]))",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Certificates processed (other)",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "bytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 16,
-        "y": 189
-      },
-      "id": 262,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "histogram_quantile(0.99, sum(rate(primary_inbound_response_size_bucket{network=~\"$network\", route=\"/narwhal.PrimaryToPrimary/FetchCertificates\", job=~\"$validator\"}[5m])) by (le, job))",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Fetch Certificates Response Size - p99",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 200
-      },
-      "id": 249,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (job) (rate(certificates_processed{job=~\"$validator\",network=\"$network\", source=\"own\"}[5m]))",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Certificates processed (own)",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "In case the delta between outbound and inbound latencies is high, it could be a sign of rate limiting or contention on the handler.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 200
-      },
-      "id": 230,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by(route) (rate(primary_outbound_request_latency_sum{job=~\"$validator\",network=\"$network\",route=~\".*PrimaryToPrimary.*\"}[5m])) / sum by(route) (rate(primary_outbound_request_latency_count{job=~\"$validator\",network=\"$network\",route=~\".*PrimaryToPrimary.*\"}[5m]))\n-\nsum by(route) (rate(primary_inbound_request_latency_sum{job=~\"$validator\",network=\"$network\",route=~\".*PrimaryToPrimary.*\"}[5m])) / sum by(route) (rate(primary_inbound_request_latency_count{job=~\"$validator\",network=\"$network\",route=~\".*PrimaryToPrimary.*\"}[5m]))",
-          "hide": false,
-          "legendFormat": "{{route}}",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by(route) (rate(worker_outbound_request_latency_sum{host=~\"$validator\",network=\"$network\", route=~\".*WorkerToWorker.*\"}[5m])) / sum by(route) (rate(worker_outbound_request_latency_count{host=~\"$validator\",network=\"$network\", route=~\".*WorkerToWorker.*\"}[5m]))\n-\nsum by(route) (rate(worker_inbound_request_latency_sum{host=~\"$validator\",network=\"$network\", route=~\".*WorkerToWorker.*\"}[5m])) / sum by(route) (rate(worker_inbound_request_latency_count{host=~\"$validator\",network=\"$network\", route=~\".*WorkerToWorker.*\"}[5m]))",
-          "hide": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Outbound vs Inbound Latency Gap",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "RPS",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 16,
-        "y": 200
-      },
-      "id": 231,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, sum by(job) (rate(primary_outbound_request_latency_count{job=~\"$validator\",network=\"$network\"}[5m])))",
-          "hide": false,
-          "legendFormat": "primary_outbound",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, sum by(job) (rate(worker_outbound_request_latency_count{job=~\"$validator\",network=\"$network\"}[5m])))\n",
-          "hide": false,
-          "legendFormat": "worker_outbound",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, sum by(job) (rate(primary_inbound_request_latency_count{job=~\"$validator\",network=\"$network\"}[5m])))",
-          "hide": false,
-          "legendFormat": "primary_inbound",
-          "range": true,
-          "refId": "C"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, sum by(job) (rate(worker_inbound_request_latency_count{job=~\"$validator\",network=\"$network\"}[5m])))",
-          "hide": false,
-          "legendFormat": "worker_inbound",
-          "range": true,
-          "refId": "D"
-        }
-      ],
-      "title": "Anemo rps per validator",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 211
-      },
-      "id": 132,
-      "panels": [],
-      "title": "Executor",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Time between cert creation and the moment it has reached the executor (median across validators).",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 0,
-        "y": 212
-      },
-      "id": 139,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.5, sum by(job,le) (rate(subscriber_certificate_latency_bucket{job=~\"$validator\",network=\"$network\"}[5m]))))",
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.95, sum by(job,le) (rate(subscriber_certificate_latency_bucket{job=~\"$validator\",network=\"$network\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "p95",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Certificate to Subscriber Latency",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Latency between the time when the batch has been created and the moment it has been fetched for execution (median across validators)",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 8,
-        "y": 212
-      },
-      "id": 142,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.5, sum by(job,le) (rate(batch_execution_latency_bucket{job=~\"$validator\",network=\"$network\"}[5m]))))",
-          "legendFormat": "p50",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "quantile(0.5, histogram_quantile(0.95, sum by(job,le) (rate(batch_execution_latency_bucket{job=~\"$validator\",network=\"$network\"}[5m]))))",
-          "hide": false,
-          "legendFormat": "p95",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Batch to Execution Latency",
-      "type": "timeseries"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 223
-      },
-      "id": 109,
-      "panels": [],
-      "title": "NW Network",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Num of primary peers connected per host",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "Num peers connected",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineStyle": {
-              "dash": [
-                0,
-                10
-              ],
-              "fill": "dot"
-            },
-            "lineWidth": 3,
-            "pointSize": 6,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "line+area"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "transparent",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 0,
-        "y": 224
-      },
-      "id": 261,
-      "interval": "2m",
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "8.5.2",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (job) (worker_network_peer_connected{job=~\"$validator\", network=\"$network\", type=\"other_worker\"})",
-          "hide": false,
-          "legendFormat": "{{label_name}}",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Worker network connectivity",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Congestion events for primary and worker connections",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 8,
-        "y": 224
-      },
-      "id": 254,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by(job) (rate(worker_network_peer_congestion_events{job=~\"$validator\", network=\"$network\"}[5m]))",
-          "hide": false,
-          "instant": false,
-          "key": "Q-a68ca97d-edc4-4cc5-bc7f-003175cce0c3-8",
-          "legendFormat": "worker-{{host}}",
-          "range": true,
-          "refId": "worker_network_peer_congestion_events"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by(job) (rate(primary_network_peer_congestion_events{job=~\"$validator\", network=\"$network\"}[5m]))",
-          "hide": false,
-          "instant": false,
-          "key": "Q-a68ca97d-edc4-4cc5-bc7f-003175cce0c3-8",
-          "legendFormat": "primary-{{host}}",
-          "range": true,
-          "refId": "primary_network_peer_congestion_events"
-        }
-      ],
-      "title": "Congestion Events ",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${Environment}"
-      },
-      "description": "Packet loss for primary and worker connections",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 8,
-        "x": 16,
-        "y": 224
-      },
-      "id": 252,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by(job) (rate(worker_network_peer_lost_packets{job=~\"$validator\", network=\"$network\"}[5m])) / sum by(job) (rate(worker_network_peer_sent_packets{job=~\"$validator\", network=\"$network\"}[5m])) * 100",
-          "hide": false,
-          "instant": false,
-          "key": "Q-a68ca97d-edc4-4cc5-bc7f-003175cce0c3-8",
-          "legendFormat": "worker-{{host}}",
-          "range": true,
-          "refId": "worker_network_peer_lost_packets"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${Environment}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by(job) (rate(primary_network_peer_lost_packets{job=~\"$validator\", network=\"$network\"}[5m])) / sum by(job) (rate(primary_network_peer_sent_packets{job=~\"$validator\", network=\"$network\"}[5m])) * 100",
-          "hide": false,
-          "instant": false,
-          "key": "Q-a68ca97d-edc4-4cc5-bc7f-003175cce0c3-8",
-          "legendFormat": "primary-{{host}}",
-          "range": true,
-          "refId": "primary_network_peer_lost_packets"
-        }
-      ],
-      "title": "Packet Loss %",
-      "type": "timeseries"
-    }
-  ],
-  "refresh": false,
-  "revision": 1,
-  "schemaVersion": 38,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": [
-      {
-        "current": {
-          "selected": true,
-          "text": "testbed",
-          "value": "testbed"
-        },
-        "hide": 0,
-        "includeAll": false,
-        "label": "Datasource",
-        "multi": false,
-        "name": "Environment",
-        "options": [],
-        "query": "prometheus",
-        "queryValue": "",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "type": "datasource"
-      },
-      {
-        "current": {
-          "isNone": true,
-          "selected": true,
-          "text": "None",
-          "value": ""
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${Environment}"
-        },
-        "definition": "label_values(uptime,network)",
-        "hide": 0,
-        "includeAll": false,
-        "label": "Network",
-        "multi": false,
-        "name": "network",
-        "options": [],
-        "query": {
-          "query": "label_values(uptime,network)",
-          "refId": "PrometheusVariableQueryEditor-VariableQuery"
-        },
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
-      },
-      {
-        "current": {
-          "selected": true,
-          "text": [
-            "All"
-          ],
-          "value": [
-            "$__all"
-          ]
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${Environment}"
-        },
-        "definition": "label_values(uptime{network=\"$network\"},job)",
-        "hide": 0,
-        "includeAll": true,
-        "label": "Validator",
-        "multi": true,
-        "name": "validator",
-        "options": [],
-        "query": {
-          "query": "label_values(uptime{network=\"$network\"},job)",
-          "refId": "PrometheusVariableQueryEditor-VariableQuery"
-        },
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
-      }
-    ]
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "Iota Validators - Narwhal",
-  "uid": "SpRJIxL4z",
-  "version": 7,
-  "weekStart": ""
-}
\ No newline at end of file
diff --git a/crates/iota-aws-orchestrator/src/orchestrator.rs b/crates/iota-aws-orchestrator/src/orchestrator.rs
index e111cd5af14..97577e45470 100644
--- a/crates/iota-aws-orchestrator/src/orchestrator.rs
+++ b/crates/iota-aws-orchestrator/src/orchestrator.rs
@@ -451,8 +451,8 @@ impl<P: ProtocolCommands<T> + ProtocolMetrics, T: BenchmarkType> Orchestrator<P,
         // Regularly scrape the client
         let mut metrics_commands = self.protocol_commands.clients_metrics_command(clients);
 
-        // TODO: Remove this when narwhal client latency metrics are available.
-        // We will be getting latency metrics directly from narwhal nodes instead from
+        // TODO: Remove this when consensus client latency metrics are available.
+        // We will be getting latency metrics directly from consensus nodes instead from
         // the nw client
         metrics_commands.append(&mut self.protocol_commands.nodes_metrics_command(nodes.clone()));
 
diff --git a/crates/iota-benchmark/Cargo.toml b/crates/iota-benchmark/Cargo.toml
index 4a8bc1dbe07..18b7528c396 100644
--- a/crates/iota-benchmark/Cargo.toml
+++ b/crates/iota-benchmark/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-benchmark"
-version = "0.0.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-benchmark/src/lib.rs b/crates/iota-benchmark/src/lib.rs
index e4845c2715e..065472823e7 100644
--- a/crates/iota-benchmark/src/lib.rs
+++ b/crates/iota-benchmark/src/lib.rs
@@ -54,7 +54,7 @@ use iota_types::{
     gas_coin::GasCoin,
     iota_system_state::{IotaSystemStateTrait, iota_system_state_summary::IotaSystemStateSummary},
     message_envelope::Envelope,
-    messages_grpc::{HandleCertificateResponseV2, TransactionStatus},
+    messages_grpc::{HandleCertificateRequestV1, HandleCertificateResponseV1, TransactionStatus},
     object::{Object, Owner},
     programmable_transaction_builder::ProgrammableTransactionBuilder,
     quorum_driver_types::{QuorumDriverError, QuorumDriverResponse},
@@ -524,7 +524,7 @@ impl ValidatorProxy for LocalValidatorAggregatorProxy {
             let name = *name;
             futures.push(async move {
                 client
-                    .handle_certificate_v2(certificate, None)
+                    .handle_certificate_v1(HandleCertificateRequestV1::new(certificate), None)
                     .map(move |r| (r, name))
                     .await
             });
@@ -539,14 +539,14 @@ impl ValidatorProxy for LocalValidatorAggregatorProxy {
             auth_agg.metrics.inflight_certificate_requests.dec();
             match response {
                 // If all goes well, the validators reply with signed effects.
-                Ok(HandleCertificateResponseV2 {
-                    signed_effects,
+                Ok(HandleCertificateResponseV1 {
+                       signed_effects,
                     events,
-                    fastpath_input_objects: _, // unused field
+                    .. // unused field
                 }) => {
                     let author = signed_effects.auth_sig().authority;
                     transaction_effects = Some(signed_effects.data().clone());
-                    transaction_events = Some(events);
+                    transaction_events = events;
                     total_stake += self.committee.weight(&author);
                 }
 
diff --git a/crates/iota-benchmark/tests/simtest.rs b/crates/iota-benchmark/tests/simtest.rs
index f903d1db610..b411c546435 100644
--- a/crates/iota-benchmark/tests/simtest.rs
+++ b/crates/iota-benchmark/tests/simtest.rs
@@ -376,15 +376,12 @@ mod test {
             }
         });
 
-        // Narwhal & Consensus 2.0 fail points.
+        // Consensus fail points.
         let dead_validator = dead_validator_orig.clone();
         let keep_alive_nodes_clone = keep_alive_nodes.clone();
         let grace_period_clone = grace_period.clone();
         register_fail_points(
             &[
-                "narwhal-rpc-response",
-                "narwhal-store-before-write",
-                "narwhal-store-after-write",
                 "consensus-store-before-write",
                 "consensus-store-after-write",
                 "consensus-after-propose",
@@ -399,7 +396,6 @@ mod test {
                 );
             },
         );
-        register_fail_point_async("narwhal-delay", || delay_failpoint(10..20, 0.001));
 
         let dead_validator = dead_validator_orig.clone();
         let keep_alive_nodes_clone = keep_alive_nodes.clone();
@@ -507,17 +503,11 @@ mod test {
                     let total_gas_limit = checkpoint_budget_factor
                         * DEFAULT_VALIDATOR_GAS_PRICE
                         * TEST_ONLY_GAS_UNIT_FOR_HEAVY_COMPUTATION_STORAGE;
-                    config.set_max_accumulated_txn_cost_per_object_in_narwhal_commit_for_testing(
-                        total_gas_limit,
-                    );
                     config.set_max_accumulated_txn_cost_per_object_in_mysticeti_commit_for_testing(
                         total_gas_limit,
                     );
                 }
                 PerObjectCongestionControlMode::TotalTxCount => {
-                    config.set_max_accumulated_txn_cost_per_object_in_narwhal_commit_for_testing(
-                        txn_count_limit,
-                    );
                     config.set_max_accumulated_txn_cost_per_object_in_mysticeti_commit_for_testing(
                         txn_count_limit,
                     );
@@ -668,7 +658,8 @@ mod test {
     }
 
     async fn test_protocol_upgrade_compatibility_impl() {
-        let max_ver = ProtocolVersion::MAX.as_u64();
+        // TODO: Remove the `+ 1` after we have Protocol version 2
+        let max_ver = ProtocolVersion::MAX.as_u64() + 1;
         let manifest = iota_framework_snapshot::load_bytecode_snapshot_manifest();
 
         let Some((&starting_version, _)) = manifest.range(..max_ver).last() else {
@@ -838,9 +829,6 @@ mod test {
             "SIM_STRESS_TEST_NUM_VALIDATORS",
             default_num_validators,
         ));
-        if std::env::var("CHECKPOINTS_PER_EPOCH").is_ok() {
-            eprintln!("CHECKPOINTS_PER_EPOCH env var is deprecated, use EPOCH_DURATION_MS");
-        }
         let epoch_duration_ms = get_var("EPOCH_DURATION_MS", default_epoch_duration_ms);
         if epoch_duration_ms > 0 {
             builder = builder.with_epoch_duration_ms(epoch_duration_ms);
diff --git a/crates/iota-bridge-indexer/Cargo.toml b/crates/iota-bridge-indexer/Cargo.toml
index a4c53387246..ef569b6fc10 100644
--- a/crates/iota-bridge-indexer/Cargo.toml
+++ b/crates/iota-bridge-indexer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-bridge-indexer"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-bridge/src/error.rs b/crates/iota-bridge/src/error.rs
index 928bf74b8b0..de290334a58 100644
--- a/crates/iota-bridge/src/error.rs
+++ b/crates/iota-bridge/src/error.rs
@@ -66,7 +66,7 @@ pub enum BridgeError {
     ZeroValueBridgeTransfer(String),
     // Storage Error
     Storage(String),
-    // Rest API Error
+    // REST API Error
     RestAPI(String),
     // Uncategorized error
     Generic(String),
diff --git a/crates/iota-common/Cargo.toml b/crates/iota-common/Cargo.toml
index a50362ce983..dae484a5052 100644
--- a/crates/iota-common/Cargo.toml
+++ b/crates/iota-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-common"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-config/Cargo.toml b/crates/iota-config/Cargo.toml
index 3e8f0e0ab8d..b9a2c09c78d 100644
--- a/crates/iota-config/Cargo.toml
+++ b/crates/iota-config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-config"
-version = "0.0.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-config/src/node.rs b/crates/iota-config/src/node.rs
index 3821e0d4261..ddf63329504 100644
--- a/crates/iota-config/src/node.rs
+++ b/crates/iota-config/src/node.rs
@@ -75,10 +75,10 @@ pub struct NodeConfig {
     #[serde(default = "default_json_rpc_address")]
     pub json_rpc_address: SocketAddr,
 
-    /// Flag to enable the experimental REST API under `/rest`
+    /// Flag to enable the REST API under `/api/v1`
     /// endpoint on the same interface as `json` `rpc` server.
     #[serde(default)]
-    pub enable_experimental_rest_api: bool,
+    pub enable_rest_api: bool,
 
     /// The address for Prometheus metrics.
     #[serde(default = "default_metrics_address")]
diff --git a/crates/iota-core/Cargo.toml b/crates/iota-core/Cargo.toml
index 92103862792..15b4ed36fae 100644
--- a/crates/iota-core/Cargo.toml
+++ b/crates/iota-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-core"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -41,6 +41,7 @@ object_store.workspace = true
 once_cell.workspace = true
 parking_lot.workspace = true
 prometheus.workspace = true
+quinn-proto.workspace = true
 rand.workspace = true
 rayon.workspace = true
 reqwest.workspace = true
@@ -87,7 +88,6 @@ move-bytecode-utils.workspace = true
 move-core-types.workspace = true
 move-package.workspace = true
 move-symbol-pool.workspace = true
-narwhal-types.workspace = true
 shared-crypto.workspace = true
 telemetry-subscribers.workspace = true
 typed-store.workspace = true
@@ -105,6 +105,7 @@ pretty_assertions.workspace = true
 rstest.workspace = true
 serde-reflection.workspace = true
 serde_yaml.workspace = true
+tower.workspace = true
 
 # internal dependencies
 iota-move.workspace = true
diff --git a/crates/iota-core/src/authority.rs b/crates/iota-core/src/authority.rs
index 7eee6f5e8eb..2148444201e 100644
--- a/crates/iota-core/src/authority.rs
+++ b/crates/iota-core/src/authority.rs
@@ -84,10 +84,9 @@ use iota_types::{
     message_envelope::Message,
     messages_checkpoint::{
         CertifiedCheckpointSummary, CheckpointCommitment, CheckpointContents,
-        CheckpointContentsDigest, CheckpointDigest, CheckpointRequest, CheckpointRequestV2,
-        CheckpointResponse, CheckpointResponseV2, CheckpointSequenceNumber, CheckpointSummary,
-        CheckpointSummaryResponse, CheckpointTimestamp, ECMHLiveObjectSetDigest,
-        VerifiedCheckpoint,
+        CheckpointContentsDigest, CheckpointDigest, CheckpointRequest, CheckpointResponse,
+        CheckpointSequenceNumber, CheckpointSummary, CheckpointSummaryResponse,
+        CheckpointTimestamp, ECMHLiveObjectSetDigest, VerifiedCheckpoint,
     },
     messages_consensus::AuthorityCapabilitiesV1,
     messages_grpc::{
@@ -2558,30 +2557,6 @@ impl AuthorityState {
         &self,
         request: &CheckpointRequest,
     ) -> IotaResult<CheckpointResponse> {
-        let summary = match request.sequence_number {
-            Some(seq) => self
-                .checkpoint_store
-                .get_checkpoint_by_sequence_number(seq)?,
-            None => self.checkpoint_store.get_latest_certified_checkpoint(),
-        }
-        .map(|v| v.into_inner());
-        let contents = match &summary {
-            Some(s) => self
-                .checkpoint_store
-                .get_checkpoint_contents(&s.content_digest)?,
-            None => None,
-        };
-        Ok(CheckpointResponse {
-            checkpoint: summary,
-            contents,
-        })
-    }
-
-    #[instrument(level = "trace", skip_all)]
-    pub fn handle_checkpoint_request_v2(
-        &self,
-        request: &CheckpointRequestV2,
-    ) -> IotaResult<CheckpointResponseV2> {
         let summary = if request.certified {
             let summary = match request.sequence_number {
                 Some(seq) => self
@@ -2606,7 +2581,7 @@ impl AuthorityState {
                 .get_checkpoint_contents(&s.content_digest())?,
             None => None,
         };
-        Ok(CheckpointResponseV2 {
+        Ok(CheckpointResponse {
             checkpoint: summary,
             contents,
         })
@@ -4539,7 +4514,11 @@ impl AuthorityState {
         gas_cost_summary: &GasCostSummary,
         checkpoint: CheckpointSequenceNumber,
         epoch_start_timestamp_ms: CheckpointTimestamp,
-    ) -> anyhow::Result<(IotaSystemState, SystemEpochInfoEventV1, TransactionEffects)> {
+    ) -> anyhow::Result<(
+        IotaSystemState,
+        Option<SystemEpochInfoEventV1>,
+        TransactionEffects,
+    )> {
         let mut txns = Vec::new();
 
         if let Some(tx) = self.create_authenticator_state_tx(epoch_store) {
@@ -4669,11 +4648,13 @@ impl AuthorityState {
             .data
             .iter()
             .find(|event| event.is_system_epoch_info_event())
-            .expect("end of epoch tx must emit system epoch info event");
-        let system_epoch_info_event = bcs::from_bytes::<SystemEpochInfoEventV1>(
-            &system_epoch_info_event.contents,
-        )
-        .expect("deserialization should succeed since we asserted that the event is of this type");
+            .map(|event| {
+                bcs::from_bytes::<SystemEpochInfoEventV1>(&event.contents)
+                    .expect("event deserialization should succeed as type was pre-validated")
+            });
+        // The system epoch info event can be `None` in case if the `advance_epoch`
+        // Move function call failed and was executed in the safe mode.
+        assert!(system_epoch_info_event.is_some() || system_obj.safe_mode());
 
         // We must write tx and effects to the state sync tables so that state sync is
         // able to deliver to the transaction to CheckpointExecutor after it is
diff --git a/crates/iota-core/src/authority/authority_per_epoch_store.rs b/crates/iota-core/src/authority/authority_per_epoch_store.rs
index c0d016458f8..5fb03ed47e1 100644
--- a/crates/iota-core/src/authority/authority_per_epoch_store.rs
+++ b/crates/iota-core/src/authority/authority_per_epoch_store.rs
@@ -32,7 +32,7 @@ use iota_types::{
     accumulator::Accumulator,
     authenticator_state::{ActiveJwk, get_authenticator_state},
     base_types::{
-        AuthorityName, ConciseableName, EpochId, ObjectID, ObjectRef, SequenceNumber,
+        AuthorityName, CommitRound, ConciseableName, EpochId, ObjectID, ObjectRef, SequenceNumber,
         TransactionDigest,
     },
     committee::{Committee, CommitteeTrait},
@@ -62,7 +62,6 @@ use iota_types::{
 };
 use itertools::{Itertools, izip};
 use move_bytecode_utils::module_cache::SyncModuleCache;
-use narwhal_types::{Round, TimestampMs};
 use parking_lot::{Mutex, RwLock, RwLockReadGuard, RwLockWriteGuard};
 use prometheus::IntCounter;
 use serde::{Deserialize, Serialize};
@@ -104,7 +103,7 @@ use crate::{
     epoch::{
         epoch_metrics::EpochMetrics,
         randomness::{
-            DkgStatus, RandomnessManager, RandomnessReporter, SINGLETON_KEY,
+            CommitTimestampMs, DkgStatus, RandomnessManager, RandomnessReporter, SINGLETON_KEY,
             VersionedProcessedMessage, VersionedUsedProcessedMessages,
         },
         reconfiguration::ReconfigState,
@@ -599,7 +598,7 @@ pub struct AuthorityEpochTables {
     pub(crate) randomness_highest_completed_round: DBMap<u64, RandomnessRound>,
 
     /// Holds the timestamp of the most recently generated round of randomness.
-    pub(crate) randomness_last_round_timestamp: DBMap<u64, TimestampMs>,
+    pub(crate) randomness_last_round_timestamp: DBMap<u64, CommitTimestampMs>,
 }
 
 fn signed_transactions_table_default_config() -> DBOptions {
@@ -1696,7 +1695,7 @@ impl AuthorityPerEpochStore {
     fn should_defer(
         &self,
         cert: &VerifiedExecutableTransaction,
-        commit_round: Round,
+        commit_round: CommitRound,
         dkg_failed: bool,
         generating_randomness: bool,
         previously_deferred_tx_digests: &HashMap<TransactionDigest, DeferralKey>,
@@ -2383,10 +2382,6 @@ impl AuthorityPerEpochStore {
                     return None;
                 }
             }
-            SequencedConsensusTransactionKind::External(ConsensusTransaction {
-                kind: ConsensusTransactionKind::RandomnessStateUpdate(_round, _bytes),
-                ..
-            }) => {}
             SequencedConsensusTransactionKind::External(ConsensusTransaction {
                 kind: ConsensusTransactionKind::RandomnessDkgMessage(authority, _bytes),
                 ..
@@ -3224,7 +3219,7 @@ impl AuthorityPerEpochStore {
         output: &mut ConsensusCommitOutput,
         transaction: &VerifiedSequencedConsensusTransaction,
         checkpoint_service: &Arc<C>,
-        commit_round: Round,
+        commit_round: CommitRound,
         previously_deferred_tx_digests: &HashMap<TransactionDigest, DeferralKey>,
         mut randomness_manager: Option<&mut RandomnessManager>,
         dkg_failed: bool,
@@ -3427,13 +3422,6 @@ impl AuthorityPerEpochStore {
                 }
                 Ok(ConsensusCertificateResult::ConsensusMessage)
             }
-            SequencedConsensusTransactionKind::External(ConsensusTransaction {
-                kind: ConsensusTransactionKind::RandomnessStateUpdate(_, _),
-                ..
-            }) => {
-                // These are always generated as System transactions (handled below).
-                panic!("process_consensus_transaction called with external RandomnessStateUpdate");
-            }
             SequencedConsensusTransactionKind::External(ConsensusTransaction {
                 kind: ConsensusTransactionKind::RandomnessDkgMessage(authority, bytes),
                 ..
@@ -3840,7 +3828,7 @@ pub(crate) struct ConsensusCommitOutput {
     pending_checkpoints: Vec<PendingCheckpoint>,
 
     // random beacon state
-    next_randomness_round: Option<(RandomnessRound, TimestampMs)>,
+    next_randomness_round: Option<(RandomnessRound, CommitTimestampMs)>,
 
     dkg_confirmations: BTreeMap<PartyId, VersionedDkgConfirmation>,
     dkg_processed_messages: BTreeMap<PartyId, VersionedProcessedMessage>,
@@ -3918,7 +3906,7 @@ impl ConsensusCommitOutput {
     pub fn reserve_next_randomness_round(
         &mut self,
         next_randomness_round: RandomnessRound,
-        commit_timestamp: TimestampMs,
+        commit_timestamp: CommitTimestampMs,
     ) {
         assert!(self.next_randomness_round.is_none());
         self.next_randomness_round = Some((next_randomness_round, commit_timestamp));
diff --git a/crates/iota-core/src/authority/shared_object_congestion_tracker.rs b/crates/iota-core/src/authority/shared_object_congestion_tracker.rs
index 3cff245233e..75b9a4c7053 100644
--- a/crates/iota-core/src/authority/shared_object_congestion_tracker.rs
+++ b/crates/iota-core/src/authority/shared_object_congestion_tracker.rs
@@ -6,11 +6,10 @@ use std::collections::HashMap;
 
 use iota_protocol_config::PerObjectCongestionControlMode;
 use iota_types::{
-    base_types::{ObjectID, TransactionDigest},
+    base_types::{CommitRound, ObjectID, TransactionDigest},
     executable_transaction::VerifiedExecutableTransaction,
     transaction::SharedInputObject,
 };
-use narwhal_types::Round;
 
 use crate::authority::transaction_deferral::DeferralKey;
 
@@ -83,7 +82,7 @@ impl SharedObjectCongestionTracker {
         cert: &VerifiedExecutableTransaction,
         max_accumulated_txn_cost_per_object_in_commit: u64,
         previously_deferred_tx_digests: &HashMap<TransactionDigest, DeferralKey>,
-        commit_round: Round,
+        commit_round: CommitRound,
     ) -> Option<(DeferralKey, Vec<ObjectID>)> {
         let tx_cost = self.get_tx_cost(cert)?;
 
diff --git a/crates/iota-core/src/authority/transaction_deferral.rs b/crates/iota-core/src/authority/transaction_deferral.rs
index 8843592dd62..5af556cb3a9 100644
--- a/crates/iota-core/src/authority/transaction_deferral.rs
+++ b/crates/iota-core/src/authority/transaction_deferral.rs
@@ -2,8 +2,7 @@
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use iota_types::base_types::ObjectID;
-use narwhal_types::Round;
+use iota_types::base_types::{CommitRound, ObjectID};
 use serde::{Deserialize, Serialize};
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
@@ -11,26 +10,29 @@ pub enum DeferralKey {
     // For transactions deferred until new randomness is available (whether delayd due to
     // DKG, or skipped commits).
     Randomness {
-        deferred_from_round: Round, // commit round, not randomness round
+        deferred_from_round: CommitRound,
     },
     // ConsensusRound deferral key requires both the round to which the tx should be deferred (so
     // that we can efficiently load all txns that are now ready), and the round from which it
     // has been deferred (so that multiple rounds can efficiently defer to the same future
     // round).
     ConsensusRound {
-        future_round: Round,
-        deferred_from_round: Round,
+        future_round: CommitRound,
+        deferred_from_round: CommitRound,
     },
 }
 
 impl DeferralKey {
-    pub fn new_for_randomness(deferred_from_round: Round) -> Self {
+    pub fn new_for_randomness(deferred_from_round: CommitRound) -> Self {
         Self::Randomness {
             deferred_from_round,
         }
     }
 
-    pub fn new_for_consensus_round(future_round: Round, deferred_from_round: Round) -> Self {
+    pub fn new_for_consensus_round(
+        future_round: CommitRound,
+        deferred_from_round: CommitRound,
+    ) -> Self {
         Self::ConsensusRound {
             future_round,
             deferred_from_round,
@@ -50,7 +52,7 @@ impl DeferralKey {
 
     // Returns a range of deferral keys that are deferred up to the given consensus
     // round.
-    pub fn range_for_up_to_consensus_round(consensus_round: Round) -> (Self, Self) {
+    pub fn range_for_up_to_consensus_round(consensus_round: CommitRound) -> (Self, Self) {
         (
             Self::ConsensusRound {
                 future_round: 0,
@@ -63,7 +65,7 @@ impl DeferralKey {
         )
     }
 
-    pub fn deferred_from_round(&self) -> Round {
+    pub fn deferred_from_round(&self) -> CommitRound {
         match self {
             Self::Randomness {
                 deferred_from_round,
diff --git a/crates/iota-core/src/authority_aggregator.rs b/crates/iota-core/src/authority_aggregator.rs
index 5337bea6ec2..d7a3f8b6251 100644
--- a/crates/iota-core/src/authority_aggregator.rs
+++ b/crates/iota-core/src/authority_aggregator.rs
@@ -39,7 +39,7 @@ use iota_types::{
     },
     message_envelope::Message,
     messages_grpc::{
-        HandleCertificateRequestV3, HandleCertificateResponseV3, LayoutGenerationOption,
+        HandleCertificateRequestV1, HandleCertificateResponseV1, LayoutGenerationOption,
         ObjectInfoRequest, TransactionInfoRequest,
     },
     messages_safe_client::PlainTransactionInfoResponse,
@@ -1545,7 +1545,7 @@ where
     #[instrument(level = "trace", skip_all)]
     pub async fn process_certificate(
         &self,
-        request: HandleCertificateRequestV3,
+        request: HandleCertificateRequestV1,
         client_addr: Option<SocketAddr>,
     ) -> Result<QuorumDriverResponse, AggregatorProcessCertificateError> {
         let state = ProcessCertificateState {
@@ -1608,7 +1608,7 @@ where
                         let req = if validators_to_sample.contains(&name) {
                             request_ref
                         } else {
-                            HandleCertificateRequestV3 {
+                            HandleCertificateRequestV1 {
                                 include_events: false,
                                 include_input_objects: false,
                                 include_output_objects: false,
@@ -1618,17 +1618,17 @@ where
                         };
 
                         client
-                            .handle_certificate_v3(req, client_addr)
-                            .instrument(trace_span!("handle_certificate_v3", authority =? concise_name))
+                            .handle_certificate_v1(req, client_addr)
+                            .instrument(trace_span!("handle_certificate_v1", authority =? concise_name))
                             .await
                     } else {
                         client
-                            .handle_certificate_v2(request_ref.certificate, client_addr)
-                            .instrument(trace_span!("handle_certificate_v2", authority =? concise_name))
+                            .handle_certificate_v1(HandleCertificateRequestV1::new(request_ref.certificate).with_events(), client_addr)
+                            .instrument(trace_span!("handle_certificate_v1", authority =? concise_name))
                             .await
-                            .map(|response| HandleCertificateResponseV3 {
-                                effects: response.signed_effects,
-                                events: Some(response.events),
+                            .map(|response| HandleCertificateResponseV1 {
+                                signed_effects: response.signed_effects,
+                                events: response.events,
                                 input_objects: None,
                                 output_objects: None,
                                 auxiliary_data: None,
@@ -1755,17 +1755,17 @@ where
         Ok(result)
     }
 
-    /// Handles the `HandleCertificateResponseV2` variants.
+    /// Handles the `HandleCertificateResponseV1` variants.
     fn handle_process_certificate_response(
         committee: Arc<Committee>,
         tx_digest: &TransactionDigest,
         state: &mut ProcessCertificateState,
-        response: IotaResult<HandleCertificateResponseV3>,
+        response: IotaResult<HandleCertificateResponseV1>,
         name: AuthorityName,
     ) -> IotaResult<Option<QuorumDriverResponse>> {
         match response {
-            Ok(HandleCertificateResponseV3 {
-                effects: signed_effects,
+            Ok(HandleCertificateResponseV1 {
+                signed_effects,
                 events,
                 input_objects,
                 output_objects,
@@ -1860,7 +1860,7 @@ where
         let _cert_guard = GaugeGuard::acquire(&self.metrics.inflight_certificates);
         let response = self
             .process_certificate(
-                HandleCertificateRequestV3 {
+                HandleCertificateRequestV1 {
                     certificate: cert.clone(),
                     include_events: true,
                     include_input_objects: false,
diff --git a/crates/iota-core/src/authority_client.rs b/crates/iota-core/src/authority_client.rs
index 23457b75321..c8f212f7d1e 100644
--- a/crates/iota-core/src/authority_client.rs
+++ b/crates/iota-core/src/authority_client.rs
@@ -18,12 +18,10 @@ use iota_types::{
     committee::CommitteeWithNetworkMetadata,
     error::{IotaError, IotaResult},
     iota_system_state::IotaSystemState,
-    messages_checkpoint::{
-        CheckpointRequest, CheckpointRequestV2, CheckpointResponse, CheckpointResponseV2,
-    },
+    messages_checkpoint::{CheckpointRequest, CheckpointResponse},
     messages_grpc::{
-        HandleCertificateRequestV3, HandleCertificateResponseV2, HandleCertificateResponseV3,
-        HandleSoftBundleCertificatesRequestV3, HandleSoftBundleCertificatesResponseV3,
+        HandleCertificateRequestV1, HandleCertificateResponseV1,
+        HandleSoftBundleCertificatesRequestV1, HandleSoftBundleCertificatesResponseV1,
         HandleTransactionResponse, ObjectInfoRequest, ObjectInfoResponse, SystemStateRequest,
         TransactionInfoRequest, TransactionInfoResponse,
     },
@@ -42,26 +40,19 @@ pub trait AuthorityAPI {
         client_addr: Option<SocketAddr>,
     ) -> Result<HandleTransactionResponse, IotaError>;
 
-    /// Handles a `CertifiedTransaction` for this account.
-    async fn handle_certificate_v2(
-        &self,
-        certificate: CertifiedTransaction,
-        client_addr: Option<SocketAddr>,
-    ) -> Result<HandleCertificateResponseV2, IotaError>;
-
     /// Execute a certificate.
-    async fn handle_certificate_v3(
+    async fn handle_certificate_v1(
         &self,
-        request: HandleCertificateRequestV3,
+        request: HandleCertificateRequestV1,
         client_addr: Option<SocketAddr>,
-    ) -> Result<HandleCertificateResponseV3, IotaError>;
+    ) -> Result<HandleCertificateResponseV1, IotaError>;
 
     /// Execute a Soft Bundle with multiple certificates.
-    async fn handle_soft_bundle_certificates_v3(
+    async fn handle_soft_bundle_certificates_v1(
         &self,
-        request: HandleSoftBundleCertificatesRequestV3,
+        request: HandleSoftBundleCertificatesRequestV1,
         client_addr: Option<SocketAddr>,
-    ) -> Result<HandleSoftBundleCertificatesResponseV3, IotaError>;
+    ) -> Result<HandleSoftBundleCertificatesResponseV1, IotaError>;
 
     /// Handle Object information requests for this account.
     async fn handle_object_info_request(
@@ -81,12 +72,6 @@ pub trait AuthorityAPI {
         request: CheckpointRequest,
     ) -> Result<CheckpointResponse, IotaError>;
 
-    /// Handles a `CheckpointRequestV2` for this account.
-    async fn handle_checkpoint_v2(
-        &self,
-        request: CheckpointRequestV2,
-    ) -> Result<CheckpointResponseV2, IotaError>;
-
     // This API is exclusively used by the benchmark code.
     // Hence it's OK to return a fixed system state type.
     async fn handle_system_state_object(
@@ -155,52 +140,34 @@ impl AuthorityAPI for NetworkAuthorityClient {
             .map_err(Into::into)
     }
 
-    /// Handles a `CertifiedTransaction` for this account.
-    async fn handle_certificate_v2(
+    async fn handle_certificate_v1(
         &self,
-        certificate: CertifiedTransaction,
+        request: HandleCertificateRequestV1,
         client_addr: Option<SocketAddr>,
-    ) -> Result<HandleCertificateResponseV2, IotaError> {
-        let mut request = certificate.into_request();
-        insert_metadata(&mut request, client_addr);
-
-        let response = self
-            .client()?
-            .handle_certificate_v2(request)
-            .await
-            .map(tonic::Response::into_inner);
-
-        response.map_err(Into::into)
-    }
-
-    async fn handle_certificate_v3(
-        &self,
-        request: HandleCertificateRequestV3,
-        client_addr: Option<SocketAddr>,
-    ) -> Result<HandleCertificateResponseV3, IotaError> {
+    ) -> Result<HandleCertificateResponseV1, IotaError> {
         let mut request = request.into_request();
         insert_metadata(&mut request, client_addr);
 
         let response = self
             .client()?
-            .handle_certificate_v3(request)
+            .handle_certificate_v1(request)
             .await
             .map(tonic::Response::into_inner);
 
         response.map_err(Into::into)
     }
 
-    async fn handle_soft_bundle_certificates_v3(
+    async fn handle_soft_bundle_certificates_v1(
         &self,
-        request: HandleSoftBundleCertificatesRequestV3,
+        request: HandleSoftBundleCertificatesRequestV1,
         client_addr: Option<SocketAddr>,
-    ) -> Result<HandleSoftBundleCertificatesResponseV3, IotaError> {
+    ) -> Result<HandleSoftBundleCertificatesResponseV1, IotaError> {
         let mut request = request.into_request();
         insert_metadata(&mut request, client_addr);
 
         let response = self
             .client()?
-            .handle_soft_bundle_certificates_v3(request)
+            .handle_soft_bundle_certificates_v1(request)
             .await
             .map(tonic::Response::into_inner);
 
@@ -243,18 +210,6 @@ impl AuthorityAPI for NetworkAuthorityClient {
             .map_err(Into::into)
     }
 
-    /// Handles a `CheckpointRequestV2` for this account.
-    async fn handle_checkpoint_v2(
-        &self,
-        request: CheckpointRequestV2,
-    ) -> Result<CheckpointResponseV2, IotaError> {
-        self.client()?
-            .checkpoint_v2(request)
-            .await
-            .map(tonic::Response::into_inner)
-            .map_err(Into::into)
-    }
-
     /// This API is exclusively used by the benchmark code.
     async fn handle_system_state_object(
         &self,
diff --git a/crates/iota-core/src/authority_server.rs b/crates/iota-core/src/authority_server.rs
index b842127274f..75ef3f41997 100644
--- a/crates/iota-core/src/authority_server.rs
+++ b/crates/iota-core/src/authority_server.rs
@@ -23,13 +23,11 @@ use iota_types::{
     error::*,
     fp_ensure,
     iota_system_state::IotaSystemState,
-    messages_checkpoint::{
-        CheckpointRequest, CheckpointRequestV2, CheckpointResponse, CheckpointResponseV2,
-    },
+    messages_checkpoint::{CheckpointRequest, CheckpointResponse},
     messages_consensus::ConsensusTransaction,
     messages_grpc::{
-        HandleCertificateRequestV3, HandleCertificateResponseV2, HandleCertificateResponseV3,
-        HandleSoftBundleCertificatesRequestV3, HandleSoftBundleCertificatesResponseV3,
+        HandleCertificateRequestV1, HandleCertificateResponseV1,
+        HandleSoftBundleCertificatesRequestV1, HandleSoftBundleCertificatesResponseV1,
         HandleTransactionResponse, ObjectInfoRequest, ObjectInfoResponse,
         SubmitCertificateResponse, SystemStateRequest, TransactionInfoRequest,
         TransactionInfoResponse,
@@ -362,9 +360,9 @@ impl ValidatorService {
     pub async fn execute_certificate_for_testing(
         &self,
         cert: CertifiedTransaction,
-    ) -> Result<tonic::Response<HandleCertificateResponseV2>, tonic::Status> {
-        let request = make_tonic_request_for_testing(cert);
-        self.handle_certificate_v2(request).await
+    ) -> Result<tonic::Response<HandleCertificateResponseV1>, tonic::Status> {
+        let request = make_tonic_request_for_testing(HandleCertificateRequestV1::new(cert));
+        self.handle_certificate_v1(request).await
     }
 
     /// Handles a `Transaction` request for benchmarking.
@@ -467,7 +465,7 @@ impl ValidatorService {
         _include_auxiliary_data: bool,
         epoch_store: &Arc<AuthorityPerEpochStore>,
         wait_for_effects: bool,
-    ) -> Result<(Option<Vec<HandleCertificateResponseV3>>, Weight), tonic::Status> {
+    ) -> Result<(Option<Vec<HandleCertificateResponseV1>>, Weight), tonic::Status> {
         // Validate if cert can be executed
         // Fullnode does not serve handle_certificate call.
         fp_ensure!(
@@ -521,8 +519,8 @@ impl ValidatorService {
                 };
 
                 return Ok((
-                    Some(vec![HandleCertificateResponseV3 {
-                        effects: signed_effects.into_inner(),
+                    Some(vec![HandleCertificateResponseV1 {
+                        signed_effects: signed_effects.into_inner(),
                         events,
                         input_objects: None,
                         output_objects: None,
@@ -648,8 +646,8 @@ impl ValidatorService {
                 let signed_effects = self.state.sign_effects(effects, epoch_store)?;
                 epoch_store.insert_tx_cert_sig(certificate.digest(), certificate.auth_sig())?;
 
-                Ok::<_, IotaError>(HandleCertificateResponseV3 {
-                    effects: signed_effects.into_inner(),
+                Ok::<_, IotaError>(HandleCertificateResponseV1 {
+                    signed_effects: signed_effects.into_inner(),
                     events,
                     input_objects,
                     output_objects,
@@ -703,51 +701,17 @@ impl ValidatorService {
         })
     }
 
-    async fn handle_certificate_v2_impl(
-        &self,
-        request: tonic::Request<CertifiedTransaction>,
-    ) -> WrappedServiceResponse<HandleCertificateResponseV2> {
-        let epoch_store = self.state.load_epoch_store_one_call_per_task();
-        let certificate = request.into_inner();
-        certificate.validity_check(epoch_store.protocol_config(), epoch_store.epoch())?;
-
-        let span = error_span!("handle_certificate", tx_digest = ?certificate.digest());
-        self.handle_certificates(
-            nonempty![certificate],
-            true,
-            false,
-            false,
-            false,
-            &epoch_store,
-            true,
-        )
-        .instrument(span)
-        .await
-        .map(|(resp, spam_weight)| {
-            (
-                tonic::Response::new(
-                    resp.expect(
-                        "handle_certificate should not return none with wait_for_effects=true",
-                    )
-                    .remove(0)
-                    .into(),
-                ),
-                spam_weight,
-            )
-        })
-    }
-
-    async fn handle_certificate_v3_impl(
+    async fn handle_certificate_v1_impl(
         &self,
-        request: tonic::Request<HandleCertificateRequestV3>,
-    ) -> WrappedServiceResponse<HandleCertificateResponseV3> {
+        request: tonic::Request<HandleCertificateRequestV1>,
+    ) -> WrappedServiceResponse<HandleCertificateResponseV1> {
         let epoch_store = self.state.load_epoch_store_one_call_per_task();
         let request = request.into_inner();
         request
             .certificate
             .validity_check(epoch_store.protocol_config(), epoch_store.epoch())?;
 
-        let span = error_span!("handle_certificate_v3", tx_digest = ?request.certificate.digest());
+        let span = error_span!("handle_certificate_v1", tx_digest = ?request.certificate.digest());
         self.handle_certificates(
             nonempty![request.certificate],
             request.include_events,
@@ -843,10 +807,10 @@ impl ValidatorService {
         Ok(())
     }
 
-    async fn handle_soft_bundle_certificates_v3_impl(
+    async fn handle_soft_bundle_certificates_v1_impl(
         &self,
-        request: tonic::Request<HandleSoftBundleCertificatesRequestV3>,
-    ) -> WrappedServiceResponse<HandleSoftBundleCertificatesResponseV3> {
+        request: tonic::Request<HandleSoftBundleCertificatesRequestV1>,
+    ) -> WrappedServiceResponse<HandleSoftBundleCertificatesResponseV1> {
         let epoch_store = self.state.load_epoch_store_one_call_per_task();
         let client_addr = if self.client_id_source.is_none() {
             self.get_client_ip_addr(&request, &ClientIdSource::SocketAddr)
@@ -878,7 +842,7 @@ impl ValidatorService {
                 .collect::<Vec<_>>()
                 .join(", ")
         );
-        let span = error_span!("handle_soft_bundle_certificates_v3");
+        let span = error_span!("handle_soft_bundle_certificates_v1");
         self.handle_certificates(
             certificates,
             request.include_events,
@@ -892,7 +856,7 @@ impl ValidatorService {
         .await
         .map(|(resp, spam_weight)| {
             (
-                tonic::Response::new(HandleSoftBundleCertificatesResponseV3 {
+                tonic::Response::new(HandleSoftBundleCertificatesResponseV1 {
                     responses: resp.unwrap_or_default(),
                 }),
                 spam_weight,
@@ -927,15 +891,6 @@ impl ValidatorService {
         Ok((tonic::Response::new(response), Weight::one()))
     }
 
-    async fn checkpoint_v2_impl(
-        &self,
-        request: tonic::Request<CheckpointRequestV2>,
-    ) -> WrappedServiceResponse<CheckpointResponseV2> {
-        let request = request.into_inner();
-        let response = self.state.handle_checkpoint_request_v2(&request)?;
-        Ok((tonic::Response::new(response), Weight::one()))
-    }
-
     async fn get_system_state_object_impl(
         &self,
         _request: tonic::Request<SystemStateRequest>,
@@ -1167,26 +1122,18 @@ impl Validator for ValidatorService {
         .unwrap()
     }
 
-    /// Handles a `CertifiedTransaction` request.
-    async fn handle_certificate_v2(
-        &self,
-        request: tonic::Request<CertifiedTransaction>,
-    ) -> Result<tonic::Response<HandleCertificateResponseV2>, tonic::Status> {
-        handle_with_decoration!(self, handle_certificate_v2_impl, request)
-    }
-
-    async fn handle_certificate_v3(
+    async fn handle_certificate_v1(
         &self,
-        request: tonic::Request<HandleCertificateRequestV3>,
-    ) -> Result<tonic::Response<HandleCertificateResponseV3>, tonic::Status> {
-        handle_with_decoration!(self, handle_certificate_v3_impl, request)
+        request: tonic::Request<HandleCertificateRequestV1>,
+    ) -> Result<tonic::Response<HandleCertificateResponseV1>, tonic::Status> {
+        handle_with_decoration!(self, handle_certificate_v1_impl, request)
     }
 
-    async fn handle_soft_bundle_certificates_v3(
+    async fn handle_soft_bundle_certificates_v1(
         &self,
-        request: tonic::Request<HandleSoftBundleCertificatesRequestV3>,
-    ) -> Result<tonic::Response<HandleSoftBundleCertificatesResponseV3>, tonic::Status> {
-        handle_with_decoration!(self, handle_soft_bundle_certificates_v3_impl, request)
+        request: tonic::Request<HandleSoftBundleCertificatesRequestV1>,
+    ) -> Result<tonic::Response<HandleSoftBundleCertificatesResponseV1>, tonic::Status> {
+        handle_with_decoration!(self, handle_soft_bundle_certificates_v1_impl, request)
     }
 
     /// Handles an `ObjectInfoRequest` request.
@@ -1213,14 +1160,6 @@ impl Validator for ValidatorService {
         handle_with_decoration!(self, checkpoint_impl, request)
     }
 
-    /// Handles a `CheckpointRequestV2` request.
-    async fn checkpoint_v2(
-        &self,
-        request: tonic::Request<CheckpointRequestV2>,
-    ) -> Result<tonic::Response<CheckpointResponseV2>, tonic::Status> {
-        handle_with_decoration!(self, checkpoint_v2_impl, request)
-    }
-
     /// Gets the `IotaSystemState` response.
     async fn get_system_state_object(
         &self,
diff --git a/crates/iota-core/src/checkpoints/mod.rs b/crates/iota-core/src/checkpoints/mod.rs
index c7b56a7cd34..b466e405866 100644
--- a/crates/iota-core/src/checkpoints/mod.rs
+++ b/crates/iota-core/src/checkpoints/mod.rs
@@ -42,8 +42,8 @@ use iota_types::{
     },
     message_envelope::Message,
     messages_checkpoint::{
-        CertifiedCheckpointSummary, CheckpointCommitment, CheckpointContents, CheckpointRequestV2,
-        CheckpointResponseV2, CheckpointSequenceNumber, CheckpointSignatureMessage,
+        CertifiedCheckpointSummary, CheckpointCommitment, CheckpointContents, CheckpointRequest,
+        CheckpointResponse, CheckpointSequenceNumber, CheckpointSignatureMessage,
         CheckpointSummary, CheckpointSummaryResponse, CheckpointTimestamp, EndOfEpochData,
         FullCheckpointContents, SignedCheckpointSummary, TrustedCheckpoint, VerifiedCheckpoint,
         VerifiedCheckpointContents,
@@ -1445,11 +1445,16 @@ impl CheckpointBuilder {
                     )
                     .await?;
 
+                // The system epoch info event can be `None` in case if the `advance_epoch`
+                // Move function call failed and was executed in the safe mode.
+                // In this case, the tokens supply should be unchanged.
+                //
                 // SAFETY: The number of minted and burnt tokens easily fit into an i64 and due
                 // to those small numbers, no overflows will occur during conversion or
                 // subtraction.
-                let epoch_supply_change = system_epoch_info_event.minted_tokens_amount as i64
-                    - system_epoch_info_event.burnt_tokens_amount as i64;
+                let epoch_supply_change = system_epoch_info_event.map_or(0, |event| {
+                    event.minted_tokens_amount as i64 - event.burnt_tokens_amount as i64
+                });
 
                 let committee = system_state_obj
                     .get_current_epoch_committee()
@@ -1574,7 +1579,7 @@ impl CheckpointBuilder {
         checkpoint_effects: &mut Vec<TransactionEffects>,
         signatures: &mut Vec<Vec<GenericSignature>>,
         checkpoint: CheckpointSequenceNumber,
-    ) -> anyhow::Result<(IotaSystemState, SystemEpochInfoEventV1)> {
+    ) -> anyhow::Result<(IotaSystemState, Option<SystemEpochInfoEventV1>)> {
         let (system_state, system_epoch_info_event, effects) = self
             .state
             .create_and_execute_advance_epoch_tx(
@@ -1957,9 +1962,9 @@ impl CheckpointSignatureAggregator {
                 Err(())
             }
             InsertResult::QuorumReached(cert) => {
-                // It is not guaranteed that signature.authority == narwhal_cert.author, but we
-                // do verify the signature so we know that the author signed the
-                // message at some point.
+                // It is not guaranteed that signature.authority == consensus_cert.author, but
+                // we do verify the signature so we know that the author signed
+                // the message at some point.
                 if their_digest != self.digest {
                     self.metrics.remote_checkpoint_forks.inc();
                     warn!(
@@ -2078,12 +2083,12 @@ async fn diagnose_split_brain(
             let client = network_clients
                 .get(&validator)
                 .expect("Failed to get network client");
-            let request = CheckpointRequestV2 {
+            let request = CheckpointRequest {
                 sequence_number: Some(local_summary.sequence_number),
                 request_content: true,
                 certified: false,
             };
-            client.handle_checkpoint_v2(request)
+            client.handle_checkpoint(request)
         })
         .collect::<Vec<_>>();
 
@@ -2094,17 +2099,17 @@ async fn diagnose_split_brain(
         .zip(digest_name_pair)
         .filter_map(|(response, (digest, name))| match response {
             Ok(response) => match response {
-                CheckpointResponseV2 {
+                CheckpointResponse {
                     checkpoint: Some(CheckpointSummaryResponse::Pending(summary)),
                     contents: Some(contents),
                 } => Some((*name, *digest, summary, contents)),
-                CheckpointResponseV2 {
+                CheckpointResponse {
                     checkpoint: Some(CheckpointSummaryResponse::Certified(_)),
                     contents: _,
                 } => {
                     panic!("Expected pending checkpoint, but got certified checkpoint");
                 }
-                CheckpointResponseV2 {
+                CheckpointResponse {
                     checkpoint: None,
                     contents: _,
                 } => {
@@ -2114,7 +2119,7 @@ async fn diagnose_split_brain(
                     );
                     None
                 }
-                CheckpointResponseV2 {
+                CheckpointResponse {
                     checkpoint: _,
                     contents: None,
                 } => {
diff --git a/narwhal/network/src/connectivity.rs b/crates/iota-core/src/connection_monitor.rs
similarity index 73%
rename from narwhal/network/src/connectivity.rs
rename to crates/iota-core/src/connection_monitor.rs
index 2d32cc11a7c..a15afd715c4 100644
--- a/narwhal/network/src/connectivity.rs
+++ b/crates/iota-core/src/connection_monitor.rs
@@ -7,15 +7,30 @@ use std::{collections::HashMap, sync::Arc, time::Duration};
 use anemo::{PeerId, types::PeerEvent};
 use dashmap::DashMap;
 use futures::future;
-use iota_metrics::spawn_logged_monitored_task;
+use iota_metrics::{metrics_network::NetworkConnectionMetrics, spawn_logged_monitored_task};
 use quinn_proto::ConnectionStats;
-use tokio::{task::JoinHandle, time};
-use types::ConditionalBroadcastReceiver;
-
-use crate::metrics::NetworkConnectionMetrics;
+use tokio::{sync::broadcast, task::JoinHandle, time};
 
 const CONNECTION_STAT_COLLECTION_INTERVAL: Duration = Duration::from_secs(60);
 
+#[derive(Debug)]
+pub struct ConditionalBroadcastReceiver {
+    pub receiver: broadcast::Receiver<()>,
+}
+
+/// ConditionalBroadcastReceiver has an additional method for convenience to be
+/// able to use to conditionally check for shutdown in all branches of a select
+/// statement. Using this method will allow for the shutdown signal to propagate
+/// faster, since we will no longer be waiting until the branch that checks the
+/// receiver is randomly selected by the select macro.
+impl ConditionalBroadcastReceiver {
+    pub async fn received_signal(&mut self) -> bool {
+        futures::future::poll_immediate(&mut Box::pin(self.receiver.recv()))
+            .await
+            .is_some()
+    }
+}
+
 #[derive(Eq, PartialEq, Clone, Debug)]
 pub enum ConnectionStatus {
     Connected,
@@ -256,15 +271,128 @@ mod tests {
 
     use anemo::{Network, Request, Response};
     use bytes::Bytes;
+    use iota_metrics::metrics_network::NetworkConnectionMetrics;
     use prometheus::Registry;
-    use tokio::time::{sleep, timeout};
+    use tokio::{
+        sync::{broadcast, broadcast::error::SendError},
+        time::{sleep, timeout},
+    };
     use tower::util::BoxCloneService;
 
-    use crate::{
-        connectivity::{ConnectionMonitor, ConnectionStatus},
-        metrics::NetworkConnectionMetrics,
+    use crate::connection_monitor::{
+        ConditionalBroadcastReceiver, ConnectionMonitor, ConnectionStatus,
     };
 
+    /// PreSubscribedBroadcastSender is a wrapped Broadcast channel that limits
+    /// subscription to initialization time. This is designed to be used for
+    /// cancellation signal to all the components, and the limitation is
+    /// intended to prevent a component missing the shutdown signal due to a
+    /// subscription that happens after the shutdown signal was sent. The
+    /// receivers have a special peek method which can be used to
+    /// conditionally check for shutdown signal on the channel.
+    struct PreSubscribedBroadcastSender {
+        sender: broadcast::Sender<()>,
+        receivers: Vec<ConditionalBroadcastReceiver>,
+    }
+
+    impl PreSubscribedBroadcastSender {
+        fn new(num_subscribers: u64) -> Self {
+            let (tx_init, _) = broadcast::channel(1);
+            let mut receivers = Vec::new();
+            for _i in 0..num_subscribers {
+                receivers.push(ConditionalBroadcastReceiver {
+                    receiver: tx_init.subscribe(),
+                });
+            }
+
+            PreSubscribedBroadcastSender {
+                sender: tx_init,
+                receivers,
+            }
+        }
+
+        fn try_subscribe(&mut self) -> Option<ConditionalBroadcastReceiver> {
+            self.receivers.pop()
+        }
+
+        fn send(&self) -> Result<usize, SendError<()>> {
+            self.sender.send(())
+        }
+    }
+
+    #[tokio::test]
+    async fn test_pre_subscribed_broadcast() {
+        let mut tx_shutdown = PreSubscribedBroadcastSender::new(2);
+        let mut rx_shutdown_a = tx_shutdown.try_subscribe().unwrap();
+
+        let a = tokio::spawn(async move {
+            loop {
+                tokio::select! {
+                    _ = rx_shutdown_a.receiver.recv() => {
+                        return 1
+                    }
+
+                    _ = async{}, if true => {
+                        if rx_shutdown_a.received_signal().await {
+                            return 1
+                        }
+                    }
+                }
+            }
+        });
+
+        let mut rx_shutdown_b = tx_shutdown.try_subscribe().unwrap();
+        let rx_shutdown_c = tx_shutdown.try_subscribe();
+
+        assert!(rx_shutdown_c.is_none());
+
+        // send the shutdown signal before we start component b and started listening
+        // for shutdown there
+        assert!(tx_shutdown.send().is_ok());
+
+        let b = tokio::spawn(async move {
+            loop {
+                tokio::select! {
+                    _ = rx_shutdown_b.receiver.recv() => {
+                        return 2
+                    }
+
+                    _ = async{}, if true => {
+                        if rx_shutdown_b.received_signal().await {
+                            return 2
+                        }
+                    }
+                }
+            }
+        });
+
+        // assert that both component a and b loops have exited, effectively shutting
+        // down
+        assert_eq!(a.await.unwrap() + b.await.unwrap(), 3);
+    }
+
+    #[tokio::test]
+    async fn test_conditional_broadcast_receiver() {
+        let mut tx_shutdown: PreSubscribedBroadcastSender = PreSubscribedBroadcastSender::new(2);
+        let mut rx_shutdown = tx_shutdown.try_subscribe().unwrap();
+
+        let a = tokio::spawn(async move {
+            loop {
+                tokio::select! {
+                    _ = async{}, if true => {
+                        if rx_shutdown.received_signal().await {
+                            return 1
+                        }
+                    }
+                }
+            }
+        });
+
+        assert!(tx_shutdown.send().is_ok());
+
+        assert_eq!(a.await.unwrap(), 1);
+    }
+
     #[tokio::test]
     async fn test_connectivity() {
         // GIVEN
diff --git a/crates/iota-core/src/consensus_adapter.rs b/crates/iota-core/src/consensus_adapter.rs
index c9076f677a4..37aaa26ccd9 100644
--- a/crates/iota-core/src/consensus_adapter.rs
+++ b/crates/iota-core/src/consensus_adapter.rs
@@ -14,7 +14,6 @@ use std::{
 };
 
 use arc_swap::ArcSwap;
-use bytes::Bytes;
 use dashmap::{DashMap, try_result::TryResult};
 use futures::{
     FutureExt,
@@ -22,7 +21,7 @@ use futures::{
     pin_mut,
 };
 use iota_metrics::{GaugeGuard, GaugeGuardFutureExt, spawn_monitored_task};
-use iota_simulator::{anemo::PeerId, narwhal_network::connectivity::ConnectionStatus};
+use iota_simulator::anemo::PeerId;
 use iota_types::{
     base_types::{AuthorityName, TransactionDigest},
     committee::Committee,
@@ -31,7 +30,6 @@ use iota_types::{
     messages_consensus::{ConsensusTransaction, ConsensusTransactionKind},
 };
 use itertools::Itertools;
-use narwhal_types::{TransactionProto, TransactionsClient};
 use parking_lot::RwLockReadGuard;
 use prometheus::{
     Histogram, HistogramVec, IntCounterVec, IntGauge, IntGaugeVec, Registry,
@@ -39,7 +37,6 @@ use prometheus::{
     register_int_counter_vec_with_registry, register_int_gauge_vec_with_registry,
     register_int_gauge_with_registry,
 };
-use tap::prelude::*;
 use tokio::{
     sync::{Semaphore, SemaphorePermit},
     task::JoinHandle,
@@ -49,6 +46,7 @@ use tracing::{debug, info, warn};
 
 use crate::{
     authority::authority_per_epoch_store::AuthorityPerEpochStore,
+    connection_monitor::ConnectionStatus,
     consensus_handler::{SequencedConsensusTransactionKey, classify},
     epoch::reconfiguration::{ReconfigState, ReconfigurationInitiator},
     metrics::LatencyObserver,
@@ -188,35 +186,6 @@ pub trait SubmitToConsensus: Sync + Send + 'static {
     ) -> IotaResult;
 }
 
-#[async_trait::async_trait]
-impl SubmitToConsensus for TransactionsClient<iota_network::tonic::transport::Channel> {
-    async fn submit_to_consensus(
-        &self,
-        transactions: &[ConsensusTransaction],
-        _epoch_store: &Arc<AuthorityPerEpochStore>,
-    ) -> IotaResult {
-        let transactions_bytes = transactions
-            .iter()
-            .map(|t| {
-                let serialized =
-                    bcs::to_bytes(t).expect("Serializing consensus transaction cannot fail");
-                Bytes::from(serialized)
-            })
-            .collect::<Vec<_>>();
-        self.clone()
-            .submit_transaction(TransactionProto {
-                transactions: transactions_bytes,
-            })
-            .await
-            .map_err(|e| IotaError::ConsensusConnectionBroken(format!("{:?}", e)))
-            .tap_err(|r| {
-                // Will be logged by caller as well.
-                warn!("Submit transaction failed with: {:?}", r);
-            })?;
-        Ok(())
-    }
-}
-
 /// Submit Iota certificates to the consensus.
 pub struct ConsensusAdapter {
     /// The network client connecting to the consensus node of this authority.
@@ -241,7 +210,7 @@ pub struct ConsensusAdapter {
     low_scoring_authorities: ArcSwap<Arc<ArcSwap<HashMap<AuthorityName, u64>>>>,
     /// A structure to register metrics
     metrics: ConsensusAdapterMetrics,
-    /// Semaphore limiting parallel submissions to narwhal
+    /// Semaphore limiting parallel submissions to consensus
     submit_semaphore: Semaphore,
     latency_observer: LatencyObserver,
 }
@@ -301,11 +270,12 @@ impl ConsensusAdapter {
         self.low_scoring_authorities.swap(Arc::new(new_low_scoring));
     }
 
-    // todo - this probably need to hold some kind of lock to make sure epoch does
+    // TODO - this probably need to hold some kind of lock to make sure epoch does
     // not change while we are recovering
     pub fn submit_recovered(self: &Arc<Self>, epoch_store: &Arc<AuthorityPerEpochStore>) {
-        // Currently narwhal worker might lose transactions on restart, so we need to
-        // resend them todo - get_all_pending_consensus_transactions is called
+        // Currently consensus worker might lose transactions on restart, so we need to
+        // resend them.
+        // TODO: get_all_pending_consensus_transactions is called
         // twice when initializing AuthorityPerEpochStore and here, should not
         // be a big deal but can be optimized
         let mut recovered = epoch_store.get_all_pending_consensus_transactions();
@@ -612,9 +582,9 @@ impl ConsensusAdapter {
         // In addition to that, within_alive_epoch ensures that all pending consensus
         // adapter tasks are stopped before reconfiguration can proceed.
         //
-        // This is essential because narwhal workers reuse same ports when narwhal
+        // This is essential because consensus workers reuse same ports when consensus
         // restarts, this means we might be sending transactions from previous
-        // epochs to narwhal of new epoch if we have not had this barrier.
+        // epochs to consensus of new epoch if we have not had this barrier.
         epoch_store
             .within_alive_epoch(self.submit_and_wait_inner(transactions, &epoch_store))
             .await
diff --git a/crates/iota-core/src/consensus_handler.rs b/crates/iota-core/src/consensus_handler.rs
index cc2119cb189..eb785977989 100644
--- a/crates/iota-core/src/consensus_handler.rs
+++ b/crates/iota-core/src/consensus_handler.rs
@@ -25,7 +25,7 @@ use iota_types::{
 };
 use lru::LruCache;
 use serde::{Deserialize, Serialize};
-use tracing::{debug, error, info, instrument, trace_span, warn};
+use tracing::{debug, info, instrument, trace_span, warn};
 
 use crate::{
     authority::{
@@ -201,7 +201,7 @@ impl<C: CheckpointServiceNotify + Send + Sync> ConsensusHandler<C> {
 
         let round = consensus_output.leader_round();
 
-        // TODO: Remove this once narwhal is deprecated. For now mysticeti will not
+        // TODO: Is this check necessary? For now mysticeti will not
         // return more than one leader per round so we are not in danger of
         // ignoring any commits.
         assert!(round >= last_committed_round);
@@ -314,18 +314,9 @@ impl<C: CheckpointServiceNotify + Send + Sync> ConsensusHandler<C> {
                             .stats
                             .inc_num_user_transactions(authority_index as usize);
                     }
-                    if let ConsensusTransactionKind::RandomnessStateUpdate(randomness_round, _) =
-                        &transaction.kind
-                    {
-                        // These are deprecated and we should never see them. Log an error and eat
-                        // the tx if one appears.
-                        error!(
-                            "BUG: saw deprecated RandomnessStateUpdate tx for commit round {round:?}, randomness round {randomness_round:?}"
-                        )
-                    } else {
-                        let transaction = SequencedConsensusTransactionKind::External(transaction);
-                        transactions.push((serialized_transaction, transaction, authority_index));
-                    }
+
+                    let transaction = SequencedConsensusTransactionKind::External(transaction);
+                    transactions.push((serialized_transaction, transaction, authority_index));
                 }
             }
         }
@@ -541,7 +532,6 @@ pub(crate) fn classify(transaction: &ConsensusTransaction) -> &'static str {
         ConsensusTransactionKind::EndOfPublish(_) => "end_of_publish",
         ConsensusTransactionKind::CapabilityNotificationV1(_) => "capability_notification_v1",
         ConsensusTransactionKind::NewJWKFetched(_, _, _) => "new_jwk_fetched",
-        ConsensusTransactionKind::RandomnessStateUpdate(_, _) => "randomness_state_update",
         ConsensusTransactionKind::RandomnessDkgMessage(_, _) => "randomness_dkg_message",
         ConsensusTransactionKind::RandomnessDkgConfirmation(_, _) => "randomness_dkg_confirmation",
     }
diff --git a/crates/iota-core/src/consensus_types/consensus_output_api.rs b/crates/iota-core/src/consensus_types/consensus_output_api.rs
index d2ae2ae5d73..f1d547ba95a 100644
--- a/crates/iota-core/src/consensus_types/consensus_output_api.rs
+++ b/crates/iota-core/src/consensus_types/consensus_output_api.rs
@@ -5,9 +5,7 @@
 use std::fmt::Display;
 
 use consensus_core::{BlockAPI, CommitDigest};
-use fastcrypto::hash::Hash;
 use iota_types::{digests::ConsensusCommitDigest, messages_consensus::ConsensusTransaction};
-use narwhal_types::{BatchAPI, CertificateAPI, ConsensusOutputDigest, HeaderAPI};
 
 use crate::consensus_types::AuthorityIndex;
 
@@ -35,78 +33,6 @@ pub(crate) trait ConsensusOutputAPI: Display {
     fn consensus_digest(&self) -> ConsensusCommitDigest;
 }
 
-impl ConsensusOutputAPI for narwhal_types::ConsensusOutput {
-    fn reputation_score_sorted_desc(&self) -> Option<Vec<(AuthorityIndex, u64)>> {
-        if !self.sub_dag.reputation_score.final_of_schedule {
-            return None;
-        }
-        Some(
-            self.sub_dag
-                .reputation_score
-                .authorities_by_score_desc()
-                .into_iter()
-                .map(|(id, score)| (id.0 as AuthorityIndex, score))
-                .collect(),
-        )
-    }
-
-    fn leader_round(&self) -> u64 {
-        self.sub_dag.leader_round()
-    }
-
-    fn leader_author_index(&self) -> AuthorityIndex {
-        self.sub_dag.leader.origin().0 as AuthorityIndex
-    }
-
-    fn commit_timestamp_ms(&self) -> u64 {
-        self.sub_dag.commit_timestamp()
-    }
-
-    fn commit_sub_dag_index(&self) -> u64 {
-        self.sub_dag.sub_dag_index
-    }
-
-    fn transactions(&self) -> ConsensusOutputTransactions {
-        assert!(self.sub_dag.certificates.len() == self.batches.len());
-        self.sub_dag
-            .certificates
-            .iter()
-            .zip(&self.batches)
-            .map(|(cert, batches)| {
-                assert_eq!(cert.header().payload().len(), batches.len());
-                let transactions: Vec<(&[u8], ConsensusTransaction)> =
-                    batches.iter().flat_map(|batch| {
-                        let digest = batch.digest();
-                        assert!(cert.header().payload().contains_key(&digest));
-                        batch.transactions().iter().map(move |serialized_transaction| {
-                            let transaction = match bcs::from_bytes::<ConsensusTransaction>(
-                                serialized_transaction,
-                            ) {
-                                Ok(transaction) => transaction,
-                                Err(err) => {
-                                    // This should have been prevented by transaction verifications in consensus.
-                                    panic!(
-                                        "Unexpected malformed transaction (failed to deserialize): {}\nCertificate={:?} BatchDigest={:?} Transaction={:?}",
-                                        err, cert, digest, serialized_transaction
-                                    );
-                                }
-                            };
-                            (serialized_transaction.as_ref(), transaction)
-                        })
-                    }).collect();
-                (cert.origin().0 as AuthorityIndex, transactions)
-            }).collect()
-    }
-
-    fn consensus_digest(&self) -> ConsensusCommitDigest {
-        // We port ConsensusOutputDigest, a narwhal space object, into
-        // ConsensusCommitDigest, a iota-core space object. We assume they
-        // always have the same format.
-        static_assertions::assert_eq_size!(ConsensusCommitDigest, ConsensusOutputDigest);
-        ConsensusCommitDigest::new(self.digest().into_inner())
-    }
-}
-
 impl ConsensusOutputAPI for consensus_core::CommittedSubDag {
     fn reputation_score_sorted_desc(&self) -> Option<Vec<(AuthorityIndex, u64)>> {
         if !self.reputation_scores_desc.is_empty() {
diff --git a/crates/iota-core/src/consensus_validator.rs b/crates/iota-core/src/consensus_validator.rs
index 4962bb0b2f5..907b69ad85a 100644
--- a/crates/iota-core/src/consensus_validator.rs
+++ b/crates/iota-core/src/consensus_validator.rs
@@ -88,8 +88,7 @@ impl IotaTxValidator {
 
                 ConsensusTransactionKind::EndOfPublish(_)
                 | ConsensusTransactionKind::NewJWKFetched(_, _, _)
-                | ConsensusTransactionKind::CapabilityNotificationV1(_)
-                | ConsensusTransactionKind::RandomnessStateUpdate(_, _) => {}
+                | ConsensusTransactionKind::CapabilityNotificationV1(_) => {}
             }
         }
 
diff --git a/crates/iota-core/src/epoch/randomness.rs b/crates/iota-core/src/epoch/randomness.rs
index 677f6552e5a..e63f4f2a4e8 100644
--- a/crates/iota-core/src/epoch/randomness.rs
+++ b/crates/iota-core/src/epoch/randomness.rs
@@ -21,14 +21,13 @@ use futures::{StreamExt, stream::FuturesUnordered};
 use iota_macros::fail_point_if;
 use iota_network::randomness;
 use iota_types::{
-    base_types::AuthorityName,
+    base_types::{AuthorityName, CommitRound},
     committee::{Committee, EpochId, StakeUnit},
     crypto::{AuthorityKeyPair, RandomnessRound},
     error::{IotaError, IotaResult},
     iota_system_state::epoch_start_iota_system_state::EpochStartSystemStateTrait,
     messages_consensus::{ConsensusTransaction, VersionedDkgConfirmation, VersionedDkgMessage},
 };
-use narwhal_types::{Round, TimestampMs};
 use parking_lot::Mutex;
 use rand::{
     SeedableRng,
@@ -47,6 +46,9 @@ use crate::{
     consensus_adapter::SubmitToConsensus,
 };
 
+/// The epoch UNIX timestamp in milliseconds
+pub type CommitTimestampMs = u64;
+
 type PkG = bls12381::G2Element;
 type EncG = bls12381::G2Element;
 
@@ -57,25 +59,19 @@ pub const SINGLETON_KEY: u64 = 0;
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[allow(clippy::large_enum_variant)]
 pub enum VersionedProcessedMessage {
-    V0(), // deprecated
     V1(dkg_v1::ProcessedMessage<PkG, EncG>),
 }
 
 impl VersionedProcessedMessage {
     pub fn sender(&self) -> PartyId {
         match self {
-            VersionedProcessedMessage::V0() => {
-                panic!("BUG: invalid VersionedProcessedMessage version V0")
-            }
             VersionedProcessedMessage::V1(msg) => msg.message.sender,
         }
     }
 
     pub fn unwrap_v1(self) -> dkg_v1::ProcessedMessage<PkG, EncG> {
-        if let VersionedProcessedMessage::V1(msg) = self {
-            msg
-        } else {
-            panic!("BUG: expected message version is 1")
+        match self {
+            VersionedProcessedMessage::V1(msg) => msg,
         }
     }
 
@@ -110,7 +106,6 @@ impl VersionedProcessedMessage {
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum VersionedUsedProcessedMessages {
-    V0(), // deprecated
     V1(dkg_v1::UsedProcessedMessages<PkG, EncG>),
 }
 
@@ -123,9 +118,7 @@ impl VersionedUsedProcessedMessages {
         // All inputs are verified in add_confirmation, so we can assume they are of the
         // correct version.
         let rng = &mut StdRng::from_rng(OsRng).expect("RNG construction should not fail");
-        let VersionedUsedProcessedMessages::V1(msg) = self else {
-            panic!("BUG: invalid VersionedUsedProcessedMessages version")
-        };
+        let VersionedUsedProcessedMessages::V1(msg) = self;
         party.complete_v1(
             msg,
             &confirmations
@@ -465,7 +458,7 @@ impl RandomnessManager {
     pub(crate) async fn advance_dkg(
         &mut self,
         consensus_output: &mut ConsensusCommitOutput,
-        round: Round,
+        round: CommitRound,
     ) -> IotaResult {
         let epoch_store = self.epoch_store()?;
 
@@ -699,7 +692,7 @@ impl RandomnessManager {
     /// be resumed.
     pub(crate) fn reserve_next_randomness(
         &mut self,
-        commit_timestamp: TimestampMs,
+        commit_timestamp: CommitTimestampMs,
         output: &mut ConsensusCommitOutput,
     ) -> IotaResult<Option<RandomnessRound>> {
         let epoch_store = self.epoch_store()?;
diff --git a/crates/iota-core/src/execution_cache.rs b/crates/iota-core/src/execution_cache.rs
index ee795648f53..e9d885485ed 100644
--- a/crates/iota-core/src/execution_cache.rs
+++ b/crates/iota-core/src/execution_cache.rs
@@ -17,7 +17,7 @@ use iota_types::{
     object::{Object, Owner},
     storage::{
         BackingPackageStore, BackingStore, ChildObjectResolver, InputKey, MarkerValue, ObjectKey,
-        ObjectOrTombstone, ObjectStore, PackageObject, ParentSync,
+        ObjectOrTombstone, ObjectStore, PackageObject,
         error::{Error as StorageError, Result as StorageResult},
     },
     transaction::{VerifiedSignedTransaction, VerifiedTransaction},
@@ -819,15 +819,6 @@ macro_rules! implement_storage_traits {
                 ObjectCacheRead::get_package_object(self, package_id)
             }
         }
-
-        impl ParentSync for $implementor {
-            fn get_latest_parent_entry_ref_deprecated(
-                &self,
-                object_id: ObjectID,
-            ) -> IotaResult<Option<ObjectRef>> {
-                ObjectCacheRead::get_latest_object_ref_or_tombstone(self, object_id)
-            }
-        }
     };
 }
 
diff --git a/crates/iota-core/src/lib.rs b/crates/iota-core/src/lib.rs
index 76e7ea8f71c..76eaa947d09 100644
--- a/crates/iota-core/src/lib.rs
+++ b/crates/iota-core/src/lib.rs
@@ -10,6 +10,7 @@ pub mod authority_aggregator;
 pub mod authority_client;
 pub mod authority_server;
 pub mod checkpoints;
+pub mod connection_monitor;
 pub mod consensus_adapter;
 pub mod consensus_handler;
 pub mod consensus_manager;
diff --git a/crates/iota-core/src/quorum_driver/mod.rs b/crates/iota-core/src/quorum_driver/mod.rs
index 80070a9e201..8dc0a6112fb 100644
--- a/crates/iota-core/src/quorum_driver/mod.rs
+++ b/crates/iota-core/src/quorum_driver/mod.rs
@@ -25,7 +25,7 @@ use iota_types::{
     base_types::{AuthorityName, ObjectRef, TransactionDigest},
     committee::{Committee, EpochId, StakeUnit},
     error::{IotaError, IotaResult},
-    messages_grpc::HandleCertificateRequestV3,
+    messages_grpc::HandleCertificateRequestV1,
     messages_safe_client::PlainTransactionInfoResponse,
     quorum_driver_types::{
         ExecuteTransactionRequestV1, QuorumDriverEffectsQueueResult, QuorumDriverError,
@@ -492,7 +492,7 @@ where
     #[instrument(level = "trace", skip_all, fields(tx_digest = ?request.certificate.digest()))]
     pub(crate) async fn process_certificate(
         &self,
-        request: HandleCertificateRequestV3,
+        request: HandleCertificateRequestV1,
         client_addr: Option<SocketAddr>,
     ) -> Result<QuorumDriverResponse, Option<QuorumDriverError>> {
         let auth_agg = self.validators.load();
@@ -568,7 +568,7 @@ where
                     .validators
                     .load()
                     .process_certificate(
-                        HandleCertificateRequestV3 {
+                        HandleCertificateRequestV1 {
                             certificate: cert,
                             include_events: true,
                             include_input_objects: false,
@@ -834,7 +834,7 @@ where
 
         let response = match quorum_driver
             .process_certificate(
-                HandleCertificateRequestV3 {
+                HandleCertificateRequestV1 {
                     certificate: tx_cert.clone(),
                     include_events: request.include_events,
                     include_input_objects: request.include_input_objects,
diff --git a/crates/iota-core/src/safe_client.rs b/crates/iota-core/src/safe_client.rs
index 29468152c1a..1929097797d 100644
--- a/crates/iota-core/src/safe_client.rs
+++ b/crates/iota-core/src/safe_client.rs
@@ -14,13 +14,10 @@ use iota_types::{
     error::{IotaError, IotaResult},
     fp_ensure,
     iota_system_state::IotaSystemState,
-    messages_checkpoint::{
-        CertifiedCheckpointSummary, CheckpointRequest, CheckpointResponse, CheckpointSequenceNumber,
-    },
     messages_grpc::{
-        HandleCertificateRequestV3, HandleCertificateResponseV2, HandleCertificateResponseV3,
-        ObjectInfoRequest, ObjectInfoResponse, SystemStateRequest, TransactionInfoRequest,
-        TransactionStatus, VerifiedObjectInfoResponse,
+        HandleCertificateRequestV1, HandleCertificateResponseV1, ObjectInfoRequest,
+        ObjectInfoResponse, SystemStateRequest, TransactionInfoRequest, TransactionStatus,
+        VerifiedObjectInfoResponse,
     },
     messages_safe_client::PlainTransactionInfoResponse,
     transaction::*,
@@ -328,57 +325,21 @@ where
         Ok(response)
     }
 
-    fn verify_certificate_response_v2(
+    fn verify_certificate_response_v1(
         &self,
         digest: &TransactionDigest,
-        response: HandleCertificateResponseV2,
-    ) -> IotaResult<HandleCertificateResponseV2> {
-        let signed_effects =
-            self.check_signed_effects_plain(digest, response.signed_effects, None)?;
-
-        Ok(HandleCertificateResponseV2 {
+        HandleCertificateResponseV1 {
             signed_effects,
-            events: response.events,
-            fastpath_input_objects: vec![], // unused field
-        })
-    }
-
-    /// Execute a certificate.
-    pub async fn handle_certificate_v2(
-        &self,
-        certificate: CertifiedTransaction,
-        client_addr: Option<SocketAddr>,
-    ) -> Result<HandleCertificateResponseV2, IotaError> {
-        let digest = *certificate.digest();
-        let _timer = self.metrics.handle_certificate_latency.start_timer();
-        let response = self
-            .authority_client
-            .handle_certificate_v2(certificate, client_addr)
-            .await?;
-
-        let verified = check_error!(
-            self.address,
-            self.verify_certificate_response_v2(&digest, response),
-            "Client error in handle_certificate"
-        )?;
-        Ok(verified)
-    }
-
-    fn verify_certificate_response_v3(
-        &self,
-        digest: &TransactionDigest,
-        HandleCertificateResponseV3 {
-            effects,
             events,
             input_objects,
             output_objects,
             auxiliary_data,
-        }: HandleCertificateResponseV3,
-    ) -> IotaResult<HandleCertificateResponseV3> {
-        let effects = self.check_signed_effects_plain(digest, effects, None)?;
+        }: HandleCertificateResponseV1,
+    ) -> IotaResult<HandleCertificateResponseV1> {
+        let signed_effects = self.check_signed_effects_plain(digest, signed_effects, None)?;
 
         // Check Events
-        match (&events, effects.events_digest()) {
+        match (&events, signed_effects.events_digest()) {
             (None, None) | (None, Some(_)) => {}
             (Some(events), None) => {
                 if !events.data.is_empty() {
@@ -403,7 +364,7 @@ where
 
         // Check Input Objects
         if let Some(input_objects) = &input_objects {
-            let expected: HashMap<_, _> = effects
+            let expected: HashMap<_, _> = signed_effects
                 .old_object_metadata()
                 .into_iter()
                 .map(|(object_ref, _owner)| (object_ref.0, object_ref))
@@ -426,7 +387,7 @@ where
 
         // Check Output Objects
         if let Some(output_objects) = &output_objects {
-            let expected: HashMap<_, _> = effects
+            let expected: HashMap<_, _> = signed_effects
                 .all_changed_objects()
                 .into_iter()
                 .map(|(object_ref, _, _)| (object_ref.0, object_ref))
@@ -447,8 +408,8 @@ where
             }
         }
 
-        Ok(HandleCertificateResponseV3 {
-            effects,
+        Ok(HandleCertificateResponseV1 {
+            signed_effects,
             events,
             input_objects,
             output_objects,
@@ -457,21 +418,21 @@ where
     }
 
     /// Execute a certificate.
-    pub async fn handle_certificate_v3(
+    pub async fn handle_certificate_v1(
         &self,
-        request: HandleCertificateRequestV3,
+        request: HandleCertificateRequestV1,
         client_addr: Option<SocketAddr>,
-    ) -> Result<HandleCertificateResponseV3, IotaError> {
+    ) -> Result<HandleCertificateResponseV1, IotaError> {
         let digest = *request.certificate.digest();
         let _timer = self.metrics.handle_certificate_latency.start_timer();
         let response = self
             .authority_client
-            .handle_certificate_v3(request, client_addr)
+            .handle_certificate_v1(request, client_addr)
             .await?;
 
         let verified = check_error!(
             self.address,
-            self.verify_certificate_response_v3(&digest, response),
+            self.verify_certificate_response_v1(&digest, response),
             "Client error in handle_certificate"
         )?;
         Ok(verified)
@@ -529,79 +490,6 @@ where
         Ok(transaction_info)
     }
 
-    fn verify_checkpoint_sequence(
-        &self,
-        expected_seq: Option<CheckpointSequenceNumber>,
-        checkpoint: &Option<CertifiedCheckpointSummary>,
-    ) -> IotaResult {
-        let observed_seq = checkpoint.as_ref().map(|c| c.sequence_number);
-
-        if let (Some(e), Some(o)) = (expected_seq, observed_seq) {
-            fp_ensure!(
-                e == o,
-                IotaError::from("Expected checkpoint number doesn't match with returned")
-            );
-        }
-        Ok(())
-    }
-
-    fn verify_contents_exist<T, O>(
-        &self,
-        request_content: bool,
-        checkpoint: &Option<T>,
-        contents: &Option<O>,
-    ) -> IotaResult {
-        match (request_content, checkpoint, contents) {
-            // If content is requested, checkpoint is not None, but we are not getting any content,
-            // it's an error.
-            // If content is not requested, or checkpoint is None, yet we are still getting content,
-            // it's an error.
-            (true, Some(_), None) | (false, _, Some(_)) | (_, None, Some(_)) => Err(
-                IotaError::from("Checkpoint contents inconsistent with request"),
-            ),
-            _ => Ok(()),
-        }
-    }
-
-    fn verify_checkpoint_response(
-        &self,
-        request: &CheckpointRequest,
-        response: &CheckpointResponse,
-    ) -> IotaResult {
-        // Verify response data was correct for request
-        let CheckpointResponse {
-            checkpoint,
-            contents,
-        } = &response;
-        // Checks that the sequence number is correct.
-        self.verify_checkpoint_sequence(request.sequence_number, checkpoint)?;
-        self.verify_contents_exist(request.request_content, checkpoint, contents)?;
-        // Verify signature.
-        match checkpoint {
-            Some(c) => {
-                let epoch_id = c.epoch;
-                c.verify_with_contents(&*self.get_committee(&epoch_id)?, contents.as_ref())
-            }
-            None => Ok(()),
-        }
-    }
-
-    #[instrument(level = "trace", skip_all, fields(authority = ?self.address.concise()))]
-    pub async fn handle_checkpoint(
-        &self,
-        request: CheckpointRequest,
-    ) -> Result<CheckpointResponse, IotaError> {
-        let resp = self
-            .authority_client
-            .handle_checkpoint(request.clone())
-            .await?;
-        self.verify_checkpoint_response(&request, &resp)
-            .tap_err(|err| {
-                error!(?err, authority=?self.address, "Client error in handle_checkpoint");
-            })?;
-        Ok(resp)
-    }
-
     #[instrument(level = "trace", skip_all, fields(authority = ?self.address.concise()))]
     pub async fn handle_system_state_object(&self) -> Result<IotaSystemState, IotaError> {
         self.authority_client
diff --git a/crates/iota-core/src/state_accumulator.rs b/crates/iota-core/src/state_accumulator.rs
index 755f624274a..7cfde29131f 100644
--- a/crates/iota-core/src/state_accumulator.rs
+++ b/crates/iota-core/src/state_accumulator.rs
@@ -396,7 +396,7 @@ impl StateAccumulatorV1 {
         epoch_store: Arc<AuthorityPerEpochStore>,
         last_checkpoint_of_epoch: CheckpointSequenceNumber,
     ) -> IotaResult<Accumulator> {
-        let _scope = monitored_scope("AccumulateEpochV2");
+        let _scope = monitored_scope("AccumulateEpoch");
         let running_root = epoch_store
             .get_running_root_accumulator(&last_checkpoint_of_epoch)?
             .expect("Expected running root accumulator to exist up to last checkpoint of epoch");
diff --git a/crates/iota-core/src/test_authority_clients.rs b/crates/iota-core/src/test_authority_clients.rs
index f4272029d0c..bc17d9d2754 100644
--- a/crates/iota-core/src/test_authority_clients.rs
+++ b/crates/iota-core/src/test_authority_clients.rs
@@ -17,16 +17,14 @@ use iota_types::{
     effects::TransactionEffectsAPI,
     error::{IotaError, IotaResult},
     iota_system_state::IotaSystemState,
-    messages_checkpoint::{
-        CheckpointRequest, CheckpointRequestV2, CheckpointResponse, CheckpointResponseV2,
-    },
+    messages_checkpoint::{CheckpointRequest, CheckpointResponse},
     messages_grpc::{
-        HandleCertificateRequestV3, HandleCertificateResponseV2, HandleCertificateResponseV3,
-        HandleSoftBundleCertificatesRequestV3, HandleSoftBundleCertificatesResponseV3,
+        HandleCertificateRequestV1, HandleCertificateResponseV1,
+        HandleSoftBundleCertificatesRequestV1, HandleSoftBundleCertificatesResponseV1,
         HandleTransactionResponse, ObjectInfoRequest, ObjectInfoResponse, SystemStateRequest,
         TransactionInfoRequest, TransactionInfoResponse,
     },
-    transaction::{CertifiedTransaction, Transaction, VerifiedTransaction},
+    transaction::{Transaction, VerifiedTransaction},
 };
 
 use crate::{
@@ -85,47 +83,23 @@ impl AuthorityAPI for LocalAuthorityClient {
         result
     }
 
-    async fn handle_certificate_v2(
+    async fn handle_certificate_v1(
         &self,
-        certificate: CertifiedTransaction,
+        request: HandleCertificateRequestV1,
         _client_addr: Option<SocketAddr>,
-    ) -> Result<HandleCertificateResponseV2, IotaError> {
+    ) -> Result<HandleCertificateResponseV1, IotaError> {
         let state = self.state.clone();
         let fault_config = self.fault_config;
-        let request = HandleCertificateRequestV3 {
-            certificate,
-            include_events: true,
-            include_input_objects: false,
-            include_output_objects: false,
-            include_auxiliary_data: false,
-        };
         spawn_monitored_task!(Self::handle_certificate(state, request, fault_config))
             .await
             .unwrap()
-            .map(|resp| HandleCertificateResponseV2 {
-                signed_effects: resp.effects,
-                events: resp.events.unwrap_or_default(),
-                fastpath_input_objects: vec![],
-            })
     }
 
-    async fn handle_certificate_v3(
+    async fn handle_soft_bundle_certificates_v1(
         &self,
-        request: HandleCertificateRequestV3,
+        _request: HandleSoftBundleCertificatesRequestV1,
         _client_addr: Option<SocketAddr>,
-    ) -> Result<HandleCertificateResponseV3, IotaError> {
-        let state = self.state.clone();
-        let fault_config = self.fault_config;
-        spawn_monitored_task!(Self::handle_certificate(state, request, fault_config))
-            .await
-            .unwrap()
-    }
-
-    async fn handle_soft_bundle_certificates_v3(
-        &self,
-        _request: HandleSoftBundleCertificatesRequestV3,
-        _client_addr: Option<SocketAddr>,
-    ) -> Result<HandleSoftBundleCertificatesResponseV3, IotaError> {
+    ) -> Result<HandleSoftBundleCertificatesResponseV1, IotaError> {
         unimplemented!()
     }
 
@@ -155,15 +129,6 @@ impl AuthorityAPI for LocalAuthorityClient {
         state.handle_checkpoint_request(&request)
     }
 
-    async fn handle_checkpoint_v2(
-        &self,
-        request: CheckpointRequestV2,
-    ) -> Result<CheckpointResponseV2, IotaError> {
-        let state = self.state.clone();
-
-        state.handle_checkpoint_request_v2(&request)
-    }
-
     async fn handle_system_state_object(
         &self,
         _request: SystemStateRequest,
@@ -197,9 +162,9 @@ impl LocalAuthorityClient {
     // transactions.
     async fn handle_certificate(
         state: Arc<AuthorityState>,
-        request: HandleCertificateRequestV3,
+        request: HandleCertificateRequestV1,
         fault_config: LocalAuthorityClientFaultConfig,
-    ) -> Result<HandleCertificateResponseV3, IotaError> {
+    ) -> Result<HandleCertificateResponseV1, IotaError> {
         if fault_config.fail_before_handle_confirmation {
             return Err(IotaError::GenericAuthority {
                 error: "Mock error before handle_confirmation_transaction".to_owned(),
@@ -252,8 +217,8 @@ impl LocalAuthorityClient {
             .then(|| state.get_transaction_output_objects(&signed_effects))
             .and_then(Result::ok);
 
-        Ok(HandleCertificateResponseV3 {
-            effects: signed_effects,
+        Ok(HandleCertificateResponseV1 {
+            signed_effects,
             events,
             input_objects,
             output_objects,
@@ -294,28 +259,19 @@ impl AuthorityAPI for MockAuthorityApi {
         unimplemented!();
     }
 
-    /// Execute a certificate.
-    async fn handle_certificate_v2(
-        &self,
-        _certificate: CertifiedTransaction,
-        _client_addr: Option<SocketAddr>,
-    ) -> Result<HandleCertificateResponseV2, IotaError> {
-        unimplemented!()
-    }
-
-    async fn handle_certificate_v3(
+    async fn handle_certificate_v1(
         &self,
-        _request: HandleCertificateRequestV3,
+        _request: HandleCertificateRequestV1,
         _client_addr: Option<SocketAddr>,
-    ) -> Result<HandleCertificateResponseV3, IotaError> {
+    ) -> Result<HandleCertificateResponseV1, IotaError> {
         unimplemented!()
     }
 
-    async fn handle_soft_bundle_certificates_v3(
+    async fn handle_soft_bundle_certificates_v1(
         &self,
-        _request: HandleSoftBundleCertificatesRequestV3,
+        _request: HandleSoftBundleCertificatesRequestV1,
         _client_addr: Option<SocketAddr>,
-    ) -> Result<HandleSoftBundleCertificatesResponseV3, IotaError> {
+    ) -> Result<HandleSoftBundleCertificatesResponseV1, IotaError> {
         unimplemented!()
     }
 
@@ -355,13 +311,6 @@ impl AuthorityAPI for MockAuthorityApi {
         unimplemented!();
     }
 
-    async fn handle_checkpoint_v2(
-        &self,
-        _request: CheckpointRequestV2,
-    ) -> Result<CheckpointResponseV2, IotaError> {
-        unimplemented!();
-    }
-
     async fn handle_system_state_object(
         &self,
         _request: SystemStateRequest,
@@ -373,7 +322,7 @@ impl AuthorityAPI for MockAuthorityApi {
 #[derive(Clone)]
 pub struct HandleTransactionTestAuthorityClient {
     pub tx_info_resp_to_return: IotaResult<HandleTransactionResponse>,
-    pub cert_resp_to_return: IotaResult<HandleCertificateResponseV2>,
+    pub cert_resp_to_return: IotaResult<HandleCertificateResponseV1>,
     // If set, sleep for this duration before responding to a request.
     // This is useful in testing a timeout scenario.
     pub sleep_duration_before_responding: Option<Duration>,
@@ -392,30 +341,22 @@ impl AuthorityAPI for HandleTransactionTestAuthorityClient {
         self.tx_info_resp_to_return.clone()
     }
 
-    async fn handle_certificate_v2(
+    async fn handle_certificate_v1(
         &self,
-        _certificate: CertifiedTransaction,
+        _request: HandleCertificateRequestV1,
         _client_addr: Option<SocketAddr>,
-    ) -> Result<HandleCertificateResponseV2, IotaError> {
+    ) -> Result<HandleCertificateResponseV1, IotaError> {
         if let Some(duration) = self.sleep_duration_before_responding {
             tokio::time::sleep(duration).await;
         }
         self.cert_resp_to_return.clone()
     }
 
-    async fn handle_certificate_v3(
+    async fn handle_soft_bundle_certificates_v1(
         &self,
-        _request: HandleCertificateRequestV3,
+        _request: HandleSoftBundleCertificatesRequestV1,
         _client_addr: Option<SocketAddr>,
-    ) -> Result<HandleCertificateResponseV3, IotaError> {
-        unimplemented!()
-    }
-
-    async fn handle_soft_bundle_certificates_v3(
-        &self,
-        _request: HandleSoftBundleCertificatesRequestV3,
-        _client_addr: Option<SocketAddr>,
-    ) -> Result<HandleSoftBundleCertificatesResponseV3, IotaError> {
+    ) -> Result<HandleSoftBundleCertificatesResponseV1, IotaError> {
         unimplemented!()
     }
 
@@ -440,13 +381,6 @@ impl AuthorityAPI for HandleTransactionTestAuthorityClient {
         unimplemented!()
     }
 
-    async fn handle_checkpoint_v2(
-        &self,
-        _request: CheckpointRequestV2,
-    ) -> Result<CheckpointResponseV2, IotaError> {
-        unimplemented!()
-    }
-
     async fn handle_system_state_object(
         &self,
         _request: SystemStateRequest,
@@ -476,7 +410,7 @@ impl HandleTransactionTestAuthorityClient {
         self.tx_info_resp_to_return = Err(IotaError::Unknown("".to_string()));
     }
 
-    pub fn set_cert_resp_to_return(&mut self, resp: HandleCertificateResponseV2) {
+    pub fn set_cert_resp_to_return(&mut self, resp: HandleCertificateResponseV1) {
         self.cert_resp_to_return = Ok(resp);
     }
 
diff --git a/crates/iota-core/src/transaction_orchestrator.rs b/crates/iota-core/src/transaction_orchestrator.rs
index c944bc6bb65..5dc3ae32188 100644
--- a/crates/iota-core/src/transaction_orchestrator.rs
+++ b/crates/iota-core/src/transaction_orchestrator.rs
@@ -150,7 +150,7 @@ impl<A> TransactionOrchestrator<A>
 where
     A: AuthorityAPI + Send + Sync + 'static + Clone,
 {
-    #[instrument(name = "tx_orchestrator_execute_transaction", level = "debug", skip_all,
+    #[instrument(name = "tx_orchestrator_execute_transaction_block", level = "debug", skip_all,
     fields(
         tx_digest = ?request.transaction.digest(),
         tx_type = ?request_type,
@@ -211,7 +211,7 @@ where
         Ok((response, executed_locally))
     }
 
-    // Utilize the handle_certificate_v3 validator api to request input/output
+    // Utilize the handle_certificate_v1 validator api to request input/output
     // objects
     #[instrument(name = "tx_orchestrator_execute_transaction_v1", level = "trace", skip_all,
                  fields(tx_digest = ?request.transaction.digest()))]
diff --git a/crates/iota-core/src/unit_tests/authority_aggregator_tests.rs b/crates/iota-core/src/unit_tests/authority_aggregator_tests.rs
index 82477f93171..bfb2e944747 100644
--- a/crates/iota-core/src/unit_tests/authority_aggregator_tests.rs
+++ b/crates/iota-core/src/unit_tests/authority_aggregator_tests.rs
@@ -228,7 +228,10 @@ where
     A: AuthorityAPI + Send + Sync + Clone + 'static,
 {
     authority
-        .handle_certificate_v2(cert.clone(), Some(make_socket_addr()))
+        .handle_certificate_v1(
+            HandleCertificateRequestV1::new(cert.clone()),
+            Some(make_socket_addr()),
+        )
         .await
         .unwrap()
         .signed_effects
@@ -240,7 +243,10 @@ where
     A: AuthorityAPI + Send + Sync + Clone + 'static,
 {
     let result = authority
-        .handle_certificate_v2(cert.clone(), Some(make_socket_addr()))
+        .handle_certificate_v1(
+            HandleCertificateRequestV1::new(cert.clone()),
+            Some(make_socket_addr()),
+        )
         .await;
     if result.is_err() {
         println!("Error in do cert {:?}", result.err());
@@ -306,7 +312,7 @@ async fn execute_transaction_with_fault_configs(
         set_local_client_config(&mut authorities, *index, *config);
     }
 
-    let request = HandleCertificateRequestV3 {
+    let request = HandleCertificateRequestV1 {
         certificate: cert.into_cert_for_testing(),
         include_events: true,
         include_input_objects: false,
@@ -379,7 +385,7 @@ async fn test_quorum_map_and_reduce_timeout() {
     // Send request with a very small timeout to trigger timeout error
     authorities.timeouts.pre_quorum_timeout = Duration::from_nanos(0);
     authorities.timeouts.post_quorum_timeout = Duration::from_nanos(0);
-    let request = HandleCertificateRequestV3 {
+    let request = HandleCertificateRequestV1 {
         certificate: certificate.clone(),
         include_events: true,
         include_input_objects: false,
@@ -851,7 +857,7 @@ async fn test_handle_certificate_response() {
         .unwrap();
     agg.committee = Arc::new(committee_1);
 
-    let request = HandleCertificateRequestV3 {
+    let request = HandleCertificateRequestV1 {
         certificate: cert_epoch_0.clone(),
         include_events: true,
         include_input_objects: false,
@@ -2504,10 +2510,12 @@ fn set_cert_response_with_certified_tx(
 ) {
     let effects = effects_with_tx(*cert.digest());
     for (name, secret) in authority_keys {
-        let resp = iota_types::messages_grpc::HandleCertificateResponseV2 {
+        let resp = HandleCertificateResponseV1 {
             signed_effects: sign_tx_effects(effects.clone(), epoch, *name, secret),
-            events: TransactionEvents::default(),
-            fastpath_input_objects: vec![],
+            events: Some(TransactionEvents::default()),
+            input_objects: None,
+            output_objects: None,
+            auxiliary_data: None,
         };
         clients.get_mut(name).unwrap().set_cert_resp_to_return(resp);
     }
diff --git a/crates/iota-core/src/unit_tests/authority_tests.rs b/crates/iota-core/src/unit_tests/authority_tests.rs
index e586e571822..b9c44885ce9 100644
--- a/crates/iota-core/src/unit_tests/authority_tests.rs
+++ b/crates/iota-core/src/unit_tests/authority_tests.rs
@@ -4909,7 +4909,7 @@ async fn test_consensus_message_processed() {
             authority1.try_execute_for_test(&certificate).await.unwrap();
 
         // now, on authority2, we send 0 or 1 consensus messages, then we either
-        // sequence and execute via effects or via handle_certificate_v2, then
+        // sequence and execute via effects or via handle_certificate_v1, then
         // send 0 or 1 consensus messages.
         let send_first = rng.gen_bool(0.5);
         if send_first {
@@ -5817,16 +5817,12 @@ async fn test_consensus_handler_per_object_congestion_control(
     match mode {
         PerObjectCongestionControlMode::None => unreachable!(),
         PerObjectCongestionControlMode::TotalGasBudget => {
-            protocol_config
-                .set_max_accumulated_txn_cost_per_object_in_narwhal_commit_for_testing(200_000_000);
             protocol_config
                 .set_max_accumulated_txn_cost_per_object_in_mysticeti_commit_for_testing(
                     200_000_000,
                 );
         }
         PerObjectCongestionControlMode::TotalTxCount => {
-            protocol_config
-                .set_max_accumulated_txn_cost_per_object_in_narwhal_commit_for_testing(2);
             protocol_config
                 .set_max_accumulated_txn_cost_per_object_in_mysticeti_commit_for_testing(2);
         }
@@ -6056,8 +6052,6 @@ async fn test_consensus_handler_congestion_control_transaction_cancellation() {
     protocol_config.set_per_object_congestion_control_mode_for_testing(
         PerObjectCongestionControlMode::TotalGasBudget,
     );
-    protocol_config
-        .set_max_accumulated_txn_cost_per_object_in_narwhal_commit_for_testing(100_000_000);
     protocol_config
         .set_max_accumulated_txn_cost_per_object_in_mysticeti_commit_for_testing(100_000_000);
     protocol_config.set_max_deferral_rounds_for_congestion_control_for_testing(2);
diff --git a/crates/iota-core/src/unit_tests/congestion_control_tests.rs b/crates/iota-core/src/unit_tests/congestion_control_tests.rs
index 4b4e80bc235..6dc1763f5b9 100644
--- a/crates/iota-core/src/unit_tests/congestion_control_tests.rs
+++ b/crates/iota-core/src/unit_tests/congestion_control_tests.rs
@@ -64,9 +64,6 @@ impl TestSetup {
         // to go through.
         let max_accumulated_txn_cost_per_object_in_commit =
             TEST_ONLY_GAS_PRICE * TEST_ONLY_GAS_UNIT;
-        protocol_config.set_max_accumulated_txn_cost_per_object_in_narwhal_commit_for_testing(
-            max_accumulated_txn_cost_per_object_in_commit,
-        );
         protocol_config.set_max_accumulated_txn_cost_per_object_in_mysticeti_commit_for_testing(
             max_accumulated_txn_cost_per_object_in_commit,
         );
diff --git a/crates/iota-core/src/unit_tests/consensus_tests.rs b/crates/iota-core/src/unit_tests/consensus_tests.rs
index 5161a63ae23..369b8116900 100644
--- a/crates/iota-core/src/unit_tests/consensus_tests.rs
+++ b/crates/iota-core/src/unit_tests/consensus_tests.rs
@@ -2,12 +2,10 @@
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use iota_network::tonic;
 use iota_types::{
     IOTA_FRAMEWORK_PACKAGE_ID,
     base_types::ObjectID,
     crypto::deterministic_random_account_key,
-    multiaddr::Multiaddr,
     object::Object,
     transaction::{
         CallArg, CertifiedTransaction, ObjectArg, TEST_ONLY_GAS_UNIT_FOR_OBJECT_BASICS,
@@ -16,8 +14,6 @@ use iota_types::{
     utils::to_sender_signed_transaction,
 };
 use move_core_types::{account_address::AccountAddress, ident_str};
-use narwhal_types::{Empty, TransactionProto, Transactions, TransactionsServer};
-use tokio::sync::mpsc::{Receiver, Sender, channel};
 
 use super::*;
 use crate::{
@@ -189,45 +185,3 @@ async fn submit_transaction_to_consensus_adapter() {
         .unwrap();
     waiter.await.unwrap();
 }
-
-pub struct ConsensusMockServer {
-    sender: Sender<TransactionProto>,
-}
-
-impl ConsensusMockServer {
-    pub fn spawn(address: Multiaddr) -> Receiver<TransactionProto> {
-        let (sender, receiver) = channel(1);
-        tokio::spawn(async move {
-            let config = iota_network_stack::config::Config::new();
-            let mock = Self { sender };
-            config
-                .server_builder()
-                .add_service(TransactionsServer::new(mock))
-                .bind(&address)
-                .await
-                .unwrap()
-                .serve()
-                .await
-        });
-        receiver
-    }
-}
-
-#[tonic::async_trait]
-impl Transactions for ConsensusMockServer {
-    /// Submit a Transactions
-    async fn submit_transaction(
-        &self,
-        request: tonic::Request<TransactionProto>,
-    ) -> Result<tonic::Response<Empty>, tonic::Status> {
-        self.sender.send(request.into_inner()).await.unwrap();
-        Ok(tonic::Response::new(Empty {}))
-    }
-    /// Submit a Transactions
-    async fn submit_transaction_stream(
-        &self,
-        _request: tonic::Request<tonic::Streaming<TransactionProto>>,
-    ) -> Result<tonic::Response<Empty>, tonic::Status> {
-        unimplemented!()
-    }
-}
diff --git a/crates/iota-core/src/unit_tests/transaction_tests.rs b/crates/iota-core/src/unit_tests/transaction_tests.rs
index 34804bc4210..fe4ca0bf23d 100644
--- a/crates/iota-core/src/unit_tests/transaction_tests.rs
+++ b/crates/iota-core/src/unit_tests/transaction_tests.rs
@@ -22,7 +22,7 @@ use iota_types::{
     error::{IotaError, UserInputError},
     iota_system_state::IOTA_SYSTEM_MODULE_NAME,
     messages_consensus::ConsensusDeterminedVersionAssignments,
-    messages_grpc::HandleSoftBundleCertificatesRequestV3,
+    messages_grpc::HandleSoftBundleCertificatesRequestV1,
     multisig::{MultiSig, MultiSigPublicKey},
     signature::GenericSignature,
     transaction::{
@@ -61,6 +61,7 @@ macro_rules! assert_matches {
 use fastcrypto::traits::AggregateAuthenticator;
 use iota_types::{
     digests::ConsensusCommitDigest, messages_consensus::ConsensusCommitPrologueV1,
+    messages_grpc::HandleCertificateRequestV1,
     programmable_transaction_builder::ProgrammableTransactionBuilder,
 };
 
@@ -432,13 +433,19 @@ async fn do_transaction_test_impl(
             let ct = CertifiedTransaction::new_from_data_and_sig(plain_tx.into_data(), cert_sig);
 
             let err = client
-                .handle_certificate_v2(ct.clone(), Some(socket_addr))
+                .handle_certificate_v1(
+                    HandleCertificateRequestV1::new(ct.clone()),
+                    Some(socket_addr),
+                )
                 .await
                 .unwrap_err();
             err_check(&err);
             epoch_store.clear_signature_cache();
             let err = client
-                .handle_certificate_v2(ct.clone(), Some(socket_addr))
+                .handle_certificate_v1(
+                    HandleCertificateRequestV1::new(ct.clone()),
+                    Some(socket_addr),
+                )
                 .await
                 .unwrap_err();
             err_check(&err);
@@ -448,8 +455,8 @@ async fn do_transaction_test_impl(
             if ct.contains_shared_object() {
                 epoch_store.clear_signature_cache();
                 let err = client
-                    .handle_soft_bundle_certificates_v3(
-                        HandleSoftBundleCertificatesRequestV3 {
+                    .handle_soft_bundle_certificates_v1(
+                        HandleSoftBundleCertificatesRequestV1 {
                             certificates: vec![ct.clone()],
                             wait_for_effects: true,
                             include_events: false,
@@ -1445,7 +1452,9 @@ async fn test_very_large_certificate() {
         quorum_signature,
     );
 
-    let res = client.handle_certificate_v2(cert, Some(socket_addr)).await;
+    let res = client
+        .handle_certificate_v1(HandleCertificateRequestV1::new(cert), Some(socket_addr))
+        .await;
     assert!(res.is_err());
     let err = res.err().unwrap();
     // The resulting error should be a RpcError with a message length too large.
@@ -1515,7 +1524,10 @@ async fn test_handle_certificate_errors() {
     let socket_addr = make_socket_addr();
 
     let err = client
-        .handle_certificate_v2(ct.clone(), Some(socket_addr))
+        .handle_certificate_v1(
+            HandleCertificateRequestV1::new(ct.clone()),
+            Some(socket_addr),
+        )
         .await
         .unwrap_err();
     assert_matches!(err, IotaError::WrongEpoch {
@@ -1548,7 +1560,10 @@ async fn test_handle_certificate_errors() {
     .unwrap();
 
     let err = client
-        .handle_certificate_v2(ct.clone(), Some(socket_addr))
+        .handle_certificate_v1(
+            HandleCertificateRequestV1::new(ct.clone()),
+            Some(socket_addr),
+        )
         .await
         .unwrap_err();
 
@@ -1569,7 +1584,10 @@ async fn test_handle_certificate_errors() {
     )
     .unwrap();
     let err = client
-        .handle_certificate_v2(ct.clone(), Some(socket_addr))
+        .handle_certificate_v1(
+            HandleCertificateRequestV1::new(ct.clone()),
+            Some(socket_addr),
+        )
         .await
         .unwrap_err();
 
@@ -1591,7 +1609,10 @@ async fn test_handle_certificate_errors() {
     .unwrap();
 
     let err = client
-        .handle_certificate_v2(ct.clone(), Some(socket_addr))
+        .handle_certificate_v1(
+            HandleCertificateRequestV1::new(ct.clone()),
+            Some(socket_addr),
+        )
         .await
         .unwrap_err();
 
@@ -1722,8 +1743,8 @@ async fn test_handle_soft_bundle_certificates() {
         certificates.push(cert.into());
     }
     let responses = client
-        .handle_soft_bundle_certificates_v3(
-            HandleSoftBundleCertificatesRequestV3 {
+        .handle_soft_bundle_certificates_v1(
+            HandleSoftBundleCertificatesRequestV1 {
                 certificates,
                 wait_for_effects: true,
                 include_events: false,
@@ -1849,8 +1870,8 @@ async fn test_handle_soft_bundle_certificates_errors() {
     // Case 0: submit an empty soft bundle.
     {
         let response = client
-            .handle_soft_bundle_certificates_v3(
-                HandleSoftBundleCertificatesRequestV3 {
+            .handle_soft_bundle_certificates_v1(
+                HandleSoftBundleCertificatesRequestV1 {
                     certificates: vec![],
                     wait_for_effects: true,
                     include_events: false,
@@ -1897,8 +1918,8 @@ async fn test_handle_soft_bundle_certificates_errors() {
             certificates.push(signed_tx_into_certificate(signed).await.into());
         }
         let response = client
-            .handle_soft_bundle_certificates_v3(
-                HandleSoftBundleCertificatesRequestV3 {
+            .handle_soft_bundle_certificates_v1(
+                HandleSoftBundleCertificatesRequestV1 {
                     certificates,
                     wait_for_effects: true,
                     include_events: false,
@@ -1940,8 +1961,8 @@ async fn test_handle_soft_bundle_certificates_errors() {
         );
         let signed = to_sender_signed_transaction(data, &senders[5].1);
         let response = client
-            .handle_soft_bundle_certificates_v3(
-                HandleSoftBundleCertificatesRequestV3 {
+            .handle_soft_bundle_certificates_v1(
+                HandleSoftBundleCertificatesRequestV1 {
                     certificates: vec![signed_tx_into_certificate(signed).await.into()],
                     wait_for_effects: true,
                     include_events: false,
@@ -2024,8 +2045,8 @@ async fn test_handle_soft_bundle_certificates_errors() {
             signed_tx_into_certificate(signed).await
         };
         let response = client
-            .handle_soft_bundle_certificates_v3(
-                HandleSoftBundleCertificatesRequestV3 {
+            .handle_soft_bundle_certificates_v1(
+                HandleSoftBundleCertificatesRequestV1 {
                     certificates: vec![cert0.into(), cert1.into()],
                     wait_for_effects: true,
                     include_events: false,
@@ -2110,8 +2131,8 @@ async fn test_handle_soft_bundle_certificates_errors() {
         send_batch_consensus_no_execution(&authority, &vec![cert0.clone(), cert1.clone()], true)
             .await;
         let response = client
-            .handle_soft_bundle_certificates_v3(
-                HandleSoftBundleCertificatesRequestV3 {
+            .handle_soft_bundle_certificates_v1(
+                HandleSoftBundleCertificatesRequestV1 {
                     certificates: vec![cert0.into(), cert1.into()],
                     wait_for_effects: true,
                     include_events: false,
diff --git a/crates/iota-core/src/validator_tx_finalizer.rs b/crates/iota-core/src/validator_tx_finalizer.rs
index 607ad914920..128e85c8df3 100644
--- a/crates/iota-core/src/validator_tx_finalizer.rs
+++ b/crates/iota-core/src/validator_tx_finalizer.rs
@@ -289,19 +289,17 @@ mod tests {
         error::IotaError,
         executable_transaction::VerifiedExecutableTransaction,
         iota_system_state::IotaSystemState,
-        messages_checkpoint::{
-            CheckpointRequest, CheckpointRequestV2, CheckpointResponse, CheckpointResponseV2,
-        },
+        messages_checkpoint::{CheckpointRequest, CheckpointResponse},
         messages_grpc::{
-            HandleCertificateRequestV3, HandleCertificateResponseV2, HandleCertificateResponseV3,
-            HandleSoftBundleCertificatesRequestV3, HandleSoftBundleCertificatesResponseV3,
+            HandleCertificateRequestV1, HandleCertificateResponseV1,
+            HandleSoftBundleCertificatesRequestV1, HandleSoftBundleCertificatesResponseV1,
             HandleTransactionResponse, ObjectInfoRequest, ObjectInfoResponse, SystemStateRequest,
             TransactionInfoRequest, TransactionInfoResponse,
         },
         object::Object,
         transaction::{
-            CertifiedTransaction, SignedTransaction, Transaction, VerifiedCertificate,
-            VerifiedSignedTransaction, VerifiedTransaction,
+            SignedTransaction, Transaction, VerifiedCertificate, VerifiedSignedTransaction,
+            VerifiedTransaction,
         },
         utils::to_sender_signed_transaction,
     };
@@ -338,17 +336,17 @@ mod tests {
                 .await
         }
 
-        async fn handle_certificate_v2(
+        async fn handle_certificate_v1(
             &self,
-            certificate: CertifiedTransaction,
+            request: HandleCertificateRequestV1,
             _client_addr: Option<SocketAddr>,
-        ) -> Result<HandleCertificateResponseV2, IotaError> {
+        ) -> Result<HandleCertificateResponseV1, IotaError> {
             let epoch_store = self.authority.epoch_store_for_testing();
             let (effects, _) = self
                 .authority
                 .try_execute_immediately(
                     &VerifiedExecutableTransaction::new_from_certificate(
-                        VerifiedCertificate::new_unchecked(certificate),
+                        VerifiedCertificate::new_unchecked(request.certificate),
                     ),
                     None,
                     &epoch_store,
@@ -362,26 +360,20 @@ mod tests {
                 .authority
                 .sign_effects(effects, &epoch_store)?
                 .into_inner();
-            Ok(HandleCertificateResponseV2 {
+            Ok(HandleCertificateResponseV1 {
                 signed_effects,
-                events,
-                fastpath_input_objects: vec![],
+                events: Some(events),
+                input_objects: None,
+                output_objects: None,
+                auxiliary_data: None,
             })
         }
 
-        async fn handle_certificate_v3(
-            &self,
-            _request: HandleCertificateRequestV3,
-            _client_addr: Option<SocketAddr>,
-        ) -> Result<HandleCertificateResponseV3, IotaError> {
-            unimplemented!()
-        }
-
-        async fn handle_soft_bundle_certificates_v3(
+        async fn handle_soft_bundle_certificates_v1(
             &self,
-            _request: HandleSoftBundleCertificatesRequestV3,
+            _request: HandleSoftBundleCertificatesRequestV1,
             _client_addr: Option<SocketAddr>,
-        ) -> Result<HandleSoftBundleCertificatesResponseV3, IotaError> {
+        ) -> Result<HandleSoftBundleCertificatesResponseV1, IotaError> {
             unimplemented!()
         }
 
@@ -406,13 +398,6 @@ mod tests {
             unimplemented!()
         }
 
-        async fn handle_checkpoint_v2(
-            &self,
-            _request: CheckpointRequestV2,
-        ) -> Result<CheckpointResponseV2, IotaError> {
-            unimplemented!()
-        }
-
         async fn handle_system_state_object(
             &self,
             _request: SystemStateRequest,
diff --git a/crates/iota-core/tests/staged/iota.yaml b/crates/iota-core/tests/staged/iota.yaml
index 93612022d94..1d2cd9c0734 100644
--- a/crates/iota-core/tests/staged/iota.yaml
+++ b/crates/iota-core/tests/staged/iota.yaml
@@ -453,7 +453,7 @@ ExecutionFailureStatus:
     29:
       CertificateDenied: UNIT
     30:
-      IotaMoveVerificationTimedout: UNIT
+      IotaMoveVerificationTimeout: UNIT
     31:
       SharedObjectOperationNotAllowed: UNIT
     32:
@@ -868,89 +868,10 @@ TransactionEffects:
       V1:
         NEWTYPE:
           TYPENAME: TransactionEffectsV1
-    1:
-      V2:
-        NEWTYPE:
-          TYPENAME: TransactionEffectsV2
 TransactionEffectsDigest:
   NEWTYPESTRUCT:
     TYPENAME: Digest
 TransactionEffectsV1:
-  STRUCT:
-    - status:
-        TYPENAME: ExecutionStatus
-    - executed_epoch: U64
-    - gas_used:
-        TYPENAME: GasCostSummary
-    - modified_at_versions:
-        SEQ:
-          TUPLE:
-            - TYPENAME: ObjectID
-            - TYPENAME: SequenceNumber
-    - shared_objects:
-        SEQ:
-          TUPLE:
-            - TYPENAME: ObjectID
-            - TYPENAME: SequenceNumber
-            - TYPENAME: ObjectDigest
-    - transaction_digest:
-        TYPENAME: TransactionDigest
-    - created:
-        SEQ:
-          TUPLE:
-            - TUPLE:
-                - TYPENAME: ObjectID
-                - TYPENAME: SequenceNumber
-                - TYPENAME: ObjectDigest
-            - TYPENAME: Owner
-    - mutated:
-        SEQ:
-          TUPLE:
-            - TUPLE:
-                - TYPENAME: ObjectID
-                - TYPENAME: SequenceNumber
-                - TYPENAME: ObjectDigest
-            - TYPENAME: Owner
-    - unwrapped:
-        SEQ:
-          TUPLE:
-            - TUPLE:
-                - TYPENAME: ObjectID
-                - TYPENAME: SequenceNumber
-                - TYPENAME: ObjectDigest
-            - TYPENAME: Owner
-    - deleted:
-        SEQ:
-          TUPLE:
-            - TYPENAME: ObjectID
-            - TYPENAME: SequenceNumber
-            - TYPENAME: ObjectDigest
-    - unwrapped_then_deleted:
-        SEQ:
-          TUPLE:
-            - TYPENAME: ObjectID
-            - TYPENAME: SequenceNumber
-            - TYPENAME: ObjectDigest
-    - wrapped:
-        SEQ:
-          TUPLE:
-            - TYPENAME: ObjectID
-            - TYPENAME: SequenceNumber
-            - TYPENAME: ObjectDigest
-    - gas_object:
-        TUPLE:
-          - TUPLE:
-              - TYPENAME: ObjectID
-              - TYPENAME: SequenceNumber
-              - TYPENAME: ObjectDigest
-          - TYPENAME: Owner
-    - events_digest:
-        OPTION:
-          TYPENAME: TransactionEventsDigest
-    - dependencies:
-        SEQ:
-          TYPENAME: TransactionDigest
-TransactionEffectsV2:
   STRUCT:
     - status:
         TYPENAME: ExecutionStatus
diff --git a/crates/iota-cost/Cargo.toml b/crates/iota-cost/Cargo.toml
index 7558a4dfbde..f3aa0296262 100644
--- a/crates/iota-cost/Cargo.toml
+++ b/crates/iota-cost/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-cost"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-data-ingestion-core/Cargo.toml b/crates/iota-data-ingestion-core/Cargo.toml
index 8387e5f6dc0..7c81d572656 100644
--- a/crates/iota-data-ingestion-core/Cargo.toml
+++ b/crates/iota-data-ingestion-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-data-ingestion-core"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-data-ingestion-core/src/reader.rs b/crates/iota-data-ingestion-core/src/reader.rs
index 0a3e388c312..52d48539cb1 100644
--- a/crates/iota-data-ingestion-core/src/reader.rs
+++ b/crates/iota-data-ingestion-core/src/reader.rs
@@ -185,7 +185,7 @@ impl CheckpointReader {
             )
             .expect("failed to create remote store client");
             RemoteStore::Hybrid(object_store, iota_rest_api::Client::new(fn_url))
-        } else if url.ends_with("/rest") {
+        } else if url.ends_with("/api/v1") {
             RemoteStore::Rest(iota_rest_api::Client::new(url))
         } else {
             let object_store = create_remote_store_client(
diff --git a/crates/iota-e2e-tests/tests/apy_test.rs b/crates/iota-e2e-tests/tests/apy_test.rs
index 1d5607226fd..63660264dfb 100644
--- a/crates/iota-e2e-tests/tests/apy_test.rs
+++ b/crates/iota-e2e-tests/tests/apy_test.rs
@@ -41,6 +41,7 @@ use test_cluster::TestClusterBuilder;
 /// calculate APY from epoch 1 and 2. Since we need epoch 0 to start staking
 /// anyway, and only have the stake of the pool at the expected number (a
 /// quarter of 3.5B IOTAs) starting from epoch 1, this is totally fine.
+#[ignore = "https://github.com/iotaledger/iota/issues/3552"]
 #[sim_test]
 async fn test_apy() {
     // We need a large stake for low enough APY values such that they are not
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/genesis.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/genesis.move
index e6bff0442aa..f4d69976b8b 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/genesis.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/genesis.move
@@ -3,12 +3,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 module iota_system::genesis {
-    use std::vector;
-    use iota::balance::{Self, Balance};
-    use iota::object::UID;
-    use iota::iota::IOTA;
-    use iota::tx_context::{Self, TxContext};
-    use std::option::Option;
+    use std::string::String;
+
+    use iota::balance;
+    use iota::iota::IotaTreasuryCap;
+    use iota::timelock::SystemTimelockCap;
 
     use iota_system::iota_system;
     use iota_system::validator;
@@ -55,15 +54,20 @@ module iota_system::genesis {
     public struct TokenAllocation has drop {
         recipient_address: address,
         amount_nanos: u64,
+
         staked_with_validator: Option<address>,
+        staked_with_timelock_expiration: Option<u64>,
     }
 
+    #[allow(unused_function)]
     fun create(
         iota_system_state_id: UID,
-        mut iota_supply: Balance<IOTA>,
+        mut iota_treasury_cap: IotaTreasuryCap,
         genesis_chain_parameters: GenesisChainParameters,
         genesis_validators: vector<GenesisValidatorMetadata>,
         _token_distribution_schedule: TokenDistributionSchedule,
+        _timelock_genesis_label: Option<String>,
+        system_timelock_cap: SystemTimelockCap,
         ctx: &mut TxContext,
     ) {
         assert!(tx_context::epoch(ctx) == 0, 0);
@@ -97,7 +101,7 @@ module iota_system::genesis {
                 network_address,
                 p2p_address,
                 primary_address,
-                balance::split(&mut iota_supply, 2500),
+                iota_treasury_cap.mint_balance(2500, ctx),
                 ctx
             );
 
@@ -108,11 +112,13 @@ module iota_system::genesis {
 
         iota_system::create(
             iota_system_state_id,
+            iota_treasury_cap,
             validators,
-            iota_supply, // storage_fund
+            balance::zero(),
             genesis_chain_parameters.protocol_version,
             genesis_chain_parameters.chain_start_timestamp_ms,
             genesis_chain_parameters.epoch_duration_ms,
+            system_timelock_cap,
             ctx,
         );
     }
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/iota_system.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/iota_system.move
index 858f6d4d29d..9054f11b4a6 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/iota_system.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/iota_system.move
@@ -3,18 +3,16 @@
 // SPDX-License-Identifier: Apache-2.0
 
 module iota_system::iota_system {
-    use std::vector;
-
     use iota::balance::Balance;
-    use iota::object::UID;
-    use iota::iota::IOTA;
-    use iota::transfer;
-    use iota::tx_context::{Self, TxContext};
     use iota::dynamic_field;
+    use iota::iota::IOTA;
+    use iota::iota::IotaTreasuryCap;
+    use iota::timelock::SystemTimelockCap;
 
-    use iota_system::validator::Validator;
-    use iota_system::iota_system_state_inner::IotaSystemStateInner;
-    use iota_system::iota_system_state_inner;
+    use iota_system::validator::ValidatorV1;
+    use iota_system::iota_system_state_inner::{Self, IotaSystemStateV1};
+
+    const SYSTEM_TIMELOCK_CAP_DF_KEY: vector<u8> = b"sys_timelock_cap";
 
     public struct IotaSystemState has key {
         id: UID,
@@ -23,14 +21,17 @@ module iota_system::iota_system {
 
     public(package) fun create(
         id: UID,
-        validators: vector<Validator>,
+        iota_treasury_cap: IotaTreasuryCap,
+        validators: vector<ValidatorV1>,
         storage_fund: Balance<IOTA>,
         protocol_version: u64,
         epoch_start_timestamp_ms: u64,
         epoch_duration_ms: u64,
+        system_timelock_cap: SystemTimelockCap,
         ctx: &mut TxContext,
     ) {
         let system_state = iota_system_state_inner::create(
+            iota_treasury_cap,
             validators,
             storage_fund,
             protocol_version,
@@ -44,21 +45,22 @@ module iota_system::iota_system {
             version,
         };
         dynamic_field::add(&mut self.id, version, system_state);
+        dynamic_field::add(&mut self.id, SYSTEM_TIMELOCK_CAP_DF_KEY, system_timelock_cap);
         transfer::share_object(self);
     }
 
+    #[allow(unused_function)]
     fun advance_epoch(
+        validator_target_reward: u64,
         storage_charge: Balance<IOTA>,
         computation_reward: Balance<IOTA>,
         wrapper: &mut IotaSystemState,
         new_epoch: u64,
         next_protocol_version: u64,
         storage_rebate: u64,
-        _non_refundable_storage_fee: u64,
-        _storage_fund_reinvest_rate: u64, // share of storage fund's rewards that's reinvested
-                                         // into storage fund, in basis point.
-        _reward_slashing_rate: u64, // how much rewards are slashed to punish a validator, in bps.
-        epoch_start_timestamp_ms: u64, // Timestamp of the epoch start
+        non_refundable_storage_fee: u64,
+        reward_slashing_rate: u64,
+        epoch_start_timestamp_ms: u64,
         ctx: &mut TxContext,
     ) : Balance<IOTA> {
         let self = load_system_state_mut(wrapper);
@@ -67,28 +69,32 @@ module iota_system::iota_system {
             self,
             new_epoch,
             next_protocol_version,
+            validator_target_reward,
             storage_charge,
             computation_reward,
             storage_rebate,
+            non_refundable_storage_fee,
+            reward_slashing_rate,
             epoch_start_timestamp_ms,
+            ctx
         );
 
         storage_rebate
     }
 
-    public fun active_validator_addresses(wrapper: &mut IotaSystemState): vector<address> {
+    public fun active_validator_addresses(_wrapper: &mut IotaSystemState): vector<address> {
         vector::empty()
     }
 
-    fun load_system_state_mut(self: &mut IotaSystemState): &mut IotaSystemStateInner {
+    fun load_system_state_mut(self: &mut IotaSystemState): &mut IotaSystemStateV1 {
         load_inner_maybe_upgrade(self)
     }
 
-    fun load_inner_maybe_upgrade(self: &mut IotaSystemState): &mut IotaSystemStateInner {
+    fun load_inner_maybe_upgrade(self: &mut IotaSystemState): &mut IotaSystemStateV1 {
         let version = self.version;
         // TODO: This is where we check the version and perform upgrade if necessary.
 
-        let inner: &mut IotaSystemStateInner = dynamic_field::borrow_mut(&mut self.id, version);
+        let inner: &mut IotaSystemStateV1 = dynamic_field::borrow_mut(&mut self.id, version);
         assert!(iota_system_state_inner::system_state_version(inner) == version, 0);
         inner
     }
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/iota_system_state_inner.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/iota_system_state_inner.move
index b5ecd4e6e21..e3abf0b3c56 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/iota_system_state_inner.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/iota_system_state_inner.move
@@ -3,39 +3,53 @@
 // SPDX-License-Identifier: Apache-2.0
 
 module iota_system::iota_system_state_inner {
+    use iota::bag::{Self, Bag};
     use iota::balance::{Self, Balance};
+    use iota::event;
     use iota::iota::IOTA;
-    use iota::tx_context::TxContext;
-    use iota::bag::{Self, Bag};
+    use iota::iota::IotaTreasuryCap;
     use iota::table::{Self, Table};
-    use iota::object::ID;
 
-    use iota_system::validator::Validator;
-    use iota_system::validator_wrapper::ValidatorWrapper;
+    use iota_system::validator::ValidatorV1;
+    use iota_system::validator_wrapper::Validator;
     use iota_system::validator_wrapper;
     use iota_system::validator;
-    use iota::object;
 
     const SYSTEM_STATE_VERSION_V1: u64 = 18446744073709551605;  // u64::MAX - 10
 
-    public struct SystemParameters has store {
+    public struct SystemEpochInfoEventV1 has copy, drop {
+        epoch: u64,
+        protocol_version: u64,
+        reference_gas_price: u64,
+        total_stake: u64,
+        storage_charge: u64,
+        storage_rebate: u64,
+        storage_fund_balance: u64,
+        total_gas_fees: u64,
+        total_stake_rewards_distributed: u64,
+        burnt_tokens_amount: u64,
+        minted_tokens_amount: u64,
+    }
+
+    public struct SystemParametersV1 has store {
         epoch_duration_ms: u64,
         extra_fields: Bag,
     }
 
-    public struct ValidatorSet has store {
-        active_validators: vector<Validator>,
-        inactive_validators: Table<ID, ValidatorWrapper>,
+    public struct ValidatorSetV1 has store {
+        active_validators: vector<ValidatorV1>,
+        inactive_validators: Table<ID, Validator>,
         extra_fields: Bag,
     }
 
-    public struct IotaSystemStateInner has store {
+    public struct IotaSystemStateV1 has store {
         epoch: u64,
         protocol_version: u64,
         system_state_version: u64,
-        validators: ValidatorSet,
+        iota_treasury_cap: IotaTreasuryCap,
+        validators: ValidatorSetV1,
         storage_fund: Balance<IOTA>,
-        parameters: SystemParameters,
+        parameters: SystemParametersV1,
         reference_gas_price: u64,
         safe_mode: bool,
         epoch_start_timestamp_ms: u64,
@@ -43,21 +57,23 @@ module iota_system::iota_system_state_inner {
     }
 
     public(package) fun create(
-        validators: vector<Validator>,
+        iota_treasury_cap: IotaTreasuryCap,
+        validators: vector<ValidatorV1>,
         storage_fund: Balance<IOTA>,
         protocol_version: u64,
         epoch_start_timestamp_ms: u64,
         epoch_duration_ms: u64,
         ctx: &mut TxContext,
-    ): IotaSystemStateInner {
+    ): IotaSystemStateV1 {
         let validators = new_validator_set(validators, ctx);
-        let mut system_state = IotaSystemStateInner {
+        let mut system_state = IotaSystemStateV1 {
             epoch: 0,
             protocol_version,
             system_state_version: genesis_system_state_version(),
+            iota_treasury_cap,
             validators,
             storage_fund,
-            parameters: SystemParameters {
+            parameters: SystemParametersV1 {
                 epoch_duration_ms,
                 extra_fields: bag::new(ctx),
             },
@@ -72,13 +88,17 @@ module iota_system::iota_system_state_inner {
     }
 
     public(package) fun advance_epoch(
-        self: &mut IotaSystemStateInner,
+        self: &mut IotaSystemStateV1,
         new_epoch: u64,
         next_protocol_version: u64,
-        storage_charge: Balance<IOTA>,
-        computation_reward: Balance<IOTA>,
-        storage_rebate_amount: u64,
+        _validator_target_reward: u64,
+        mut storage_charge: Balance<IOTA>,
+        mut computation_reward: Balance<IOTA>,
+        mut storage_rebate_amount: u64,
+        mut _non_refundable_storage_fee_amount: u64,
+        _reward_slashing_rate: u64,
         epoch_start_timestamp_ms: u64,
+        _ctx: &mut TxContext,
     ) : Balance<IOTA> {
         self.epoch_start_timestamp_ms = epoch_start_timestamp_ms;
         self.epoch = self.epoch + 1;
@@ -86,19 +106,39 @@ module iota_system::iota_system_state_inner {
         self.safe_mode = false;
         self.protocol_version = next_protocol_version;
 
+        let storage_charge_value = storage_charge.value();
+        let total_gas_fees = computation_reward.value();
+
         balance::join(&mut self.storage_fund, computation_reward);
         balance::join(&mut self.storage_fund, storage_charge);
         let storage_rebate = balance::split(&mut self.storage_fund, storage_rebate_amount);
+
+        event::emit(
+            SystemEpochInfoEventV1 {
+                epoch: self.epoch,
+                protocol_version: self.protocol_version,
+                reference_gas_price: self.reference_gas_price,
+                total_stake: 0,
+                storage_charge: storage_charge_value,
+                storage_rebate: storage_rebate_amount,
+                storage_fund_balance: self.storage_fund.value(),
+                total_gas_fees,
+                total_stake_rewards_distributed: 0,
+                burnt_tokens_amount: 0,
+                minted_tokens_amount: 0,
+            }
+        );
+
         storage_rebate
     }
 
-    public(package) fun protocol_version(self: &IotaSystemStateInner): u64 { self.protocol_version }
-    public(package) fun system_state_version(self: &IotaSystemStateInner): u64 { self.system_state_version }
+    public(package) fun protocol_version(self: &IotaSystemStateV1): u64 { self.protocol_version }
+    public(package) fun system_state_version(self: &IotaSystemStateV1): u64 { self.system_state_version }
     public(package) fun genesis_system_state_version(): u64 {
         SYSTEM_STATE_VERSION_V1
     }
 
-    public(package) fun add_dummy_inactive_validator_for_testing(self: &mut IotaSystemStateInner, ctx: &mut TxContext) {
+    public(package) fun add_dummy_inactive_validator_for_testing(self: &mut IotaSystemStateV1, ctx: &mut TxContext) {
         // Add a new entry to the inactive validator table for upgrade testing.
         let dummy_inactive_validator = validator_wrapper::create_v1(
             validator::new_dummy_inactive_validator(ctx),
@@ -107,8 +147,8 @@ module iota_system::iota_system_state_inner {
         table::add(&mut self.validators.inactive_validators, object::id_from_address(@0x0), dummy_inactive_validator);
     }
 
-    fun new_validator_set(init_active_validators: vector<Validator>, ctx: &mut TxContext): ValidatorSet {
-        ValidatorSet {
+    fun new_validator_set(init_active_validators: vector<ValidatorV1>, ctx: &mut TxContext): ValidatorSetV1 {
+        ValidatorSetV1 {
             active_validators: init_active_validators,
             inactive_validators: table::new(ctx),
             extra_fields: bag::new(ctx),
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/validator.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/validator.move
index c3aa4b4a4b3..8b3f056e0d2 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/validator.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/validator.move
@@ -5,13 +5,12 @@
 module iota_system::validator {
     use std::ascii;
 
-    use iota::tx_context::TxContext;
     use std::string::{Self, String};
     use iota::bag::{Self, Bag};
     use iota::balance::{Self, Balance};
     use iota::iota::IOTA;
 
-    public struct ValidatorMetadata has store {
+    public struct ValidatorMetadataV1 has store {
         iota_address: address,
         authority_pubkey_bytes: vector<u8>,
         network_pubkey_bytes: vector<u8>,
@@ -22,8 +21,8 @@ module iota_system::validator {
         extra_fields: Bag,
     }
 
-    public struct Validator has store {
-        metadata: ValidatorMetadata,
+    public struct ValidatorV1 has store {
+        metadata: ValidatorMetadataV1,
         voting_power: u64,
         stake: Balance<IOTA>,
         extra_fields: Bag,
@@ -39,8 +38,8 @@ module iota_system::validator {
         primary_address: vector<u8>,
         init_stake: Balance<IOTA>,
         ctx: &mut TxContext
-    ): Validator {
-        let metadata = ValidatorMetadata {
+    ): ValidatorV1 {
+        let metadata = ValidatorMetadataV1 {
             iota_address,
             authority_pubkey_bytes,
             network_pubkey_bytes,
@@ -51,7 +50,7 @@ module iota_system::validator {
             extra_fields: bag::new(ctx),
         };
 
-        Validator {
+        ValidatorV1 {
             metadata,
             voting_power: balance::value(&init_stake),
             stake: init_stake,
@@ -61,8 +60,8 @@ module iota_system::validator {
 
     public(package) fun new_dummy_inactive_validator(
         ctx: &mut TxContext
-    ): Validator {
-        let metadata = ValidatorMetadata {
+    ): ValidatorV1 {
+        let metadata = ValidatorMetadataV1 {
             iota_address: @0x0,
             authority_pubkey_bytes: vector[],
             network_pubkey_bytes: vector[],
@@ -73,7 +72,7 @@ module iota_system::validator {
             extra_fields: bag::new(ctx),
         };
 
-        Validator {
+        ValidatorV1 {
             metadata,
             voting_power: 0,
             stake: balance::zero(),
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/validator_wrapper.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/validator_wrapper.move
index ed74b47dd7b..d83238f0b9d 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/validator_wrapper.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/base/sources/validator_wrapper.move
@@ -3,47 +3,45 @@
 // SPDX-License-Identifier: Apache-2.0
 
 module iota_system::validator_wrapper {
-    use iota::versioned::Versioned;
-    use iota::versioned;
-    use iota::tx_context::TxContext;
-    use iota_system::validator::Validator;
+    use iota::versioned::{Self, Versioned};
+    use iota_system::validator::ValidatorV1;
 
     const VALIDATOR_VERSION_V1: u64 = 18446744073709551605;  // u64::MAX - 10
 
     const EInvalidVersion: u64 = 0;
 
-    public struct ValidatorWrapper has store {
+    public struct Validator has store {
         inner: Versioned
     }
 
     // Validator corresponds to version 1.
-    public(package) fun create_v1(validator: Validator, ctx: &mut TxContext): ValidatorWrapper {
-        ValidatorWrapper {
+    public(package) fun create_v1(validator: ValidatorV1, ctx: &mut TxContext): Validator {
+        Validator {
             inner: versioned::create(VALIDATOR_VERSION_V1, validator, ctx)
         }
     }
 
     /// This function should always return the latest supported version.
     /// If the inner version is old, we upgrade it lazily in-place.
-    public(package) fun load_validator_maybe_upgrade(self: &mut ValidatorWrapper): &mut Validator {
+    public(package) fun load_validator_maybe_upgrade(self: &mut Validator): &mut ValidatorV1 {
         upgrade_to_latest(self);
-        versioned::load_value_mut<Validator>(&mut self.inner)
+        versioned::load_value_mut<ValidatorV1>(&mut self.inner)
     }
 
     /// Destroy the wrapper and retrieve the inner validator object.
-    public(package) fun destroy(mut self: ValidatorWrapper): Validator {
-        upgrade_to_latest(&mut self);
-        let ValidatorWrapper { inner } = self;
+    public(package) fun destroy(self: Validator): ValidatorV1 {
+        upgrade_to_latest(&self);
+        let Validator { inner } = self;
         versioned::destroy(inner)
     }
 
-    fun upgrade_to_latest(self: &mut ValidatorWrapper) {
+    fun upgrade_to_latest(self: &Validator) {
         let version = version(self);
         // TODO: When new versions are added, we need to explicitly upgrade here.
         assert!(version == VALIDATOR_VERSION_V1, EInvalidVersion);
     }
 
-    fun version(self: &ValidatorWrapper): u64 {
+    fun version(self: &Validator): u64 {
         versioned::version(&self.inner)
     }
 }
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/genesis.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/genesis.move
index 85852671040..f4d69976b8b 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/genesis.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/genesis.move
@@ -3,12 +3,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 module iota_system::genesis {
-    use std::vector;
-    use iota::balance::{Self, Balance};
-    use iota::object::UID;
-    use iota::iota::IOTA;
-    use iota::tx_context::{Self, TxContext};
-    use std::option::Option;
+    use std::string::String;
+
+    use iota::balance;
+    use iota::iota::IotaTreasuryCap;
+    use iota::timelock::SystemTimelockCap;
 
     use iota_system::iota_system;
     use iota_system::validator;
@@ -46,7 +45,7 @@ module iota_system::genesis {
         validator_very_low_stake_threshold: u64,
         validator_low_stake_grace_period: u64,
     }
-      
+
     public struct TokenDistributionSchedule has drop {
         pre_minted_supply: u64,
         allocations: vector<TokenAllocation>,
@@ -55,15 +54,20 @@ module iota_system::genesis {
     public struct TokenAllocation has drop {
         recipient_address: address,
         amount_nanos: u64,
+
         staked_with_validator: Option<address>,
+        staked_with_timelock_expiration: Option<u64>,
     }
 
+    #[allow(unused_function)]
     fun create(
         iota_system_state_id: UID,
-        mut iota_supply: Balance<IOTA>,
+        mut iota_treasury_cap: IotaTreasuryCap,
         genesis_chain_parameters: GenesisChainParameters,
         genesis_validators: vector<GenesisValidatorMetadata>,
         _token_distribution_schedule: TokenDistributionSchedule,
+        _timelock_genesis_label: Option<String>,
+        system_timelock_cap: SystemTimelockCap,
         ctx: &mut TxContext,
     ) {
         assert!(tx_context::epoch(ctx) == 0, 0);
@@ -97,7 +101,7 @@ module iota_system::genesis {
                 network_address,
                 p2p_address,
                 primary_address,
-                balance::split(&mut iota_supply, 2500),
+                iota_treasury_cap.mint_balance(2500, ctx),
                 ctx
             );
 
@@ -108,11 +112,13 @@ module iota_system::genesis {
 
         iota_system::create(
             iota_system_state_id,
+            iota_treasury_cap,
             validators,
-            iota_supply, // storage_fund
+            balance::zero(),
             genesis_chain_parameters.protocol_version,
             genesis_chain_parameters.chain_start_timestamp_ms,
             genesis_chain_parameters.epoch_duration_ms,
+            system_timelock_cap,
             ctx,
         );
     }
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/iota_system.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/iota_system.move
index 2232766f243..549ba9c21a3 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/iota_system.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/iota_system.move
@@ -3,17 +3,16 @@
 // SPDX-License-Identifier: Apache-2.0
 
 module iota_system::iota_system {
-    use std::vector;
-
     use iota::balance::Balance;
-    use iota::object::UID;
-    use iota::iota::IOTA;
-    use iota::transfer;
-    use iota::tx_context::{Self, TxContext};
     use iota::dynamic_field;
+    use iota::iota::IOTA;
+    use iota::iota::IotaTreasuryCap;
+    use iota::timelock::SystemTimelockCap;
 
-    use iota_system::validator::Validator;
-    use iota_system::iota_system_state_inner::{Self, IotaSystemStateInnerV2, IotaSystemStateInner};
+    use iota_system::validator::ValidatorV1;
+    use iota_system::iota_system_state_inner::{Self, IotaSystemStateV1, IotaSystemStateV2};
+
+    const SYSTEM_TIMELOCK_CAP_DF_KEY: vector<u8> = b"sys_timelock_cap";
 
     public struct IotaSystemState has key {
         id: UID,
@@ -22,14 +21,17 @@ module iota_system::iota_system {
 
     public(package) fun create(
         id: UID,
-        validators: vector<Validator>,
+        iota_treasury_cap: IotaTreasuryCap,
+        validators: vector<ValidatorV1>,
         storage_fund: Balance<IOTA>,
         protocol_version: u64,
         epoch_start_timestamp_ms: u64,
         epoch_duration_ms: u64,
+        system_timelock_cap: SystemTimelockCap,
         ctx: &mut TxContext,
     ) {
         let system_state = iota_system_state_inner::create(
+            iota_treasury_cap,
             validators,
             storage_fund,
             protocol_version,
@@ -43,21 +45,22 @@ module iota_system::iota_system {
             version,
         };
         dynamic_field::add(&mut self.id, version, system_state);
+        dynamic_field::add(&mut self.id, SYSTEM_TIMELOCK_CAP_DF_KEY, system_timelock_cap);
         transfer::share_object(self);
     }
 
+    #[allow(unused_function)]
     fun advance_epoch(
+        validator_target_reward: u64,
         storage_charge: Balance<IOTA>,
         computation_reward: Balance<IOTA>,
         wrapper: &mut IotaSystemState,
         new_epoch: u64,
         next_protocol_version: u64,
         storage_rebate: u64,
-        _non_refundable_storage_fee: u64,
-        _storage_fund_reinvest_rate: u64, // share of storage fund's rewards that's reinvested
-                                         // into storage fund, in basis point.
-        _reward_slashing_rate: u64, // how much rewards are slashed to punish a validator, in bps.
-        epoch_start_timestamp_ms: u64, // Timestamp of the epoch start
+        non_refundable_storage_fee: u64,
+        reward_slashing_rate: u64,
+        epoch_start_timestamp_ms: u64,
         ctx: &mut TxContext,
     ) : Balance<IOTA> {
         let self = load_system_state_mut(wrapper);
@@ -66,34 +69,38 @@ module iota_system::iota_system {
             self,
             new_epoch,
             next_protocol_version,
+            validator_target_reward,
             storage_charge,
             computation_reward,
             storage_rebate,
+            non_refundable_storage_fee,
+            reward_slashing_rate,
             epoch_start_timestamp_ms,
+            ctx
         );
 
         storage_rebate
     }
 
-    public fun active_validator_addresses(wrapper: &mut IotaSystemState): vector<address> {
+    public fun active_validator_addresses(_wrapper: &mut IotaSystemState): vector<address> {
         vector::empty()
     }
 
-    fun load_system_state_mut(self: &mut IotaSystemState): &mut IotaSystemStateInnerV2 {
+    fun load_system_state_mut(self: &mut IotaSystemState): &mut IotaSystemStateV2 {
         load_inner_maybe_upgrade(self)
     }
 
-    fun load_inner_maybe_upgrade(self: &mut IotaSystemState): &mut IotaSystemStateInnerV2 {
+    fun load_inner_maybe_upgrade(self: &mut IotaSystemState): &mut IotaSystemStateV2 {
         let mut version = self.version;
         if (version == iota_system_state_inner::genesis_system_state_version()) {
-            let inner: IotaSystemStateInner = dynamic_field::remove(&mut self.id, version);
+            let inner: IotaSystemStateV1 = dynamic_field::remove(&mut self.id, version);
             let new_inner = iota_system_state_inner::v1_to_v2(inner);
             version = iota_system_state_inner::system_state_version(&new_inner);
             dynamic_field::add(&mut self.id, version, new_inner);
             self.version = version;
         };
 
-        let inner: &mut IotaSystemStateInnerV2 = dynamic_field::borrow_mut(&mut self.id, version);
+        let inner: &mut IotaSystemStateV2 = dynamic_field::borrow_mut(&mut self.id, version);
         assert!(iota_system_state_inner::system_state_version(inner) == version, 0);
         inner
     }
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/iota_system_state_inner.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/iota_system_state_inner.move
index c37f2b07fdc..a1f64c1602d 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/iota_system_state_inner.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/iota_system_state_inner.move
@@ -3,63 +3,76 @@
 // SPDX-License-Identifier: Apache-2.0
 
 module iota_system::iota_system_state_inner {
-    use std::vector;
-
+    use iota::bag::{Self, Bag};
     use iota::balance::{Self, Balance};
+    use iota::event;
     use iota::iota::IOTA;
-    use iota::tx_context::TxContext;
-    use iota::bag::{Self, Bag};
+    use iota::iota::IotaTreasuryCap;
     use iota::table::{Self, Table};
-    use iota::object::ID;
 
-    use iota_system::validator::{Validator, ValidatorV2};
-    use iota_system::validator_wrapper::ValidatorWrapper;
+    use iota_system::validator::{ValidatorV1, ValidatorV2};
+    use iota_system::validator_wrapper::Validator;
     use iota_system::validator_wrapper;
-    use iota::object;
     use iota_system::validator;
 
     const SYSTEM_STATE_VERSION_V1: u64 = 18446744073709551605;  // u64::MAX - 10
-    // Not using MAX - 9 since it's already used in the shallow upgrade test.
+        // Not using MAX - 9 since it's already used in the shallow upgrade test.
     const SYSTEM_STATE_VERSION_V2: u64 = 18446744073709551607;  // u64::MAX - 8
 
-    public struct SystemParameters has store {
+    public struct SystemEpochInfoEventV1 has copy, drop {
+        epoch: u64,
+        protocol_version: u64,
+        reference_gas_price: u64,
+        total_stake: u64,
+        storage_charge: u64,
+        storage_rebate: u64,
+        storage_fund_balance: u64,
+        total_gas_fees: u64,
+        total_stake_rewards_distributed: u64,
+        burnt_tokens_amount: u64,
+        minted_tokens_amount: u64,
+    }
+
+    public struct SystemParametersV1 has store {
         epoch_duration_ms: u64,
         extra_fields: Bag,
     }
 
-    public struct ValidatorSet has store {
-        active_validators: vector<Validator>,
-        inactive_validators: Table<ID, ValidatorWrapper>,
+    public struct ValidatorSetV1 has store {
+        active_validators: vector<ValidatorV1>,
+        inactive_validators: Table<ID, Validator>,
         extra_fields: Bag,
     }
 
     public struct ValidatorSetV2 has store {
         active_validators: vector<ValidatorV2>,
-        inactive_validators: Table<ID, ValidatorWrapper>,
+        inactive_validators: Table<ID, Validator>,
         extra_fields: Bag,
     }
 
-    public struct IotaSystemStateInner has store {
+    public struct IotaSystemStateV1 has store {
         epoch: u64,
         protocol_version: u64,
         system_state_version: u64,
-        validators: ValidatorSet,
+        iota_treasury_cap: IotaTreasuryCap,
+        validators: ValidatorSetV1,
         storage_fund: Balance<IOTA>,
-        parameters: SystemParameters,
+        parameters: SystemParametersV1,
         reference_gas_price: u64,
         safe_mode: bool,
         epoch_start_timestamp_ms: u64,
         extra_fields: Bag,
     }
 
-    public struct IotaSystemStateInnerV2 has store {
+    public struct IotaSystemStateV2 has store {
         new_dummy_field: u64,
         epoch: u64,
         protocol_version: u64,
         system_state_version: u64,
+        iota_treasury_cap: IotaTreasuryCap,
         validators: ValidatorSetV2,
         storage_fund: Balance<IOTA>,
-        parameters: SystemParameters,
+        parameters: SystemParametersV1,
         reference_gas_price: u64,
         safe_mode: bool,
         epoch_start_timestamp_ms: u64,
@@ -67,21 +80,23 @@ module iota_system::iota_system_state_inner {
     }
 
     public(package) fun create(
-        validators: vector<Validator>,
+        iota_treasury_cap: IotaTreasuryCap,
+        validators: vector<ValidatorV1>,
         storage_fund: Balance<IOTA>,
         protocol_version: u64,
         epoch_start_timestamp_ms: u64,
         epoch_duration_ms: u64,
         ctx: &mut TxContext,
-    ): IotaSystemStateInner {
+    ): IotaSystemStateV1 {
         let validators = new_validator_set(validators, ctx);
-        let system_state = IotaSystemStateInner {
+        let system_state = IotaSystemStateV1 {
             epoch: 0,
             protocol_version,
             system_state_version: genesis_system_state_version(),
+            iota_treasury_cap,
             validators,
             storage_fund,
-            parameters: SystemParameters {
+            parameters: SystemParametersV1 {
                 epoch_duration_ms,
                 extra_fields: bag::new(ctx),
             },
@@ -94,13 +109,17 @@ module iota_system::iota_system_state_inner {
     }
 
     public(package) fun advance_epoch(
-        self: &mut IotaSystemStateInnerV2,
+        self: &mut IotaSystemStateV2,
         new_epoch: u64,
         next_protocol_version: u64,
-        storage_charge: Balance<IOTA>,
-        computation_reward: Balance<IOTA>,
-        storage_rebate_amount: u64,
+        _validator_target_reward: u64,
+        mut storage_charge: Balance<IOTA>,
+        mut computation_reward: Balance<IOTA>,
+        mut storage_rebate_amount: u64,
+        mut _non_refundable_storage_fee_amount: u64,
+        _reward_slashing_rate: u64,
         epoch_start_timestamp_ms: u64,
+        _ctx: &mut TxContext,
     ) : Balance<IOTA> {
         touch_dummy_inactive_validator(self);
 
@@ -110,31 +129,52 @@ module iota_system::iota_system_state_inner {
         self.safe_mode = false;
         self.protocol_version = next_protocol_version;
 
+        let storage_charge_value = storage_charge.value();
+        let total_gas_fees = computation_reward.value();
+
         balance::join(&mut self.storage_fund, computation_reward);
         balance::join(&mut self.storage_fund, storage_charge);
         let storage_rebate = balance::split(&mut self.storage_fund, storage_rebate_amount);
+
+        event::emit(
+            SystemEpochInfoEventV1 {
+                epoch: self.epoch,
+                protocol_version: self.protocol_version,
+                reference_gas_price: self.reference_gas_price,
+                total_stake: 0,
+                storage_charge: storage_charge_value,
+                storage_rebate: storage_rebate_amount,
+                storage_fund_balance: self.storage_fund.value(),
+                total_gas_fees,
+                total_stake_rewards_distributed: 0,
+                burnt_tokens_amount: 0,
+                minted_tokens_amount: 0,
+            }
+        );
+
         storage_rebate
     }
 
-    public(package) fun protocol_version(self: &IotaSystemStateInnerV2): u64 { self.protocol_version }
-    public(package) fun system_state_version(self: &IotaSystemStateInnerV2): u64 { self.system_state_version }
+    public(package) fun protocol_version(self: &IotaSystemStateV2): u64 { self.protocol_version }
+    public(package) fun system_state_version(self: &IotaSystemStateV2): u64 { self.system_state_version }
     public(package) fun genesis_system_state_version(): u64 {
         SYSTEM_STATE_VERSION_V1
     }
 
-    fun new_validator_set(init_active_validators: vector<Validator>, ctx: &mut TxContext): ValidatorSet {
-        ValidatorSet {
+    fun new_validator_set(init_active_validators: vector<ValidatorV1>, ctx: &mut TxContext): ValidatorSetV1 {
+        ValidatorSetV1 {
             active_validators: init_active_validators,
             inactive_validators: table::new(ctx),
             extra_fields: bag::new(ctx),
         }
     }
 
-    public(package) fun v1_to_v2(v1: IotaSystemStateInner): IotaSystemStateInnerV2 {
-        let IotaSystemStateInner {
+    public(package) fun v1_to_v2(v1: IotaSystemStateV1): IotaSystemStateV2 {
+        let IotaSystemStateV1 {
             epoch,
             protocol_version,
             system_state_version: old_system_state_version,
+            iota_treasury_cap,
             validators,
             storage_fund,
             parameters,
@@ -145,11 +185,12 @@ module iota_system::iota_system_state_inner {
         } = v1;
         let new_validator_set = validator_set_v1_to_v2(validators);
         assert!(old_system_state_version == SYSTEM_STATE_VERSION_V1, 0);
-        IotaSystemStateInnerV2 {
+        IotaSystemStateV2 {
             new_dummy_field: 100,
             epoch,
             protocol_version,
             system_state_version: SYSTEM_STATE_VERSION_V2,
+            iota_treasury_cap,
             validators: new_validator_set,
             storage_fund,
             parameters,
@@ -161,13 +202,13 @@ module iota_system::iota_system_state_inner {
     }
 
     /// Load the dummy inactive validator added in the base version, trigger it to be upgraded.
-    fun touch_dummy_inactive_validator(self: &mut IotaSystemStateInnerV2) {
+    fun touch_dummy_inactive_validator(self: &mut IotaSystemStateV2) {
         let validator_wrapper = table::borrow_mut(&mut self.validators.inactive_validators, object::id_from_address(@0x0));
         let _ = validator_wrapper::load_validator_maybe_upgrade(validator_wrapper);
     }
 
-    fun validator_set_v1_to_v2(v1: ValidatorSet): ValidatorSetV2 {
-        let ValidatorSet {
+    fun validator_set_v1_to_v2(v1: ValidatorSetV1): ValidatorSetV2 {
+        let ValidatorSetV1 {
             mut active_validators,
             inactive_validators,
             extra_fields,
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/validator.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/validator.move
index ea965ad4d15..a8e7744af84 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/validator.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/validator.move
@@ -5,13 +5,12 @@
 module iota_system::validator {
     use std::ascii;
 
-    use iota::tx_context::TxContext;
     use std::string::{Self, String};
     use iota::bag::{Self, Bag};
     use iota::balance::{Self, Balance};
     use iota::iota::IOTA;
 
-    public struct ValidatorMetadata has store {
+    public struct ValidatorMetadataV1 has store {
         iota_address: address,
         authority_pubkey_bytes: vector<u8>,
         network_pubkey_bytes: vector<u8>,
@@ -22,8 +21,8 @@ module iota_system::validator {
         extra_fields: Bag,
     }
 
-    public struct Validator has store {
-        metadata: ValidatorMetadata,
+    public struct ValidatorV1 has store {
+        metadata: ValidatorMetadataV1,
         voting_power: u64,
         stake: Balance<IOTA>,
         extra_fields: Bag,
@@ -31,7 +30,7 @@ module iota_system::validator {
 
     public struct ValidatorV2 has store {
         new_dummy_field: u64,
-        metadata: ValidatorMetadata,
+        metadata: ValidatorMetadataV1,
         voting_power: u64,
         stake: Balance<IOTA>,
         extra_fields: Bag,
@@ -47,8 +46,8 @@ module iota_system::validator {
         primary_address: vector<u8>,
         init_stake: Balance<IOTA>,
         ctx: &mut TxContext
-    ): Validator {
-        let metadata = ValidatorMetadata {
+    ): ValidatorV1 {
+        let metadata = ValidatorMetadataV1 {
             iota_address,
             authority_pubkey_bytes,
             network_pubkey_bytes,
@@ -59,7 +58,7 @@ module iota_system::validator {
             extra_fields: bag::new(ctx),
         };
 
-        Validator {
+        ValidatorV1 {
             metadata,
             voting_power: balance::value(&init_stake),
             stake: init_stake,
@@ -67,8 +66,8 @@ module iota_system::validator {
         }
     }
 
-    public(package) fun v1_to_v2(v1: Validator): ValidatorV2 {
-        let Validator {
+    public(package) fun v1_to_v2(v1: ValidatorV1): ValidatorV2 {
+        let ValidatorV1 {
             metadata,
             voting_power,
             stake,
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/validator_wrapper.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/validator_wrapper.move
index b6e389ee21a..3fc3b4a050f 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/validator_wrapper.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/deep_upgrade/sources/validator_wrapper.move
@@ -3,43 +3,40 @@
 // SPDX-License-Identifier: Apache-2.0
 
 module iota_system::validator_wrapper {
-    use iota::versioned::Versioned;
-    use iota::versioned;
-    use iota::tx_context::TxContext;
-    use iota_system::validator::{Validator, ValidatorV2};
-    use iota_system::validator;
+    use iota::versioned::{Self, Versioned};
+    use iota_system::validator::{Self, ValidatorV1, ValidatorV2};
 
     const VALIDATOR_VERSION_V1: u64 = 18446744073709551605;  // u64::MAX - 10
     const VALIDATOR_VERSION_V3: u64 = 18446744073709551607;  // u64::MAX - 8
 
     const EInvalidVersion: u64 = 0;
 
-    public struct ValidatorWrapper has store {
+    public struct Validator has store {
         inner: Versioned
     }
 
     // Validator corresponds to version 1.
-    public(package) fun create_v1(validator: Validator, ctx: &mut TxContext): ValidatorWrapper {
-        ValidatorWrapper {
+    public(package) fun create_v1(validator: ValidatorV1, ctx: &mut TxContext): Validator {
+        Validator {
             inner: versioned::create(VALIDATOR_VERSION_V1, validator, ctx)
         }
     }
 
     /// This function should always return the latest supported version.
     /// If the inner version is old, we upgrade it lazily in-place.
-    public(package) fun load_validator_maybe_upgrade(self: &mut ValidatorWrapper): &mut ValidatorV2 {
+    public(package) fun load_validator_maybe_upgrade(self: &mut Validator): &mut ValidatorV2 {
         upgrade_to_latest(self);
-        versioned::load_value_mut(&mut self.inner)
+        versioned::load_value_mut<ValidatorV2>(&mut self.inner)
     }
 
     /// Destroy the wrapper and retrieve the inner validator object.
-    public(package) fun destroy(mut self: ValidatorWrapper): ValidatorV2 {
+    public(package) fun destroy(mut self: Validator): ValidatorV2 {
         upgrade_to_latest(&mut self);
-        let ValidatorWrapper { inner } = self;
+        let Validator { inner } = self;
         versioned::destroy(inner)
     }
 
-    fun upgrade_to_latest(self: &mut ValidatorWrapper) {
+    fun upgrade_to_latest(self: &mut Validator) {
         let version = version(self);
         if (version == VALIDATOR_VERSION_V1) {
             let (v1, cap) = versioned::remove_value_for_upgrade(&mut self.inner);
@@ -49,7 +46,7 @@ module iota_system::validator_wrapper {
         assert!(version(self) == VALIDATOR_VERSION_V3, EInvalidVersion);
     }
 
-    fun version(self: &ValidatorWrapper): u64 {
+    fun version(self: &Validator): u64 {
         versioned::version(&self.inner)
     }
 }
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/genesis.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/genesis.move
index e6bff0442aa..f4d69976b8b 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/genesis.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/genesis.move
@@ -3,12 +3,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 module iota_system::genesis {
-    use std::vector;
-    use iota::balance::{Self, Balance};
-    use iota::object::UID;
-    use iota::iota::IOTA;
-    use iota::tx_context::{Self, TxContext};
-    use std::option::Option;
+    use std::string::String;
+
+    use iota::balance;
+    use iota::iota::IotaTreasuryCap;
+    use iota::timelock::SystemTimelockCap;
 
     use iota_system::iota_system;
     use iota_system::validator;
@@ -55,15 +54,20 @@ module iota_system::genesis {
     public struct TokenAllocation has drop {
         recipient_address: address,
         amount_nanos: u64,
+
         staked_with_validator: Option<address>,
+        staked_with_timelock_expiration: Option<u64>,
     }
 
+    #[allow(unused_function)]
     fun create(
         iota_system_state_id: UID,
-        mut iota_supply: Balance<IOTA>,
+        mut iota_treasury_cap: IotaTreasuryCap,
         genesis_chain_parameters: GenesisChainParameters,
         genesis_validators: vector<GenesisValidatorMetadata>,
         _token_distribution_schedule: TokenDistributionSchedule,
+        _timelock_genesis_label: Option<String>,
+        system_timelock_cap: SystemTimelockCap,
         ctx: &mut TxContext,
     ) {
         assert!(tx_context::epoch(ctx) == 0, 0);
@@ -97,7 +101,7 @@ module iota_system::genesis {
                 network_address,
                 p2p_address,
                 primary_address,
-                balance::split(&mut iota_supply, 2500),
+                iota_treasury_cap.mint_balance(2500, ctx),
                 ctx
             );
 
@@ -108,11 +112,13 @@ module iota_system::genesis {
 
         iota_system::create(
             iota_system_state_id,
+            iota_treasury_cap,
             validators,
-            iota_supply, // storage_fund
+            balance::zero(),
             genesis_chain_parameters.protocol_version,
             genesis_chain_parameters.chain_start_timestamp_ms,
             genesis_chain_parameters.epoch_duration_ms,
+            system_timelock_cap,
             ctx,
         );
     }
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/iota_system.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/iota_system.move
index c633757870f..113afd557ce 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/iota_system.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/iota_system.move
@@ -3,18 +3,16 @@
 // SPDX-License-Identifier: Apache-2.0
 
 module iota_system::iota_system {
-    use std::vector;
-
     use iota::balance::Balance;
-    use iota::object::UID;
-    use iota::iota::IOTA;
-    use iota::transfer;
-    use iota::tx_context::{Self, TxContext};
     use iota::dynamic_field;
+    use iota::iota::IOTA;
+    use iota::iota::IotaTreasuryCap;
+    use iota::timelock::SystemTimelockCap;
 
-    use iota_system::validator::Validator;
-    use iota_system::iota_system_state_inner::IotaSystemStateInner;
-    use iota_system::iota_system_state_inner;
+    use iota_system::validator::ValidatorV1;
+    use iota_system::iota_system_state_inner::{Self, IotaSystemStateV1};
+
+    const SYSTEM_TIMELOCK_CAP_DF_KEY: vector<u8> = b"sys_timelock_cap";
 
     public struct IotaSystemState has key {
         id: UID,
@@ -23,14 +21,17 @@ module iota_system::iota_system {
 
     public(package) fun create(
         id: UID,
-        validators: vector<Validator>,
+        iota_treasury_cap: IotaTreasuryCap,
+        validators: vector<ValidatorV1>,
         storage_fund: Balance<IOTA>,
         protocol_version: u64,
         epoch_start_timestamp_ms: u64,
         epoch_duration_ms: u64,
+        system_timelock_cap: SystemTimelockCap,
         ctx: &mut TxContext,
     ) {
         let system_state = iota_system_state_inner::create(
+            iota_treasury_cap,
             validators,
             storage_fund,
             protocol_version,
@@ -44,37 +45,44 @@ module iota_system::iota_system {
             version,
         };
         dynamic_field::add(&mut self.id, version, system_state);
+        dynamic_field::add(&mut self.id, SYSTEM_TIMELOCK_CAP_DF_KEY, system_timelock_cap);
         transfer::share_object(self);
     }
 
+    #[allow(unused_function)]
     fun advance_epoch(
+        validator_target_reward: u64,
         storage_charge: Balance<IOTA>,
         computation_reward: Balance<IOTA>,
         wrapper: &mut IotaSystemState,
         _new_epoch: u64,
         _next_protocol_version: u64,
         storage_rebate: u64,
-        _non_refundable_storage_fee: u64,
-        _storage_fund_reinvest_rate: u64,
-        _reward_slashing_rate: u64,
+        non_refundable_storage_fee: u64,
+        reward_slashing_rate: u64,
         _epoch_start_timestamp_ms: u64,
         ctx: &mut TxContext,
     ) : Balance<IOTA> {
         let self = load_system_state_mut(wrapper);
         assert!(tx_context::sender(ctx) == @0x1, 0); // aborts here
-        iota_system_state_inner::advance_epoch(
+        let storage_rebate = iota_system_state_inner::advance_epoch(
             self,
+            validator_target_reward,
             storage_charge,
             computation_reward,
             storage_rebate,
-        )
+            non_refundable_storage_fee,
+            reward_slashing_rate,
+            ctx
+        );
+        storage_rebate
     }
 
-    public fun active_validator_addresses(wrapper: &mut IotaSystemState): vector<address> {
+    public fun active_validator_addresses(_wrapper: &mut IotaSystemState): vector<address> {
         vector::empty()
     }
 
-    fun load_system_state_mut(self: &mut IotaSystemState): &mut IotaSystemStateInner {
+    fun load_system_state_mut(self: &mut IotaSystemState): &mut IotaSystemStateV1 {
         let version = self.version;
         dynamic_field::borrow_mut(&mut self.id, version)
     }
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/iota_system_state_inner.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/iota_system_state_inner.move
index 6a7d2d9f11b..a2ea7aa1f8d 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/iota_system_state_inner.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/iota_system_state_inner.move
@@ -3,36 +3,51 @@
 // SPDX-License-Identifier: Apache-2.0
 
 module iota_system::iota_system_state_inner {
+    use iota::bag::{Self, Bag};
     use iota::balance::{Self, Balance};
+    use iota::event;
     use iota::iota::IOTA;
-    use iota::tx_context::TxContext;
-    use iota::bag::{Self, Bag};
+    use iota::iota::IotaTreasuryCap;
     use iota::table::{Self, Table};
-    use iota::object::ID;
 
-    use iota_system::validator::Validator;
-    use iota_system::validator_wrapper::ValidatorWrapper;
+    use iota_system::validator::ValidatorV1;
+    use iota_system::validator_wrapper::Validator;
 
     const SYSTEM_STATE_VERSION_V1: u64 = 18446744073709551605;  // u64::MAX - 10
 
-    public struct SystemParameters has store {
+    public struct SystemEpochInfoEventV1 has copy, drop {
+        epoch: u64,
+        protocol_version: u64,
+        reference_gas_price: u64,
+        total_stake: u64,
+        storage_charge: u64,
+        storage_rebate: u64,
+        storage_fund_balance: u64,
+        total_gas_fees: u64,
+        total_stake_rewards_distributed: u64,
+        burnt_tokens_amount: u64,
+        minted_tokens_amount: u64,
+    }
+
+    public struct SystemParametersV1 has store {
         epoch_duration_ms: u64,
         extra_fields: Bag,
     }
 
-    public struct ValidatorSet has store {
-        active_validators: vector<Validator>,
-        inactive_validators: Table<ID, ValidatorWrapper>,
+    public struct ValidatorSetV1 has store {
+        active_validators: vector<ValidatorV1>,
+        inactive_validators: Table<ID, Validator>,
         extra_fields: Bag,
     }
 
-    public struct IotaSystemStateInner has store {
+    public struct IotaSystemStateV1 has store {
         epoch: u64,
         protocol_version: u64,
         system_state_version: u64,
-        validators: ValidatorSet,
+        iota_treasury_cap: IotaTreasuryCap,
+        validators: ValidatorSetV1,
         storage_fund: Balance<IOTA>,
-        parameters: SystemParameters,
+        parameters: SystemParametersV1,
         reference_gas_price: u64,
         safe_mode: bool,
         epoch_start_timestamp_ms: u64,
@@ -40,24 +55,26 @@ module iota_system::iota_system_state_inner {
     }
 
     public(package) fun create(
-        validators: vector<Validator>,
+        iota_treasury_cap: IotaTreasuryCap,
+        validators: vector<ValidatorV1>,
         storage_fund: Balance<IOTA>,
         protocol_version: u64,
         epoch_start_timestamp_ms: u64,
         epoch_duration_ms: u64,
         ctx: &mut TxContext,
-    ): IotaSystemStateInner {
-        let system_state = IotaSystemStateInner {
+    ): IotaSystemStateV1 {
+        let system_state = IotaSystemStateV1 {
             epoch: 0,
             protocol_version,
             system_state_version: genesis_system_state_version(),
-            validators: ValidatorSet {
+            iota_treasury_cap,
+            validators: ValidatorSetV1 {
                 active_validators: validators,
                 inactive_validators: table::new(ctx),
                 extra_fields: bag::new(ctx),
             },
             storage_fund,
-            parameters: SystemParameters {
+            parameters: SystemParametersV1 {
                 epoch_duration_ms,
                 extra_fields: bag::new(ctx),
             },
@@ -70,14 +87,38 @@ module iota_system::iota_system_state_inner {
     }
 
     public(package) fun advance_epoch(
-        self: &mut IotaSystemStateInner,
-        storage_charge: Balance<IOTA>,
-        computation_reward: Balance<IOTA>,
-        storage_rebate_amount: u64,
+        self: &mut IotaSystemStateV1,
+        _validator_target_reward: u64,
+        mut storage_charge: Balance<IOTA>,
+        mut computation_reward: Balance<IOTA>,
+        mut storage_rebate_amount: u64,
+        mut _non_refundable_storage_fee_amount: u64,
+        _reward_slashing_rate: u64,
+        _ctx: &mut TxContext,
     ) : Balance<IOTA> {
+        let storage_charge_value = storage_charge.value();
+        let total_gas_fees = computation_reward.value();
+
         balance::join(&mut self.storage_fund, computation_reward);
         balance::join(&mut self.storage_fund, storage_charge);
         let storage_rebate = balance::split(&mut self.storage_fund, storage_rebate_amount);
+
+        event::emit(
+            SystemEpochInfoEventV1 {
+                epoch: self.epoch,
+                protocol_version: self.protocol_version,
+                reference_gas_price: self.reference_gas_price,
+                total_stake: 0,
+                storage_charge: storage_charge_value,
+                storage_rebate: storage_rebate_amount,
+                storage_fund_balance: self.storage_fund.value(),
+                total_gas_fees,
+                total_stake_rewards_distributed: 0,
+                burnt_tokens_amount: 0,
+                minted_tokens_amount: 0,
+            }
+        );
+
         storage_rebate
     }
 
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/validator.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/validator.move
index 923cc9f3b27..01a61565bc7 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/validator.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/validator.move
@@ -5,13 +5,12 @@
 module iota_system::validator {
     use std::ascii;
 
-    use iota::tx_context::TxContext;
     use std::string::{Self, String};
     use iota::bag::{Self, Bag};
     use iota::balance::{Self, Balance};
     use iota::iota::IOTA;
 
-    public struct ValidatorMetadata has store {
+    public struct ValidatorMetadataV1 has store {
         iota_address: address,
         authority_pubkey_bytes: vector<u8>,
         network_pubkey_bytes: vector<u8>,
@@ -22,8 +21,8 @@ module iota_system::validator {
         extra_fields: Bag,
     }
 
-    public struct Validator has store {
-        metadata: ValidatorMetadata,
+    public struct ValidatorV1 has store {
+        metadata: ValidatorMetadataV1,
         voting_power: u64,
         stake: Balance<IOTA>,
         extra_fields: Bag,
@@ -39,8 +38,8 @@ module iota_system::validator {
         primary_address: vector<u8>,
         init_stake: Balance<IOTA>,
         ctx: &mut TxContext
-    ): Validator {
-        let metadata = ValidatorMetadata {
+    ): ValidatorV1 {
+        let metadata = ValidatorMetadataV1 {
             iota_address,
             authority_pubkey_bytes,
             network_pubkey_bytes,
@@ -51,7 +50,7 @@ module iota_system::validator {
             extra_fields: bag::new(ctx),
         };
 
-        Validator {
+        ValidatorV1 {
             metadata,
             voting_power: balance::value(&init_stake),
             stake: init_stake,
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/validator_wrapper.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/validator_wrapper.move
index 7729b3d4e77..1593f71ef46 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/validator_wrapper.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/safe_mode/sources/validator_wrapper.move
@@ -5,7 +5,7 @@
 module iota_system::validator_wrapper {
     use iota::versioned::Versioned;
 
-    public struct ValidatorWrapper has store {
+    public struct Validator has store {
         inner: Versioned
     }
 }
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/genesis.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/genesis.move
index e6bff0442aa..f4d69976b8b 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/genesis.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/genesis.move
@@ -3,12 +3,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 module iota_system::genesis {
-    use std::vector;
-    use iota::balance::{Self, Balance};
-    use iota::object::UID;
-    use iota::iota::IOTA;
-    use iota::tx_context::{Self, TxContext};
-    use std::option::Option;
+    use std::string::String;
+
+    use iota::balance;
+    use iota::iota::IotaTreasuryCap;
+    use iota::timelock::SystemTimelockCap;
 
     use iota_system::iota_system;
     use iota_system::validator;
@@ -55,15 +54,20 @@ module iota_system::genesis {
     public struct TokenAllocation has drop {
         recipient_address: address,
         amount_nanos: u64,
+
         staked_with_validator: Option<address>,
+        staked_with_timelock_expiration: Option<u64>,
     }
 
+    #[allow(unused_function)]
     fun create(
         iota_system_state_id: UID,
-        mut iota_supply: Balance<IOTA>,
+        mut iota_treasury_cap: IotaTreasuryCap,
         genesis_chain_parameters: GenesisChainParameters,
         genesis_validators: vector<GenesisValidatorMetadata>,
         _token_distribution_schedule: TokenDistributionSchedule,
+        _timelock_genesis_label: Option<String>,
+        system_timelock_cap: SystemTimelockCap,
         ctx: &mut TxContext,
     ) {
         assert!(tx_context::epoch(ctx) == 0, 0);
@@ -97,7 +101,7 @@ module iota_system::genesis {
                 network_address,
                 p2p_address,
                 primary_address,
-                balance::split(&mut iota_supply, 2500),
+                iota_treasury_cap.mint_balance(2500, ctx),
                 ctx
             );
 
@@ -108,11 +112,13 @@ module iota_system::genesis {
 
         iota_system::create(
             iota_system_state_id,
+            iota_treasury_cap,
             validators,
-            iota_supply, // storage_fund
+            balance::zero(),
             genesis_chain_parameters.protocol_version,
             genesis_chain_parameters.chain_start_timestamp_ms,
             genesis_chain_parameters.epoch_duration_ms,
+            system_timelock_cap,
             ctx,
         );
     }
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/iota_system.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/iota_system.move
index d0339bb3b95..549ba9c21a3 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/iota_system.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/iota_system.move
@@ -3,17 +3,16 @@
 // SPDX-License-Identifier: Apache-2.0
 
 module iota_system::iota_system {
-    use std::vector;
-
     use iota::balance::Balance;
-    use iota::object::UID;
-    use iota::iota::IOTA;
-    use iota::transfer;
-    use iota::tx_context::{Self, TxContext};
     use iota::dynamic_field;
+    use iota::iota::IOTA;
+    use iota::iota::IotaTreasuryCap;
+    use iota::timelock::SystemTimelockCap;
 
-    use iota_system::validator::Validator;
-    use iota_system::iota_system_state_inner::{Self, IotaSystemStateInner, IotaSystemStateInnerV2};
+    use iota_system::validator::ValidatorV1;
+    use iota_system::iota_system_state_inner::{Self, IotaSystemStateV1, IotaSystemStateV2};
+
+    const SYSTEM_TIMELOCK_CAP_DF_KEY: vector<u8> = b"sys_timelock_cap";
 
     public struct IotaSystemState has key {
         id: UID,
@@ -22,14 +21,17 @@ module iota_system::iota_system {
 
     public(package) fun create(
         id: UID,
-        validators: vector<Validator>,
+        iota_treasury_cap: IotaTreasuryCap,
+        validators: vector<ValidatorV1>,
         storage_fund: Balance<IOTA>,
         protocol_version: u64,
         epoch_start_timestamp_ms: u64,
         epoch_duration_ms: u64,
+        system_timelock_cap: SystemTimelockCap,
         ctx: &mut TxContext,
     ) {
         let system_state = iota_system_state_inner::create(
+            iota_treasury_cap,
             validators,
             storage_fund,
             protocol_version,
@@ -43,21 +45,22 @@ module iota_system::iota_system {
             version,
         };
         dynamic_field::add(&mut self.id, version, system_state);
+        dynamic_field::add(&mut self.id, SYSTEM_TIMELOCK_CAP_DF_KEY, system_timelock_cap);
         transfer::share_object(self);
     }
 
+    #[allow(unused_function)]
     fun advance_epoch(
+        validator_target_reward: u64,
         storage_charge: Balance<IOTA>,
         computation_reward: Balance<IOTA>,
         wrapper: &mut IotaSystemState,
         new_epoch: u64,
         next_protocol_version: u64,
         storage_rebate: u64,
-        _non_refundable_storage_fee: u64,
-        _storage_fund_reinvest_rate: u64, // share of storage fund's rewards that's reinvested
-                                         // into storage fund, in basis point.
-        _reward_slashing_rate: u64, // how much rewards are slashed to punish a validator, in bps.
-        epoch_start_timestamp_ms: u64, // Timestamp of the epoch start
+        non_refundable_storage_fee: u64,
+        reward_slashing_rate: u64,
+        epoch_start_timestamp_ms: u64,
         ctx: &mut TxContext,
     ) : Balance<IOTA> {
         let self = load_system_state_mut(wrapper);
@@ -66,34 +69,38 @@ module iota_system::iota_system {
             self,
             new_epoch,
             next_protocol_version,
+            validator_target_reward,
             storage_charge,
             computation_reward,
             storage_rebate,
+            non_refundable_storage_fee,
+            reward_slashing_rate,
             epoch_start_timestamp_ms,
+            ctx
         );
 
         storage_rebate
     }
 
-    public fun active_validator_addresses(wrapper: &mut IotaSystemState): vector<address> {
+    public fun active_validator_addresses(_wrapper: &mut IotaSystemState): vector<address> {
         vector::empty()
     }
 
-    fun load_system_state_mut(self: &mut IotaSystemState): &mut IotaSystemStateInnerV2 {
+    fun load_system_state_mut(self: &mut IotaSystemState): &mut IotaSystemStateV2 {
         load_inner_maybe_upgrade(self)
     }
 
-    fun load_inner_maybe_upgrade(self: &mut IotaSystemState): &mut IotaSystemStateInnerV2 {
+    fun load_inner_maybe_upgrade(self: &mut IotaSystemState): &mut IotaSystemStateV2 {
         let mut version = self.version;
         if (version == iota_system_state_inner::genesis_system_state_version()) {
-            let inner: IotaSystemStateInner = dynamic_field::remove(&mut self.id, version);
+            let inner: IotaSystemStateV1 = dynamic_field::remove(&mut self.id, version);
             let new_inner = iota_system_state_inner::v1_to_v2(inner);
             version = iota_system_state_inner::system_state_version(&new_inner);
             dynamic_field::add(&mut self.id, version, new_inner);
             self.version = version;
         };
 
-        let inner: &mut IotaSystemStateInnerV2 = dynamic_field::borrow_mut(&mut self.id, version);
+        let inner: &mut IotaSystemStateV2 = dynamic_field::borrow_mut(&mut self.id, version);
         assert!(iota_system_state_inner::system_state_version(inner) == version, 0);
         inner
     }
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/iota_system_state_inner.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/iota_system_state_inner.move
index 5b957ebfd10..18c0632784c 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/iota_system_state_inner.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/iota_system_state_inner.move
@@ -3,51 +3,67 @@
 // SPDX-License-Identifier: Apache-2.0
 
 module iota_system::iota_system_state_inner {
+    use iota::bag::{Self, Bag};
     use iota::balance::{Self, Balance};
+    use iota::event;
     use iota::iota::IOTA;
-    use iota::tx_context::TxContext;
-    use iota::bag::{Self, Bag};
+    use iota::iota::IotaTreasuryCap;
     use iota::table::{Self, Table};
-    use iota::object::ID;
 
-    use iota_system::validator::Validator;
-    use iota_system::validator_wrapper::ValidatorWrapper;
+    use iota_system::validator::ValidatorV1;
+    use iota_system::validator_wrapper::Validator;
 
     const SYSTEM_STATE_VERSION_V1: u64 = 18446744073709551605;  // u64::MAX - 10
     const SYSTEM_STATE_VERSION_V2: u64 = 18446744073709551606;  // u64::MAX - 9
 
-    public struct SystemParameters has store {
+    public struct SystemEpochInfoEventV1 has copy, drop {
+        epoch: u64,
+        protocol_version: u64,
+        reference_gas_price: u64,
+        total_stake: u64,
+        storage_charge: u64,
+        storage_rebate: u64,
+        storage_fund_balance: u64,
+        total_gas_fees: u64,
+        total_stake_rewards_distributed: u64,
+        burnt_tokens_amount: u64,
+        minted_tokens_amount: u64,
+    }
+
+    public struct SystemParametersV1 has store {
         epoch_duration_ms: u64,
         extra_fields: Bag,
     }
 
-    public struct ValidatorSet has store {
-        active_validators: vector<Validator>,
-        inactive_validators: Table<ID, ValidatorWrapper>,
+    public struct ValidatorSetV1 has store {
+        active_validators: vector<ValidatorV1>,
+        inactive_validators: Table<ID, Validator>,
         extra_fields: Bag,
     }
 
-    public struct IotaSystemStateInner has store {
+    public struct IotaSystemStateV1 has store {
         epoch: u64,
         protocol_version: u64,
         system_state_version: u64,
-        validators: ValidatorSet,
+        iota_treasury_cap: IotaTreasuryCap,
+        validators: ValidatorSetV1,
         storage_fund: Balance<IOTA>,
-        parameters: SystemParameters,
+        parameters: SystemParametersV1,
         reference_gas_price: u64,
         safe_mode: bool,
         epoch_start_timestamp_ms: u64,
         extra_fields: Bag,
     }
 
-    public struct IotaSystemStateInnerV2 has store {
+    public struct IotaSystemStateV2 has store {
         new_dummy_field: u64,
         epoch: u64,
         protocol_version: u64,
         system_state_version: u64,
-        validators: ValidatorSet,
+        iota_treasury_cap: IotaTreasuryCap,
+        validators: ValidatorSetV1,
         storage_fund: Balance<IOTA>,
-        parameters: SystemParameters,
+        parameters: SystemParametersV1,
         reference_gas_price: u64,
         safe_mode: bool,
         epoch_start_timestamp_ms: u64,
@@ -55,21 +71,23 @@ module iota_system::iota_system_state_inner {
     }
 
     public(package) fun create(
-        validators: vector<Validator>,
+        iota_treasury_cap: IotaTreasuryCap,
+        validators: vector<ValidatorV1>,
         storage_fund: Balance<IOTA>,
         protocol_version: u64,
         epoch_start_timestamp_ms: u64,
         epoch_duration_ms: u64,
         ctx: &mut TxContext,
-    ): IotaSystemStateInner {
+    ): IotaSystemStateV1 {
         let validators = new_validator_set(validators, ctx);
-        let system_state = IotaSystemStateInner {
+        let system_state = IotaSystemStateV1 {
             epoch: 0,
             protocol_version,
             system_state_version: genesis_system_state_version(),
+            iota_treasury_cap,
             validators,
             storage_fund,
-            parameters: SystemParameters {
+            parameters: SystemParametersV1 {
                 epoch_duration_ms,
                 extra_fields: bag::new(ctx),
             },
@@ -82,13 +100,17 @@ module iota_system::iota_system_state_inner {
     }
 
     public(package) fun advance_epoch(
-        self: &mut IotaSystemStateInnerV2,
+        self: &mut IotaSystemStateV2,
         new_epoch: u64,
         next_protocol_version: u64,
-        storage_charge: Balance<IOTA>,
-        computation_reward: Balance<IOTA>,
-        storage_rebate_amount: u64,
+        _validator_target_reward: u64,
+        mut storage_charge: Balance<IOTA>,
+        mut computation_reward: Balance<IOTA>,
+        mut storage_rebate_amount: u64,
+        mut _non_refundable_storage_fee_amount: u64,
+        _reward_slashing_rate: u64,
         epoch_start_timestamp_ms: u64,
+        _ctx: &mut TxContext,
     ) : Balance<IOTA> {
         self.epoch_start_timestamp_ms = epoch_start_timestamp_ms;
         self.epoch = self.epoch + 1;
@@ -96,31 +118,52 @@ module iota_system::iota_system_state_inner {
         self.safe_mode = false;
         self.protocol_version = next_protocol_version;
 
+        let storage_charge_value = storage_charge.value();
+        let total_gas_fees = computation_reward.value();
+
         balance::join(&mut self.storage_fund, computation_reward);
         balance::join(&mut self.storage_fund, storage_charge);
         let storage_rebate = balance::split(&mut self.storage_fund, storage_rebate_amount);
+
+        event::emit(
+            SystemEpochInfoEventV1 {
+                epoch: self.epoch,
+                protocol_version: self.protocol_version,
+                reference_gas_price: self.reference_gas_price,
+                total_stake: 0,
+                storage_charge: storage_charge_value,
+                storage_rebate: storage_rebate_amount,
+                storage_fund_balance: self.storage_fund.value(),
+                total_gas_fees,
+                total_stake_rewards_distributed: 0,
+                burnt_tokens_amount: 0,
+                minted_tokens_amount: 0,
+            }
+        );
+
         storage_rebate
     }
 
-    public(package) fun protocol_version(self: &IotaSystemStateInnerV2): u64 { self.protocol_version }
-    public(package) fun system_state_version(self: &IotaSystemStateInnerV2): u64 { self.system_state_version }
+    public(package) fun protocol_version(self: &IotaSystemStateV2): u64 { self.protocol_version }
+    public(package) fun system_state_version(self: &IotaSystemStateV2): u64 { self.system_state_version }
     public(package) fun genesis_system_state_version(): u64 {
         SYSTEM_STATE_VERSION_V1
     }
 
-    fun new_validator_set(init_active_validators: vector<Validator>, ctx: &mut TxContext): ValidatorSet {
-        ValidatorSet {
+    fun new_validator_set(init_active_validators: vector<ValidatorV1>, ctx: &mut TxContext): ValidatorSetV1 {
+        ValidatorSetV1 {
             active_validators: init_active_validators,
             inactive_validators: table::new(ctx),
             extra_fields: bag::new(ctx),
         }
     }
 
-    public(package) fun v1_to_v2(v1: IotaSystemStateInner): IotaSystemStateInnerV2 {
-        let IotaSystemStateInner {
+    public(package) fun v1_to_v2(v1: IotaSystemStateV1): IotaSystemStateV2 {
+        let IotaSystemStateV1 {
             epoch,
             protocol_version,
             system_state_version: old_system_state_version,
+            iota_treasury_cap,
             validators,
             storage_fund,
             parameters,
@@ -130,11 +173,12 @@ module iota_system::iota_system_state_inner {
             extra_fields,
         } = v1;
         assert!(old_system_state_version == SYSTEM_STATE_VERSION_V1, 0);
-        IotaSystemStateInnerV2 {
+        IotaSystemStateV2 {
             new_dummy_field: 100,
             epoch,
             protocol_version,
             system_state_version: SYSTEM_STATE_VERSION_V2,
+            iota_treasury_cap,
             validators,
             storage_fund,
             parameters,
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/validator.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/validator.move
index 923cc9f3b27..01a61565bc7 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/validator.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/validator.move
@@ -5,13 +5,12 @@
 module iota_system::validator {
     use std::ascii;
 
-    use iota::tx_context::TxContext;
     use std::string::{Self, String};
     use iota::bag::{Self, Bag};
     use iota::balance::{Self, Balance};
     use iota::iota::IOTA;
 
-    public struct ValidatorMetadata has store {
+    public struct ValidatorMetadataV1 has store {
         iota_address: address,
         authority_pubkey_bytes: vector<u8>,
         network_pubkey_bytes: vector<u8>,
@@ -22,8 +21,8 @@ module iota_system::validator {
         extra_fields: Bag,
     }
 
-    public struct Validator has store {
-        metadata: ValidatorMetadata,
+    public struct ValidatorV1 has store {
+        metadata: ValidatorMetadataV1,
         voting_power: u64,
         stake: Balance<IOTA>,
         extra_fields: Bag,
@@ -39,8 +38,8 @@ module iota_system::validator {
         primary_address: vector<u8>,
         init_stake: Balance<IOTA>,
         ctx: &mut TxContext
-    ): Validator {
-        let metadata = ValidatorMetadata {
+    ): ValidatorV1 {
+        let metadata = ValidatorMetadataV1 {
             iota_address,
             authority_pubkey_bytes,
             network_pubkey_bytes,
@@ -51,7 +50,7 @@ module iota_system::validator {
             extra_fields: bag::new(ctx),
         };
 
-        Validator {
+        ValidatorV1 {
             metadata,
             voting_power: balance::value(&init_stake),
             stake: init_stake,
diff --git a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/validator_wrapper.move b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/validator_wrapper.move
index 10e2b527c62..5a673effe7d 100644
--- a/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/validator_wrapper.move
+++ b/crates/iota-e2e-tests/tests/framework_upgrades/mock_iota_systems/shallow_upgrade/sources/validator_wrapper.move
@@ -3,45 +3,43 @@
 // SPDX-License-Identifier: Apache-2.0
 
 module iota_system::validator_wrapper {
-    use iota::versioned::Versioned;
-    use iota::versioned;
-    use iota::tx_context::TxContext;
-    use iota_system::validator::Validator;
+    use iota::versioned::{Self, Versioned};
+    use iota_system::validator::ValidatorV1;
 
     const EInvalidVersion: u64 = 0;
 
-    public struct ValidatorWrapper has store {
+    public struct Validator has store {
         inner: Versioned
     }
 
     // Validator corresponds to version 1.
-    public(package) fun create_v1(validator: Validator, ctx: &mut TxContext): ValidatorWrapper {
-        ValidatorWrapper {
+    public(package) fun create_v1(validator: ValidatorV1, ctx: &mut TxContext): Validator {
+        Validator {
             inner: versioned::create(1, validator, ctx)
         }
     }
 
     /// This function should always return the latest supported version.
     /// If the inner version is old, we upgrade it lazily in-place.
-    public(package) fun load_validator_maybe_upgrade(self: &mut ValidatorWrapper): &mut Validator {
+    public(package) fun load_validator_maybe_upgrade(self: &mut Validator): &mut ValidatorV1 {
         upgrade_to_latest(self);
-        versioned::load_value_mut<Validator>(&mut self.inner)
+        versioned::load_value_mut<ValidatorV1>(&mut self.inner)
     }
 
     /// Destroy the wrapper and retrieve the inner validator object.
-    public(package) fun destroy(mut self: ValidatorWrapper): Validator {
-        upgrade_to_latest(&mut self);
-        let ValidatorWrapper { inner } = self;
+    public(package) fun destroy(self: Validator): ValidatorV1 {
+        upgrade_to_latest(&self);
+        let Validator { inner } = self;
         versioned::destroy(inner)
     }
 
-    fun upgrade_to_latest(self: &mut ValidatorWrapper) {
+    fun upgrade_to_latest(self: &Validator) {
         let version = version(self);
         // TODO: When new versions are added, we need to explicitly upgrade here.
         assert!(version == 1, EInvalidVersion);
     }
 
-    fun version(self: &ValidatorWrapper): u64 {
+    fun version(self: &Validator): u64 {
         versioned::version(&self.inner)
     }
 }
diff --git a/crates/iota-e2e-tests/tests/full_node_tests.rs b/crates/iota-e2e-tests/tests/full_node_tests.rs
index 899f314b5ad..a705d3b346b 100644
--- a/crates/iota-e2e-tests/tests/full_node_tests.rs
+++ b/crates/iota-e2e-tests/tests/full_node_tests.rs
@@ -271,32 +271,7 @@ async fn test_full_node_indexes() -> Result<(), anyhow::Error> {
     let node = &test_cluster.fullnode_handle.iota_node;
     let context = &mut test_cluster.wallet;
 
-    let (transferred_object, sender, receiver, digest, _) = transfer_coin(context).await?;
-
-    let txes = node
-        .state()
-        .get_transactions_for_tests(
-            Some(TransactionFilter::InputObject(transferred_object)),
-            None,
-            None,
-            false,
-        )
-        .await?;
-
-    assert_eq!(txes.len(), 1);
-    assert_eq!(txes[0], digest);
-
-    let txes = node
-        .state()
-        .get_transactions_for_tests(
-            Some(TransactionFilter::ChangedObject(transferred_object)),
-            None,
-            None,
-            false,
-        )
-        .await?;
-    assert_eq!(txes.len(), 2);
-    assert_eq!(txes[1], digest);
+    let (_, sender, receiver, digest, _) = transfer_coin(context).await?;
 
     let txes = node
         .state()
@@ -641,14 +616,14 @@ async fn test_full_node_event_read_api_ok() {
     let node = &test_cluster.fullnode_handle.iota_node;
     let jsonrpc_client = &test_cluster.fullnode_handle.rpc_client;
 
-    let (package_id, gas_id_1, _) = publish_nfts_package(context).await;
+    let (package_id, _, publish_digest) = publish_nfts_package(context).await;
 
-    let (transferred_object, _, _, digest, _) = transfer_coin(context).await.unwrap();
+    let (_, sender, _, transfer_digest, _) = transfer_coin(context).await.unwrap();
 
     let txes = node
         .state()
         .get_transactions_for_tests(
-            Some(TransactionFilter::InputObject(transferred_object)),
+            Some(TransactionFilter::FromAddress(sender)),
             None,
             None,
             false,
@@ -656,13 +631,11 @@ async fn test_full_node_event_read_api_ok() {
         .await
         .unwrap();
 
-    if gas_id_1 == transferred_object {
-        assert_eq!(txes.len(), 2);
-        assert!(txes[0] == digest || txes[1] == digest);
-    } else {
-        assert_eq!(txes.len(), 1);
-        assert_eq!(txes[0], digest);
-    }
+    assert_eq!(txes.len(), 2);
+    assert!(
+        (txes[0] == publish_digest && txes[1] == transfer_digest)
+            || (txes[0] == transfer_digest && txes[1] == publish_digest)
+    );
 
     // This is a poor substitute for the post processing taking some time
     sleep(Duration::from_millis(1000)).await;
diff --git a/crates/iota-e2e-tests/tests/protocol_version_tests.rs b/crates/iota-e2e-tests/tests/protocol_version_tests.rs
index 2deda364079..55705a25d67 100644
--- a/crates/iota-e2e-tests/tests/protocol_version_tests.rs
+++ b/crates/iota-e2e-tests/tests/protocol_version_tests.rs
@@ -895,7 +895,7 @@ mod sim_only_tests {
             system_state.system_state_version(),
             IOTA_SYSTEM_STATE_SIM_TEST_SHALLOW_V1
         );
-        assert!(matches!(system_state, IotaSystemState::SimTestShallowV2(_)));
+        assert!(matches!(system_state, IotaSystemState::SimTestShallowV1(_)));
     }
 
     #[sim_test]
@@ -948,7 +948,7 @@ mod sim_only_tests {
             system_state.system_state_version(),
             IOTA_SYSTEM_STATE_SIM_TEST_DEEP_V1
         );
-        if let IotaSystemState::SimTestDeepV2(inner) = system_state {
+        if let IotaSystemState::SimTestDeepV1(inner) = system_state {
             // Make sure we have 1 inactive validator for latter testing.
             assert_eq!(inner.validators.inactive_validators.size, 1);
             get_validator_from_table(
@@ -963,7 +963,7 @@ mod sim_only_tests {
             )
             .unwrap();
         } else {
-            panic!("Expecting SimTestDeepV2 type");
+            panic!("Expecting SimTestDeepV1 type");
         }
     }
 
diff --git a/crates/iota-e2e-tests/tests/reconfiguration_tests.rs b/crates/iota-e2e-tests/tests/reconfiguration_tests.rs
index 00892c12652..0c905ba0d0d 100644
--- a/crates/iota-e2e-tests/tests/reconfiguration_tests.rs
+++ b/crates/iota-e2e-tests/tests/reconfiguration_tests.rs
@@ -27,6 +27,7 @@ use iota_types::{
         iota_system_state_summary::get_validator_by_pool_id,
     },
     message_envelope::Message,
+    messages_grpc::HandleCertificateRequestV1,
     transaction::{TransactionDataAPI, TransactionExpiration, VerifiedTransaction},
 };
 use rand::rngs::OsRng;
@@ -182,7 +183,10 @@ async fn reconfig_with_revert_end_to_end_test() {
         .get_client(&authorities[reverting_authority_idx].with(|node| node.state().name))
         .unwrap();
     client
-        .handle_certificate_v2(cert.clone(), None)
+        .handle_certificate_v1(
+            HandleCertificateRequestV1::new(cert.clone()).with_events(),
+            None,
+        )
         .await
         .unwrap();
 
@@ -752,6 +756,10 @@ async fn test_epoch_flag_upgrade() {
     use iota_macros::register_fail_point_arg;
 
     let initial_flags_nodes = Arc::new(Mutex::new(HashSet::new()));
+    // Register a fail_point_arg, for which the handler is also placed in the
+    // authority_store's open() function. When we start the first epoch, the
+    // following code will inject the new flags to the selected nodes once, so
+    // that we can later assert that the flags have changed.
     register_fail_point_arg("initial_epoch_flags", move || {
         // only alter flags on each node once
         let current_node = iota_simulator::current_simnode_id();
@@ -761,43 +769,44 @@ async fn test_epoch_flag_upgrade() {
         if initial_flags_nodes.len() >= 2 || !initial_flags_nodes.insert(current_node) {
             return None;
         }
-
-        // start with no flags set
-        Some(Vec::<EpochFlag>::new())
+        // Apply a modified flag set for the first epoch after cluster is started.
+        Some(vec![EpochFlag::WritebackCacheEnabled])
     });
 
+    // Start the cluster with 2 nodes with non-empty FlagSet and the rest with
+    // empty.
     let test_cluster = TestClusterBuilder::new()
         .with_epoch_duration_ms(30000)
         .build()
         .await;
+    let any_not_empty = test_cluster.all_node_handles().iter().any(|node| {
+        node.with(|node| {
+            !node
+                .state()
+                .epoch_store_for_testing()
+                .epoch_start_config()
+                .flags()
+                .is_empty()
+        })
+    });
+    assert!(any_not_empty);
 
-    let mut any_empty = false;
-    for node in test_cluster.all_node_handles() {
-        any_empty = any_empty
-            || node.with(|node| {
-                node.state()
-                    .epoch_store_for_testing()
-                    .epoch_start_config()
-                    .flags()
-                    .is_empty()
-            });
-    }
-    assert!(any_empty);
+    // When the epoch changes, flags on some nodes should be re-initialized to be
+    // empty.
 
     test_cluster.wait_for_epoch_all_nodes(1).await;
 
-    let mut any_empty = false;
-    for node in test_cluster.all_node_handles() {
-        any_empty = any_empty
-            || node.with(|node| {
-                node.state()
-                    .epoch_store_for_testing()
-                    .epoch_start_config()
-                    .flags()
-                    .is_empty()
-            });
-    }
-    assert!(!any_empty);
+    // Make sure that all nodes have empty flags.
+    let all_empty = test_cluster.all_node_handles().iter().all(|node| {
+        node.with(|node| {
+            node.state()
+                .epoch_store_for_testing()
+                .epoch_start_config()
+                .flags()
+                .is_empty()
+        })
+    });
+    assert!(all_empty);
 
     sleep(Duration::from_secs(15)).await;
 
@@ -834,12 +843,11 @@ async fn safe_mode_reconfig_test() {
     assert_eq!(system_state.system_state_version, 1);
     assert_eq!(system_state.epoch, 0);
 
-    // Wait for regular epoch change to happen once. Migration from V1 to V2 should
-    // happen here.
+    // Wait for regular epoch change to happen once.
     let system_state = test_cluster.wait_for_epoch(Some(1)).await;
     assert!(!system_state.safe_mode());
     assert_eq!(system_state.epoch(), 1);
-    assert_eq!(system_state.system_state_version(), 2);
+    assert_eq!(system_state.system_state_version(), 1);
 
     let prev_epoch_start_timestamp = system_state.epoch_start_timestamp_ms();
 
@@ -868,7 +876,7 @@ async fn safe_mode_reconfig_test() {
     let system_state = test_cluster.wait_for_epoch(Some(3)).await;
     assert!(!system_state.safe_mode());
     assert_eq!(system_state.epoch(), 3);
-    assert_eq!(system_state.system_state_version(), 2);
+    assert_eq!(system_state.system_state_version(), 1);
 }
 
 async fn add_validator_candidate(
diff --git a/crates/iota-e2e-tests/tests/shared_objects_tests.rs b/crates/iota-e2e-tests/tests/shared_objects_tests.rs
index a8467fb0c58..8371addc2b1 100644
--- a/crates/iota-e2e-tests/tests/shared_objects_tests.rs
+++ b/crates/iota-e2e-tests/tests/shared_objects_tests.rs
@@ -628,7 +628,7 @@ async fn shared_object_sync() {
     assert!(effects.status().is_ok());
 
     // Submit transactions to the out-of-date authority.
-    // It will succeed because we share owned object certificates through narwhal
+    // It will succeed because we share owned object certificates through consensus
     let (effects, _) = test_cluster
         .submit_transaction_to_validators(increment_counter_transaction, &validators[0..1])
         .await
diff --git a/crates/iota-e2e-tests/tests/traffic_control_tests.rs b/crates/iota-e2e-tests/tests/traffic_control_tests.rs
index 93104798017..285ee7e49e6 100644
--- a/crates/iota-e2e-tests/tests/traffic_control_tests.rs
+++ b/crates/iota-e2e-tests/tests/traffic_control_tests.rs
@@ -79,7 +79,7 @@ async fn test_validator_traffic_control_ok() -> Result<(), anyhow::Error> {
         connection_blocklist_ttl_sec: 1,
         proxy_blocklist_ttl_sec: 5,
         // In this test, the validator gRPC API is receiving some requests that don't count towards
-        // the policy and two requests that do (/iota.validator.Validator/CertifiedTransactionV2 for
+        // the policy and two requests that do (/iota.validator.Validator/CertifiedTransactionV1 for
         // an already executed transaction). However, the counter is updated only after the response
         // is generated, but the limit is checked before we handle the request, so at the end we end
         // up with 2 handled requests even if the limit is set to 1 and only the subsequent request
diff --git a/crates/iota-enum-compat-util/Cargo.toml b/crates/iota-enum-compat-util/Cargo.toml
index 8668c700e71..de38fa5b4d0 100644
--- a/crates/iota-enum-compat-util/Cargo.toml
+++ b/crates/iota-enum-compat-util/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-enum-compat-util"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-faucet/src/faucet/mod.rs b/crates/iota-faucet/src/faucet/mod.rs
index 2174d9bf6f1..0461473841b 100644
--- a/crates/iota-faucet/src/faucet/mod.rs
+++ b/crates/iota-faucet/src/faucet/mod.rs
@@ -137,8 +137,8 @@ impl Default for FaucetConfig {
         Self {
             port: 5003,
             host_ip: Ipv4Addr::new(127, 0, 0, 1),
-            amount: 1_000_000_000,
-            num_coins: 1,
+            amount: DEFAULT_AMOUNT,
+            num_coins: DEFAULT_NUM_OF_COINS,
             request_buffer_size: 10,
             max_request_per_second: 10,
             wallet_client_timeout_secs: 60,
diff --git a/crates/iota-framework-tests/Cargo.toml b/crates/iota-framework-tests/Cargo.toml
index 17fa82809a8..8f97e952c9f 100644
--- a/crates/iota-framework-tests/Cargo.toml
+++ b/crates/iota-framework-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-framework-tests"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-framework/Cargo.toml b/crates/iota-framework/Cargo.toml
index 9657612ff55..08416551421 100644
--- a/crates/iota-framework/Cargo.toml
+++ b/crates/iota-framework/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-framework"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-genesis-builder/Cargo.toml b/crates/iota-genesis-builder/Cargo.toml
index 30b67e5cd94..a70eac62788 100644
--- a/crates/iota-genesis-builder/Cargo.toml
+++ b/crates/iota-genesis-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-genesis-builder"
-version = "0.0.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-genesis-common/Cargo.toml b/crates/iota-genesis-common/Cargo.toml
index 13f22b1e239..cf366831ee0 100644
--- a/crates/iota-genesis-common/Cargo.toml
+++ b/crates/iota-genesis-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-genesis-common"
-version = "0.0.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-graphql-e2e-tests/Cargo.toml b/crates/iota-graphql-e2e-tests/Cargo.toml
index a1be716fdff..de5796645cb 100644
--- a/crates/iota-graphql-e2e-tests/Cargo.toml
+++ b/crates/iota-graphql-e2e-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-graphql-e2e-tests"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp b/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp
index 40c2a903d2e..cd8110551b4 100644
--- a/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp
+++ b/crates/iota-graphql-e2e-tests/tests/available_range/available_range.exp
@@ -6,20 +6,20 @@ Response: {
   "data": {
     "availableRange": {
       "first": {
-        "digest": "AjVRPrUd6kKCamy6Fjgzj2Xo2yEGM6jVLDT6KLGqgb1H",
+        "digest": "DbuejNSgvHrPUDyucKV46j9kdT8f5VV78PWjLzV41yVw",
         "sequenceNumber": 0
       },
       "last": {
-        "digest": "AjVRPrUd6kKCamy6Fjgzj2Xo2yEGM6jVLDT6KLGqgb1H",
+        "digest": "DbuejNSgvHrPUDyucKV46j9kdT8f5VV78PWjLzV41yVw",
         "sequenceNumber": 0
       }
     },
     "first": {
-      "digest": "AjVRPrUd6kKCamy6Fjgzj2Xo2yEGM6jVLDT6KLGqgb1H",
+      "digest": "DbuejNSgvHrPUDyucKV46j9kdT8f5VV78PWjLzV41yVw",
       "sequenceNumber": 0
     },
     "last": {
-      "digest": "AjVRPrUd6kKCamy6Fjgzj2Xo2yEGM6jVLDT6KLGqgb1H",
+      "digest": "DbuejNSgvHrPUDyucKV46j9kdT8f5VV78PWjLzV41yVw",
       "sequenceNumber": 0
     }
   }
@@ -39,20 +39,20 @@ Response: {
   "data": {
     "availableRange": {
       "first": {
-        "digest": "AjVRPrUd6kKCamy6Fjgzj2Xo2yEGM6jVLDT6KLGqgb1H",
+        "digest": "DbuejNSgvHrPUDyucKV46j9kdT8f5VV78PWjLzV41yVw",
         "sequenceNumber": 0
       },
       "last": {
-        "digest": "FubeYRn3Re3g8nR9jbf955Jd6GjqpzxubbfGaSV3XC8C",
+        "digest": "3GN2xF2YRGs1wwh1BuaWexjsfYjqcRrxut4hCmKudWdq",
         "sequenceNumber": 2
       }
     },
     "first": {
-      "digest": "AjVRPrUd6kKCamy6Fjgzj2Xo2yEGM6jVLDT6KLGqgb1H",
+      "digest": "DbuejNSgvHrPUDyucKV46j9kdT8f5VV78PWjLzV41yVw",
       "sequenceNumber": 0
     },
     "last": {
-      "digest": "FubeYRn3Re3g8nR9jbf955Jd6GjqpzxubbfGaSV3XC8C",
+      "digest": "3GN2xF2YRGs1wwh1BuaWexjsfYjqcRrxut4hCmKudWdq",
       "sequenceNumber": 2
     }
   }
diff --git a/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp b/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp
index 5c9a41bfce7..21c50310dbf 100644
--- a/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp
+++ b/crates/iota-graphql-e2e-tests/tests/call/dynamic_fields.exp
@@ -55,12 +55,12 @@ Response: {
           {
             "name": {
               "type": {
-                "repr": "u64"
+                "repr": "bool"
               },
               "data": {
-                "Number": "0"
+                "Bool": false
               },
-              "bcs": "AAAAAAAAAAA="
+              "bcs": "AA=="
             },
             "value": {
               "__typename": "MoveValue"
@@ -69,12 +69,12 @@ Response: {
           {
             "name": {
               "type": {
-                "repr": "bool"
+                "repr": "u64"
               },
               "data": {
-                "Bool": false
+                "Number": "0"
               },
-              "bcs": "AA=="
+              "bcs": "AAAAAAAAAAA="
             },
             "value": {
               "__typename": "MoveValue"
@@ -135,12 +135,12 @@ Response: {
           {
             "name": {
               "type": {
-                "repr": "u64"
+                "repr": "bool"
               },
               "data": {
-                "Number": "0"
+                "Bool": false
               },
-              "bcs": "AAAAAAAAAAA="
+              "bcs": "AA=="
             },
             "value": {
               "__typename": "MoveValue"
@@ -149,12 +149,12 @@ Response: {
           {
             "name": {
               "type": {
-                "repr": "bool"
+                "repr": "u64"
               },
               "data": {
-                "Bool": false
+                "Number": "0"
               },
-              "bcs": "AA=="
+              "bcs": "AAAAAAAAAAA="
             },
             "value": {
               "__typename": "MoveValue"
@@ -208,17 +208,17 @@ Response: {
           {
             "name": {
               "type": {
-                "repr": "u64"
+                "repr": "bool"
               },
               "data": {
-                "Number": "0"
+                "Bool": false
               },
-              "bcs": "AAAAAAAAAAA="
+              "bcs": "AA=="
             },
             "value": {
-              "bcs": "AAAAAAAAAAA=",
+              "bcs": "AgAAAAAAAAA=",
               "data": {
-                "Number": "0"
+                "Number": "2"
               },
               "__typename": "MoveValue"
             }
@@ -226,17 +226,17 @@ Response: {
           {
             "name": {
               "type": {
-                "repr": "bool"
+                "repr": "u64"
               },
               "data": {
-                "Bool": false
+                "Number": "0"
               },
-              "bcs": "AA=="
+              "bcs": "AAAAAAAAAAA="
             },
             "value": {
-              "bcs": "AgAAAAAAAAA=",
+              "bcs": "AAAAAAAAAAA=",
               "data": {
-                "Number": "2"
+                "Number": "0"
               },
               "__typename": "MoveValue"
             }
diff --git a/crates/iota-graphql-e2e-tests/tests/call/simple.exp b/crates/iota-graphql-e2e-tests/tests/call/simple.exp
index 678ef0975b9..1f64469d77c 100644
--- a/crates/iota-graphql-e2e-tests/tests/call/simple.exp
+++ b/crates/iota-graphql-e2e-tests/tests/call/simple.exp
@@ -77,7 +77,7 @@ Epoch advanced: 5
 
 task 10, line 44:
 //# view-checkpoint
-CheckpointSummary { epoch: 5, seq: 10, content_digest: Eju9TRhUamcNqTaaEhENsRpfV6qpU6bttXAi5sfGKvh2,
+CheckpointSummary { epoch: 5, seq: 10, content_digest: 4ZuQEfEAd6oU7FYh83WHHE7DYdPeZVndW5q6ZMx45KLX,
             epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 0, storage_cost: 0, storage_rebate: 0, non_refundable_storage_fee: 0 }}
 
 task 11, lines 46-51:
@@ -114,11 +114,11 @@ task 15, lines 64-69:
 Headers: {
     "content-type": "application/json",
     "content-length": "157",
-    "x-iota-rpc-version": "2024.7.0-testing-no-sha",
+    "x-iota-rpc-version": "0.5.0-testing-no-sha",
     "vary": "origin, access-control-request-method, access-control-request-headers",
     "access-control-allow-origin": "*",
 }
-Service version: 2024.7.0-testing-no-sha
+Service version: 0.5.0-testing-no-sha
 Response: {
   "data": {
     "checkpoint": {
@@ -155,8 +155,8 @@ Response: {
         "edges": [
           {
             "node": {
-              "address": "0x7741a1a8bc15c0fdcebb352e4233d00647522bd6014df10a62fd2050146000e3",
-              "digest": "87Wr994JipCDohN1vezxW8Ws2a1oq7L1dT5EP4uvpgJe",
+              "address": "0x5a14fc3eeb9ef468b4bba415d7817c339b1f9ea7f3d59f3f48c3eefe31322856",
+              "digest": "44MBwuUjBiBgkR19RgE9AmznyHtwiW8CWKtvXWf4RwRd",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -182,8 +182,8 @@ Response: {
         "edges": [
           {
             "node": {
-              "address": "0x7741a1a8bc15c0fdcebb352e4233d00647522bd6014df10a62fd2050146000e3",
-              "digest": "87Wr994JipCDohN1vezxW8Ws2a1oq7L1dT5EP4uvpgJe",
+              "address": "0x5a14fc3eeb9ef468b4bba415d7817c339b1f9ea7f3d59f3f48c3eefe31322856",
+              "digest": "44MBwuUjBiBgkR19RgE9AmznyHtwiW8CWKtvXWf4RwRd",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -197,8 +197,8 @@ Response: {
         "edges": [
           {
             "node": {
-              "address": "0x18311564e7d246714fe61c222dcf06191a32be6987657415f567b246ba4b0190",
-              "digest": "8XZJNdvuUjjRUJJdEY2w4QuBRG8vtkVBYF9nTwbcL9pL",
+              "address": "0x26bf0f03edd09bb3f862e13cec014d17c26dd739d2563d9c704aa8d206301df2",
+              "digest": "4H2vETP8tgjQtjRPjrWQ8vaAh2vTzCnCaLrrS5AdsxYW",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -206,8 +206,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0x20d0758c2ad7be5bc2ff7723ed76529e3825c6c3162fb6d802d8886083c566e2",
-              "digest": "3sj6vJDpzZ69FaVVg9BT4MH7mX3DBubSJGHnsWxqtVqi",
+              "address": "0x3442446f02377d1025b211e51564e4f1c9a46845ccad733beeb06180d3f66c31",
+              "digest": "D8THNropCzbESMMWVCGG2cZUXgncpCXeavpPFtKZrbEh",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -215,8 +215,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0x26bf0f03edd09bb3f862e13cec014d17c26dd739d2563d9c704aa8d206301df2",
-              "digest": "J2Wf9FftEG2ngUz2D1PinpdyGuXdrrzaKTAexL7v8Ebz",
+              "address": "0x3c88cad5799a8da0467b8456a7429a97e7c141cfcf25f02faf51aa8cb4840461",
+              "digest": "D9pBCyFBxMdgt4vFo3hiikbxZtdxUHKSBx6hZC9cgjis",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -224,8 +224,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0x3442446f02377d1025b211e51564e4f1c9a46845ccad733beeb06180d3f66c31",
-              "digest": "4tRTWcKZPKebceeC9ixgfvtGnMg2p6o7oEoVqTHjKka2",
+              "address": "0x847c914d647e7387d7cea4db5ad8fefeffe66773635804a991dfd4385fab6a97",
+              "digest": "DUFZgANfmmUyusdii2XCjReFg3ykzwqBvfrDvpoVfHVR",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -233,8 +233,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0x3c88cad5799a8da0467b8456a7429a97e7c141cfcf25f02faf51aa8cb4840461",
-              "digest": "Dhh9gQqBrMPL5sSW1enjqfRZvTAY3bzBpbWvDSg7dbXG",
+              "address": "0xa0da8cea0e7a9e94a4b096c721ace35248af587e73adb78967a73dd8cb094565",
+              "digest": "BKx9UC6pSCazyJGJ35WKqEvZXZx3kajuNAnawW4rCNLP",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -242,8 +242,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0x7161ad34bf2e56d7a1952793661902460eeb2c2ecf1df755a1fc2a7bf4caa592",
-              "digest": "PRcvwJcwqneJazSXZ4QsBZ7CDYScEYKhvxX8mtoN7xQ",
+              "address": "0xa79cc544021a721176cdc4497728ec35a5311b8ff0aa293a5d29c0d32cb56056",
+              "digest": "ANJa65mKP7tZx6GoA82GzBuandC7oTV4a9fk9n8wPbov",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -251,8 +251,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0x7bb5eac6aca46ca1cc81fd5cb7330463717f4927006721f3b14981e7abc83c34",
-              "digest": "7uL5wZ82tPiNba7uJDeSc5jJj1sFfyraBtjcWVwEBtB2",
+              "address": "0xac9c2e11aebecd35b4cb15802ca6ad5e64d320204149187ba646a16d07a4934d",
+              "digest": "RrVubtgNdy7wNADnkTDbTpRgRpzYdnjQtLfn1GjUkL8",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -260,8 +260,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0x847c914d647e7387d7cea4db5ad8fefeffe66773635804a991dfd4385fab6a97",
-              "digest": "HeGByH3KwRn41yndqdkQ8srWg32VSpouDNNw1sbELNAP",
+              "address": "0xb21c0b03871456040643740e238d03bde38de240d7b17055f4670777a19f07b8",
+              "digest": "6q7rM2bckwW5W8QiM3T5VWCtEf2MjCX7G51UiwgHCDnL",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -269,8 +269,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0xa79cc544021a721176cdc4497728ec35a5311b8ff0aa293a5d29c0d32cb56056",
-              "digest": "8TELkyo6p1Gmz2Sqcg9916XqYh8uvxzGXTnKJJUp3u5o",
+              "address": "0xbf1922ccfb654506f4104ce832ff2e7887af43de81c01bd22d28c2ff4eae4d44",
+              "digest": "9YrG9BE2ekkibLeL2x1vGaABj7ZqdrdNArqFaR1yWBwb",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -278,8 +278,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0xac9c2e11aebecd35b4cb15802ca6ad5e64d320204149187ba646a16d07a4934d",
-              "digest": "71eF11kEmB71xCf52tnp12xvPrnsRLzavNv5hpmP12XB",
+              "address": "0xe0036db16e72b25a175f7cf03c360669e80e1d44c2e4fdeab59eced4d3d8650c",
+              "digest": "Fbm95u1WFstG2dhEuK6sBnhWmYDtZMgc8LhUihh7y83w",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -287,8 +287,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0xb21c0b03871456040643740e238d03bde38de240d7b17055f4670777a19f07b8",
-              "digest": "AJDc4yJ87DGq9uqzxf38nMBQfkTYyp9AVfQowbMgtcfq",
+              "address": "0xebf199fc588a2ab72281d94e0cbd957f87b75c056b677ada8341962c22abbed9",
+              "digest": "ApypQoSQXYpfee5Ji6YEnBJxWDts2Pmo1anNwviVTPaL",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -296,8 +296,8 @@ Response: {
           },
           {
             "node": {
-              "address": "0xc7b24c1c7a130e6cb6d04da824676db33f0ee59ddd5051d8e05bd0eac83fc112",
-              "digest": "FeQ25RQGfqpHHJPZmw3W3gEpsnN8abk88Si3yQKuyvLz",
+              "address": "0xfadf3d2a466a0f7279368bfdc9b19bf093ec52b6abd5ac51df4ffabbaa48e2e2",
+              "digest": "ELBFcj1EbKJ9tUyoggRHXDUuvBa7e6HmboxkxXD4d4Rv",
               "owner": {
                 "__typename": "AddressOwner"
               }
@@ -375,7 +375,7 @@ Response: {
   "data": {
     "serviceConfig": {
       "availableVersions": [
-        "2024.7"
+        "0.5"
       ]
     }
   }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp b/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp
index a7a7cdff255..0c0837ee005 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/balances.exp
@@ -80,7 +80,7 @@ Response: {
                 },
                 {
                   "coinType": {
-                    "repr": "0x18d468c0ef2093d637326c55ce0faa7a493bcae988a5af47d102ead08bb4d4d3::fake::FAKE"
+                    "repr": "0x8a64e2320cb13fc7276c85b7680997e0fb40820e8276a753b076d5d1d0e208ff::fake::FAKE"
                   },
                   "coinObjectCount": 3,
                   "totalBalance": "700"
@@ -103,7 +103,7 @@ Response: {
         {
           "sender": {
             "fakeCoinBalance": {
-              "totalBalance": "500"
+              "totalBalance": "400"
             },
             "allBalances": {
               "nodes": [
@@ -116,10 +116,10 @@ Response: {
                 },
                 {
                   "coinType": {
-                    "repr": "0x18d468c0ef2093d637326c55ce0faa7a493bcae988a5af47d102ead08bb4d4d3::fake::FAKE"
+                    "repr": "0x8a64e2320cb13fc7276c85b7680997e0fb40820e8276a753b076d5d1d0e208ff::fake::FAKE"
                   },
                   "coinObjectCount": 2,
-                  "totalBalance": "500"
+                  "totalBalance": "400"
                 }
               ]
             }
@@ -139,7 +139,7 @@ Response: {
         {
           "sender": {
             "fakeCoinBalance": {
-              "totalBalance": "400"
+              "totalBalance": "200"
             },
             "allBalances": {
               "nodes": [
@@ -152,10 +152,10 @@ Response: {
                 },
                 {
                   "coinType": {
-                    "repr": "0x18d468c0ef2093d637326c55ce0faa7a493bcae988a5af47d102ead08bb4d4d3::fake::FAKE"
+                    "repr": "0x8a64e2320cb13fc7276c85b7680997e0fb40820e8276a753b076d5d1d0e208ff::fake::FAKE"
                   },
                   "coinObjectCount": 1,
-                  "totalBalance": "400"
+                  "totalBalance": "200"
                 }
               ]
             }
@@ -196,7 +196,7 @@ Response: {
                 },
                 {
                   "coinType": {
-                    "repr": "0x18d468c0ef2093d637326c55ce0faa7a493bcae988a5af47d102ead08bb4d4d3::fake::FAKE"
+                    "repr": "0x8a64e2320cb13fc7276c85b7680997e0fb40820e8276a753b076d5d1d0e208ff::fake::FAKE"
                   },
                   "coinObjectCount": 3,
                   "totalBalance": "700"
@@ -219,7 +219,7 @@ Response: {
         {
           "sender": {
             "fakeCoinBalance": {
-              "totalBalance": "500"
+              "totalBalance": "400"
             },
             "allBalances": {
               "nodes": [
@@ -232,10 +232,10 @@ Response: {
                 },
                 {
                   "coinType": {
-                    "repr": "0x18d468c0ef2093d637326c55ce0faa7a493bcae988a5af47d102ead08bb4d4d3::fake::FAKE"
+                    "repr": "0x8a64e2320cb13fc7276c85b7680997e0fb40820e8276a753b076d5d1d0e208ff::fake::FAKE"
                   },
                   "coinObjectCount": 2,
-                  "totalBalance": "500"
+                  "totalBalance": "400"
                 }
               ]
             }
@@ -255,7 +255,7 @@ Response: {
         {
           "sender": {
             "fakeCoinBalance": {
-              "totalBalance": "400"
+              "totalBalance": "200"
             },
             "allBalances": {
               "nodes": [
@@ -268,10 +268,10 @@ Response: {
                 },
                 {
                   "coinType": {
-                    "repr": "0x18d468c0ef2093d637326c55ce0faa7a493bcae988a5af47d102ead08bb4d4d3::fake::FAKE"
+                    "repr": "0x8a64e2320cb13fc7276c85b7680997e0fb40820e8276a753b076d5d1d0e208ff::fake::FAKE"
                   },
                   "coinObjectCount": 1,
-                  "totalBalance": "400"
+                  "totalBalance": "200"
                 }
               ]
             }
@@ -334,7 +334,7 @@ Response: {
         {
           "sender": {
             "fakeCoinBalance": {
-              "totalBalance": "500"
+              "totalBalance": "400"
             },
             "allBalances": {
               "nodes": [
@@ -347,10 +347,10 @@ Response: {
                 },
                 {
                   "coinType": {
-                    "repr": "0x18d468c0ef2093d637326c55ce0faa7a493bcae988a5af47d102ead08bb4d4d3::fake::FAKE"
+                    "repr": "0x8a64e2320cb13fc7276c85b7680997e0fb40820e8276a753b076d5d1d0e208ff::fake::FAKE"
                   },
                   "coinObjectCount": 2,
-                  "totalBalance": "500"
+                  "totalBalance": "400"
                 }
               ]
             }
@@ -370,7 +370,7 @@ Response: {
         {
           "sender": {
             "fakeCoinBalance": {
-              "totalBalance": "400"
+              "totalBalance": "200"
             },
             "allBalances": {
               "nodes": [
@@ -383,10 +383,10 @@ Response: {
                 },
                 {
                   "coinType": {
-                    "repr": "0x18d468c0ef2093d637326c55ce0faa7a493bcae988a5af47d102ead08bb4d4d3::fake::FAKE"
+                    "repr": "0x8a64e2320cb13fc7276c85b7680997e0fb40820e8276a753b076d5d1d0e208ff::fake::FAKE"
                   },
                   "coinObjectCount": 1,
-                  "totalBalance": "400"
+                  "totalBalance": "200"
                 }
               ]
             }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp b/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp
index 5400d2590e2..1866d5b26f5 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp
@@ -94,12 +94,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
                 "node": {
-                  "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H",
+                  "digest": "ARW7Huh9GW72bMvDoEUY2BQkU2TbgkJeuCtk538E65ud",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
+                          "cursor": "IOgjTJtf/6FlTpu0BCSEiQre3ONPUDwTdz0xbRu+TVWuAwAAAAAAAAA="
                         }
                       ]
                     }
@@ -109,12 +109,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0",
                 "node": {
-                  "digest": "2rBdnEwKTdVy95JSVPD9z2xLFWUpkCtqQvuByXTYA7tG",
+                  "digest": "Ay1h3NAkKnrkUif97h8ra2cf8ZyXzQvxUrJp7eaN89cV",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
+                          "cursor": "IOgjTJtf/6FlTpu0BCSEiQre3ONPUDwTdz0xbRu+TVWuAwAAAAAAAAA="
                         }
                       ]
                     }
@@ -124,12 +124,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
                 "node": {
-                  "digest": "HWTSUrHn5zbMcP2aixY3vhtjyyP4GnZUBbqKDoVjpd53",
+                  "digest": "CaWJtdWxxV8QcJyNnX8hnKRxeZsDTwNbRd3MHdRAnswP",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
+                          "cursor": "IOgjTJtf/6FlTpu0BCSEiQre3ONPUDwTdz0xbRu+TVWuAwAAAAAAAAA="
                         }
                       ]
                     }
@@ -139,12 +139,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0",
                 "node": {
-                  "digest": "2HmXBYuoPVLZB55KPw2wtbkrq1VRAGHrXKVCzUieuaHJ",
+                  "digest": "8ThoJwqQb8Qfk6FCa4rm3ZaGZXPQNRJV5Q9juj1MKRPV",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
+                          "cursor": "IOgjTJtf/6FlTpu0BCSEiQre3ONPUDwTdz0xbRu+TVWuAwAAAAAAAAA="
                         }
                       ]
                     }
@@ -161,12 +161,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
                 "node": {
-                  "digest": "75rRkUvMDa7YshVPFCbbAtaMghmFy57QtfZ5LL4JF5SB",
+                  "digest": "CvhQVJ7numDYf6yZL4nWtw6Xh5iGYGEyVo23eYzQrBg1",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
+                          "cursor": "IOgjTJtf/6FlTpu0BCSEiQre3ONPUDwTdz0xbRu+TVWuAwAAAAAAAAA="
                         }
                       ]
                     }
@@ -176,12 +176,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0",
                 "node": {
-                  "digest": "EkKiCJcM1ZfV5y23CQLSsrf2HxDfY2bmukyYGdPWP8Ed",
+                  "digest": "DQHEeQgLHCrvGvvMCwSf6nkPJSHPau76ubpxmh1dQpE9",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
+                          "cursor": "IOgjTJtf/6FlTpu0BCSEiQre3ONPUDwTdz0xbRu+TVWuAwAAAAAAAAA="
                         }
                       ]
                     }
@@ -191,12 +191,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0",
                 "node": {
-                  "digest": "HbjiBNbABYK4a5iEZa1vyVt7Y7rYrGTUFAiSgr9c4zke",
+                  "digest": "FyorXheep61dt4Uwv6tAGULrjYVKwZMdzQr13C8y1Nwk",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
+                          "cursor": "IOgjTJtf/6FlTpu0BCSEiQre3ONPUDwTdz0xbRu+TVWuAwAAAAAAAAA="
                         }
                       ]
                     }
@@ -213,12 +213,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0",
                 "node": {
-                  "digest": "g1WhQn8u5xCQH4Dyb9D9FvWrUTKJyZxuKNmN8Je8xii",
+                  "digest": "BHybRgj8Z9zf6yK7QHay4Y91ntSY7Tv4tbPFKNrdfUpd",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
+                          "cursor": "IOgjTJtf/6FlTpu0BCSEiQre3ONPUDwTdz0xbRu+TVWuAwAAAAAAAAA="
                         }
                       ]
                     }
@@ -228,12 +228,12 @@ Response: {
               {
                 "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
                 "node": {
-                  "digest": "Gk9Y9dzHQvbR4USt6kFaAS3tqGvH51wB6D3rSjwtH5G3",
+                  "digest": "5XuV7BK4xMoHsgPyXjWiA4XTcAozfauKW1sdAZ7V9yfT",
                   "sender": {
                     "objects": {
                       "edges": [
                         {
-                          "cursor": "IMnpVN9+TP2vNuQLYXHpLFfHdnOaHfvqRjumQ2rs+4nxAwAAAAAAAAA="
+                          "cursor": "IOgjTJtf/6FlTpu0BCSEiQre3ONPUDwTdz0xbRu+TVWuAwAAAAAAAAA="
                         }
                       ]
                     }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp b/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp
index a9cb912e9e3..c87443d566b 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/coins.exp
@@ -33,7 +33,7 @@ Response: {
     "queryCoinsAtLatest": {
       "edges": [
         {
-          "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAgAAAAAAAAA=",
+          "cursor": "IEoxRTEINy8rM4k10qaiK4DBOnvAFlH2NqNlUbiEl5m4AgAAAAAAAAA=",
           "node": {
             "consistentStateForEachCoin": {
               "owner": {
@@ -41,39 +41,39 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAgAAAAAAAAA=",
+                      "cursor": "IEoxRTEINy8rM4k10qaiK4DBOnvAFlH2NqNlUbiEl5m4AgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
+                            "id": "0x4a31453108372f2b338935d2a6a22b80c13a7bc01651f636a36551b8849799b8",
                             "balance": {
-                              "value": "100300"
+                              "value": "100100"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAgAAAAAAAAA=",
+                      "cursor": "IM83Q8NQ6HuwSEYJ3Loz6KZTddlepYt8zRg6fa44RlHIAgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
+                            "id": "0xcf3743c350e87bb0484609dcba33e8a65375d95ea58b7ccd183a7dae384651c8",
                             "balance": {
-                              "value": "200"
+                              "value": "300"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAgAAAAAAAAA=",
+                      "cursor": "IO9Q9XbE6+db2l9L0JjhNzautfBsOISq1c5cVBEtZWshAgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
+                            "id": "0xef50f576c4ebe75bda5f4bd098e13736aeb5f06c3884aad5ce5c54112d656b21",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
@@ -85,16 +85,16 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
+                "id": "0x4a31453108372f2b338935d2a6a22b80c13a7bc01651f636a36551b8849799b8",
                 "balance": {
-                  "value": "100300"
+                  "value": "100100"
                 }
               }
             }
           }
         },
         {
-          "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAgAAAAAAAAA=",
+          "cursor": "IM83Q8NQ6HuwSEYJ3Loz6KZTddlepYt8zRg6fa44RlHIAgAAAAAAAAA=",
           "node": {
             "consistentStateForEachCoin": {
               "owner": {
@@ -102,39 +102,39 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAgAAAAAAAAA=",
+                      "cursor": "IEoxRTEINy8rM4k10qaiK4DBOnvAFlH2NqNlUbiEl5m4AgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
+                            "id": "0x4a31453108372f2b338935d2a6a22b80c13a7bc01651f636a36551b8849799b8",
                             "balance": {
-                              "value": "100300"
+                              "value": "100100"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAgAAAAAAAAA=",
+                      "cursor": "IM83Q8NQ6HuwSEYJ3Loz6KZTddlepYt8zRg6fa44RlHIAgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
+                            "id": "0xcf3743c350e87bb0484609dcba33e8a65375d95ea58b7ccd183a7dae384651c8",
                             "balance": {
-                              "value": "200"
+                              "value": "300"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAgAAAAAAAAA=",
+                      "cursor": "IO9Q9XbE6+db2l9L0JjhNzautfBsOISq1c5cVBEtZWshAgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
+                            "id": "0xef50f576c4ebe75bda5f4bd098e13736aeb5f06c3884aad5ce5c54112d656b21",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
@@ -146,16 +146,16 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
+                "id": "0xcf3743c350e87bb0484609dcba33e8a65375d95ea58b7ccd183a7dae384651c8",
                 "balance": {
-                  "value": "200"
+                  "value": "300"
                 }
               }
             }
           }
         },
         {
-          "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAgAAAAAAAAA=",
+          "cursor": "IO9Q9XbE6+db2l9L0JjhNzautfBsOISq1c5cVBEtZWshAgAAAAAAAAA=",
           "node": {
             "consistentStateForEachCoin": {
               "owner": {
@@ -163,39 +163,39 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAgAAAAAAAAA=",
+                      "cursor": "IEoxRTEINy8rM4k10qaiK4DBOnvAFlH2NqNlUbiEl5m4AgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
+                            "id": "0x4a31453108372f2b338935d2a6a22b80c13a7bc01651f636a36551b8849799b8",
                             "balance": {
-                              "value": "100300"
+                              "value": "100100"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAgAAAAAAAAA=",
+                      "cursor": "IM83Q8NQ6HuwSEYJ3Loz6KZTddlepYt8zRg6fa44RlHIAgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
+                            "id": "0xcf3743c350e87bb0484609dcba33e8a65375d95ea58b7ccd183a7dae384651c8",
                             "balance": {
-                              "value": "200"
+                              "value": "300"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAgAAAAAAAAA=",
+                      "cursor": "IO9Q9XbE6+db2l9L0JjhNzautfBsOISq1c5cVBEtZWshAgAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
+                            "id": "0xef50f576c4ebe75bda5f4bd098e13736aeb5f06c3884aad5ce5c54112d656b21",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
@@ -207,9 +207,9 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
+                "id": "0xef50f576c4ebe75bda5f4bd098e13736aeb5f06c3884aad5ce5c54112d656b21",
                 "balance": {
-                  "value": "100"
+                  "value": "200"
                 }
               }
             }
@@ -221,39 +221,39 @@ Response: {
       "coins": {
         "edges": [
           {
-            "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAgAAAAAAAAA=",
+            "cursor": "IEoxRTEINy8rM4k10qaiK4DBOnvAFlH2NqNlUbiEl5m4AgAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
+                  "id": "0x4a31453108372f2b338935d2a6a22b80c13a7bc01651f636a36551b8849799b8",
                   "balance": {
-                    "value": "100300"
+                    "value": "100100"
                   }
                 }
               }
             }
           },
           {
-            "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAgAAAAAAAAA=",
+            "cursor": "IM83Q8NQ6HuwSEYJ3Loz6KZTddlepYt8zRg6fa44RlHIAgAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
+                  "id": "0xcf3743c350e87bb0484609dcba33e8a65375d95ea58b7ccd183a7dae384651c8",
                   "balance": {
-                    "value": "200"
+                    "value": "300"
                   }
                 }
               }
             }
           },
           {
-            "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAgAAAAAAAAA=",
+            "cursor": "IO9Q9XbE6+db2l9L0JjhNzautfBsOISq1c5cVBEtZWshAgAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
+                  "id": "0xef50f576c4ebe75bda5f4bd098e13736aeb5f06c3884aad5ce5c54112d656b21",
                   "balance": {
-                    "value": "100"
+                    "value": "200"
                   }
                 }
               }
@@ -272,7 +272,7 @@ Response: {
     "queryCoinsAtChkpt1": {
       "edges": [
         {
-          "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAQAAAAAAAAA=",
+          "cursor": "IEoxRTEINy8rM4k10qaiK4DBOnvAFlH2NqNlUbiEl5m4AQAAAAAAAAA=",
           "node": {
             "consistentStateForEachCoin": {
               "owner": {
@@ -280,39 +280,39 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAQAAAAAAAAA=",
+                      "cursor": "IEoxRTEINy8rM4k10qaiK4DBOnvAFlH2NqNlUbiEl5m4AQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
+                            "id": "0x4a31453108372f2b338935d2a6a22b80c13a7bc01651f636a36551b8849799b8",
                             "balance": {
-                              "value": "300"
+                              "value": "100"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAQAAAAAAAAA=",
+                      "cursor": "IM83Q8NQ6HuwSEYJ3Loz6KZTddlepYt8zRg6fa44RlHIAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
+                            "id": "0xcf3743c350e87bb0484609dcba33e8a65375d95ea58b7ccd183a7dae384651c8",
                             "balance": {
-                              "value": "200"
+                              "value": "300"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAQAAAAAAAAA=",
+                      "cursor": "IO9Q9XbE6+db2l9L0JjhNzautfBsOISq1c5cVBEtZWshAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
+                            "id": "0xef50f576c4ebe75bda5f4bd098e13736aeb5f06c3884aad5ce5c54112d656b21",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
@@ -324,16 +324,16 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
+                "id": "0x4a31453108372f2b338935d2a6a22b80c13a7bc01651f636a36551b8849799b8",
                 "balance": {
-                  "value": "300"
+                  "value": "100"
                 }
               }
             }
           }
         },
         {
-          "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAQAAAAAAAAA=",
+          "cursor": "IM83Q8NQ6HuwSEYJ3Loz6KZTddlepYt8zRg6fa44RlHIAQAAAAAAAAA=",
           "node": {
             "consistentStateForEachCoin": {
               "owner": {
@@ -341,39 +341,39 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAQAAAAAAAAA=",
+                      "cursor": "IEoxRTEINy8rM4k10qaiK4DBOnvAFlH2NqNlUbiEl5m4AQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
+                            "id": "0x4a31453108372f2b338935d2a6a22b80c13a7bc01651f636a36551b8849799b8",
                             "balance": {
-                              "value": "300"
+                              "value": "100"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAQAAAAAAAAA=",
+                      "cursor": "IM83Q8NQ6HuwSEYJ3Loz6KZTddlepYt8zRg6fa44RlHIAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
+                            "id": "0xcf3743c350e87bb0484609dcba33e8a65375d95ea58b7ccd183a7dae384651c8",
                             "balance": {
-                              "value": "200"
+                              "value": "300"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAQAAAAAAAAA=",
+                      "cursor": "IO9Q9XbE6+db2l9L0JjhNzautfBsOISq1c5cVBEtZWshAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
+                            "id": "0xef50f576c4ebe75bda5f4bd098e13736aeb5f06c3884aad5ce5c54112d656b21",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
@@ -385,9 +385,9 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
+                "id": "0xcf3743c350e87bb0484609dcba33e8a65375d95ea58b7ccd183a7dae384651c8",
                 "balance": {
-                  "value": "200"
+                  "value": "300"
                 }
               }
             }
@@ -399,26 +399,26 @@ Response: {
       "coins": {
         "edges": [
           {
-            "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAQAAAAAAAAA=",
+            "cursor": "IEoxRTEINy8rM4k10qaiK4DBOnvAFlH2NqNlUbiEl5m4AQAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
+                  "id": "0x4a31453108372f2b338935d2a6a22b80c13a7bc01651f636a36551b8849799b8",
                   "balance": {
-                    "value": "300"
+                    "value": "100"
                   }
                 }
               }
             }
           },
           {
-            "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAQAAAAAAAAA=",
+            "cursor": "IM83Q8NQ6HuwSEYJ3Loz6KZTddlepYt8zRg6fa44RlHIAQAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
+                  "id": "0xcf3743c350e87bb0484609dcba33e8a65375d95ea58b7ccd183a7dae384651c8",
                   "balance": {
-                    "value": "200"
+                    "value": "300"
                   }
                 }
               }
@@ -453,7 +453,7 @@ Response: {
     "queryCoins": {
       "edges": [
         {
-          "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAwAAAAAAAAA=",
+          "cursor": "IEoxRTEINy8rM4k10qaiK4DBOnvAFlH2NqNlUbiEl5m4AwAAAAAAAAA=",
           "node": {
             "owner": {
               "owner": {
@@ -461,13 +461,13 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAwAAAAAAAAA=",
+                      "cursor": "IEoxRTEINy8rM4k10qaiK4DBOnvAFlH2NqNlUbiEl5m4AwAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
+                            "id": "0x4a31453108372f2b338935d2a6a22b80c13a7bc01651f636a36551b8849799b8",
                             "balance": {
-                              "value": "100300"
+                              "value": "100100"
                             }
                           }
                         }
@@ -479,16 +479,16 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
+                "id": "0x4a31453108372f2b338935d2a6a22b80c13a7bc01651f636a36551b8849799b8",
                 "balance": {
-                  "value": "100300"
+                  "value": "100100"
                 }
               }
             }
           }
         },
         {
-          "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAwAAAAAAAAA=",
+          "cursor": "IM83Q8NQ6HuwSEYJ3Loz6KZTddlepYt8zRg6fa44RlHIAwAAAAAAAAA=",
           "node": {
             "owner": {
               "owner": {
@@ -496,26 +496,26 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAwAAAAAAAAA=",
+                      "cursor": "IM83Q8NQ6HuwSEYJ3Loz6KZTddlepYt8zRg6fa44RlHIAwAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
+                            "id": "0xcf3743c350e87bb0484609dcba33e8a65375d95ea58b7ccd183a7dae384651c8",
                             "balance": {
-                              "value": "200"
+                              "value": "300"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAwAAAAAAAAA=",
+                      "cursor": "IO9Q9XbE6+db2l9L0JjhNzautfBsOISq1c5cVBEtZWshAwAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
+                            "id": "0xef50f576c4ebe75bda5f4bd098e13736aeb5f06c3884aad5ce5c54112d656b21",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
@@ -527,16 +527,16 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
+                "id": "0xcf3743c350e87bb0484609dcba33e8a65375d95ea58b7ccd183a7dae384651c8",
                 "balance": {
-                  "value": "200"
+                  "value": "300"
                 }
               }
             }
           }
         },
         {
-          "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAwAAAAAAAAA=",
+          "cursor": "IO9Q9XbE6+db2l9L0JjhNzautfBsOISq1c5cVBEtZWshAwAAAAAAAAA=",
           "node": {
             "owner": {
               "owner": {
@@ -544,26 +544,26 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAwAAAAAAAAA=",
+                      "cursor": "IM83Q8NQ6HuwSEYJ3Loz6KZTddlepYt8zRg6fa44RlHIAwAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
+                            "id": "0xcf3743c350e87bb0484609dcba33e8a65375d95ea58b7ccd183a7dae384651c8",
                             "balance": {
-                              "value": "200"
+                              "value": "300"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAwAAAAAAAAA=",
+                      "cursor": "IO9Q9XbE6+db2l9L0JjhNzautfBsOISq1c5cVBEtZWshAwAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
+                            "id": "0xef50f576c4ebe75bda5f4bd098e13736aeb5f06c3884aad5ce5c54112d656b21",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
@@ -575,9 +575,9 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
+                "id": "0xef50f576c4ebe75bda5f4bd098e13736aeb5f06c3884aad5ce5c54112d656b21",
                 "balance": {
-                  "value": "100"
+                  "value": "200"
                 }
               }
             }
@@ -589,13 +589,13 @@ Response: {
       "coins": {
         "edges": [
           {
-            "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAwAAAAAAAAA=",
+            "cursor": "IEoxRTEINy8rM4k10qaiK4DBOnvAFlH2NqNlUbiEl5m4AwAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
+                  "id": "0x4a31453108372f2b338935d2a6a22b80c13a7bc01651f636a36551b8849799b8",
                   "balance": {
-                    "value": "100300"
+                    "value": "100100"
                   }
                 }
               }
@@ -608,26 +608,26 @@ Response: {
       "coins": {
         "edges": [
           {
-            "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAwAAAAAAAAA=",
+            "cursor": "IM83Q8NQ6HuwSEYJ3Loz6KZTddlepYt8zRg6fa44RlHIAwAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
+                  "id": "0xcf3743c350e87bb0484609dcba33e8a65375d95ea58b7ccd183a7dae384651c8",
                   "balance": {
-                    "value": "200"
+                    "value": "300"
                   }
                 }
               }
             }
           },
           {
-            "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAwAAAAAAAAA=",
+            "cursor": "IO9Q9XbE6+db2l9L0JjhNzautfBsOISq1c5cVBEtZWshAwAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
+                  "id": "0xef50f576c4ebe75bda5f4bd098e13736aeb5f06c3884aad5ce5c54112d656b21",
                   "balance": {
-                    "value": "100"
+                    "value": "200"
                   }
                 }
               }
@@ -658,7 +658,7 @@ Response: {
     "queryCoinsAtChkpt1BeforeSnapshotCatchup": {
       "edges": [
         {
-          "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAQAAAAAAAAA=",
+          "cursor": "IEoxRTEINy8rM4k10qaiK4DBOnvAFlH2NqNlUbiEl5m4AQAAAAAAAAA=",
           "node": {
             "consistentStateForEachCoin": {
               "owner": {
@@ -666,39 +666,39 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAQAAAAAAAAA=",
+                      "cursor": "IEoxRTEINy8rM4k10qaiK4DBOnvAFlH2NqNlUbiEl5m4AQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
+                            "id": "0x4a31453108372f2b338935d2a6a22b80c13a7bc01651f636a36551b8849799b8",
                             "balance": {
-                              "value": "300"
+                              "value": "100"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAQAAAAAAAAA=",
+                      "cursor": "IM83Q8NQ6HuwSEYJ3Loz6KZTddlepYt8zRg6fa44RlHIAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
+                            "id": "0xcf3743c350e87bb0484609dcba33e8a65375d95ea58b7ccd183a7dae384651c8",
                             "balance": {
-                              "value": "200"
+                              "value": "300"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAQAAAAAAAAA=",
+                      "cursor": "IO9Q9XbE6+db2l9L0JjhNzautfBsOISq1c5cVBEtZWshAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
+                            "id": "0xef50f576c4ebe75bda5f4bd098e13736aeb5f06c3884aad5ce5c54112d656b21",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
@@ -710,16 +710,16 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
+                "id": "0x4a31453108372f2b338935d2a6a22b80c13a7bc01651f636a36551b8849799b8",
                 "balance": {
-                  "value": "300"
+                  "value": "100"
                 }
               }
             }
           }
         },
         {
-          "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAQAAAAAAAAA=",
+          "cursor": "IM83Q8NQ6HuwSEYJ3Loz6KZTddlepYt8zRg6fa44RlHIAQAAAAAAAAA=",
           "node": {
             "consistentStateForEachCoin": {
               "owner": {
@@ -727,39 +727,39 @@ Response: {
                 "coins": {
                   "edges": [
                     {
-                      "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAQAAAAAAAAA=",
+                      "cursor": "IEoxRTEINy8rM4k10qaiK4DBOnvAFlH2NqNlUbiEl5m4AQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
+                            "id": "0x4a31453108372f2b338935d2a6a22b80c13a7bc01651f636a36551b8849799b8",
                             "balance": {
-                              "value": "300"
+                              "value": "100"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAQAAAAAAAAA=",
+                      "cursor": "IM83Q8NQ6HuwSEYJ3Loz6KZTddlepYt8zRg6fa44RlHIAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
+                            "id": "0xcf3743c350e87bb0484609dcba33e8a65375d95ea58b7ccd183a7dae384651c8",
                             "balance": {
-                              "value": "200"
+                              "value": "300"
                             }
                           }
                         }
                       }
                     },
                     {
-                      "cursor": "IJZZH8+90rkNRpvRFknFITtXumlrzerlmSjTtFahgrwuAQAAAAAAAAA=",
+                      "cursor": "IO9Q9XbE6+db2l9L0JjhNzautfBsOISq1c5cVBEtZWshAQAAAAAAAAA=",
                       "node": {
                         "contents": {
                           "json": {
-                            "id": "0x96591fcfbdd2b90d469bd11649c5213b57ba696bcdeae59928d3b456a182bc2e",
+                            "id": "0xef50f576c4ebe75bda5f4bd098e13736aeb5f06c3884aad5ce5c54112d656b21",
                             "balance": {
-                              "value": "100"
+                              "value": "200"
                             }
                           }
                         }
@@ -771,9 +771,9 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
+                "id": "0xcf3743c350e87bb0484609dcba33e8a65375d95ea58b7ccd183a7dae384651c8",
                 "balance": {
-                  "value": "200"
+                  "value": "300"
                 }
               }
             }
@@ -785,26 +785,26 @@ Response: {
       "coins": {
         "edges": [
           {
-            "cursor": "IEXVEGsIQcJpcKqJwEjA0w+xU59wr7gks4hL7oVz1nimAQAAAAAAAAA=",
+            "cursor": "IEoxRTEINy8rM4k10qaiK4DBOnvAFlH2NqNlUbiEl5m4AQAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0x45d5106b0841c26970aa89c048c0d30fb1539f70afb824b3884bee8573d678a6",
+                  "id": "0x4a31453108372f2b338935d2a6a22b80c13a7bc01651f636a36551b8849799b8",
                   "balance": {
-                    "value": "300"
+                    "value": "100"
                   }
                 }
               }
             }
           },
           {
-            "cursor": "IEdEqJUSk98ITqOYNlrFLSDdB5goss8vJtT6bNqd+5hAAQAAAAAAAAA=",
+            "cursor": "IM83Q8NQ6HuwSEYJ3Loz6KZTddlepYt8zRg6fa44RlHIAQAAAAAAAAA=",
             "node": {
               "contents": {
                 "json": {
-                  "id": "0x4744a8951293df084ea398365ac52d20dd079828b2cf2f26d4fa6cda9dfb9840",
+                  "id": "0xcf3743c350e87bb0484609dcba33e8a65375d95ea58b7ccd183a7dae384651c8",
                   "balance": {
-                    "value": "200"
+                    "value": "300"
                   }
                 }
               }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp
index c711c23961c..7114a8def6f 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_df.exp
@@ -90,7 +90,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IEFpKGimJTXfu4K2buCNDYZ0ahvsBfVsyrFfwj3HY/RSAQAAAAAAAAA=",
+            "cursor": "IAuAWD5S+a9NiTE0NLMt51nZPdB/jGuIJU3KdhgC6Df1AQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNA=="
@@ -101,7 +101,7 @@ Response: {
             }
           },
           {
-            "cursor": "IHHdqaltVCBIzG7FbNTzlV5l2vXKxrmbz1icNABQonU5AQAAAAAAAAA=",
+            "cursor": "IIBWfNdnUHotfxzw7x0/GTs+i0n+uvDH4t4e7dc++v/aAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNQ=="
@@ -112,7 +112,7 @@ Response: {
             }
           },
           {
-            "cursor": "IKmVQJJoNKIRBeIAQszU5tVjlAOMkELOdpLEy45/zgW1AQAAAAAAAAA=",
+            "cursor": "ILN4GZtK9jzjdM6iJqs8jW2H9iA3quae7IQ/Uj9YGuI8AQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNg=="
@@ -139,7 +139,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IEFpKGimJTXfu4K2buCNDYZ0ahvsBfVsyrFfwj3HY/RSAQAAAAAAAAA=",
+            "cursor": "IAuAWD5S+a9NiTE0NLMt51nZPdB/jGuIJU3KdhgC6Df1AQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNA=="
@@ -150,7 +150,7 @@ Response: {
             }
           },
           {
-            "cursor": "IHHdqaltVCBIzG7FbNTzlV5l2vXKxrmbz1icNABQonU5AQAAAAAAAAA=",
+            "cursor": "IIBWfNdnUHotfxzw7x0/GTs+i0n+uvDH4t4e7dc++v/aAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNQ=="
@@ -161,7 +161,7 @@ Response: {
             }
           },
           {
-            "cursor": "IKmVQJJoNKIRBeIAQszU5tVjlAOMkELOdpLEy45/zgW1AQAAAAAAAAA=",
+            "cursor": "ILN4GZtK9jzjdM6iJqs8jW2H9iA3quae7IQ/Uj9YGuI8AQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNg=="
@@ -188,18 +188,18 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IBLJs8Pi9k9t4wRdY9AgeWbly1WW8h//8yF/EFIYHE4YAQAAAAAAAAA=",
+            "cursor": "IAawhw/3qY0YnjRH/vW7OZwHigwSZY1HAwYhFywolc2uAQAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMQ=="
+                "bcs": "A2RmMg=="
               },
               "value": {
-                "json": "df1"
+                "json": "df2"
               }
             }
           },
           {
-            "cursor": "IEFpKGimJTXfu4K2buCNDYZ0ahvsBfVsyrFfwj3HY/RSAQAAAAAAAAA=",
+            "cursor": "IAuAWD5S+a9NiTE0NLMt51nZPdB/jGuIJU3KdhgC6Df1AQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNA=="
@@ -210,46 +210,46 @@ Response: {
             }
           },
           {
-            "cursor": "IHHdqaltVCBIzG7FbNTzlV5l2vXKxrmbz1icNABQonU5AQAAAAAAAAA=",
+            "cursor": "IDHZEQS3ja51p1OhSBXkHM6d7Ft57mgIl9i3eM4MtocHAQAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNQ=="
+                "bcs": "A2RmMw=="
               },
               "value": {
-                "json": "df5"
+                "json": "df3"
               }
             }
           },
           {
-            "cursor": "IKbD5vH9q3Fz2cc0iMym+8S4c50k7zbG3sQk293/o3WBAQAAAAAAAAA=",
+            "cursor": "IIBWfNdnUHotfxzw7x0/GTs+i0n+uvDH4t4e7dc++v/aAQAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMw=="
+                "bcs": "A2RmNQ=="
               },
               "value": {
-                "json": "df3"
+                "json": "df5"
               }
             }
           },
           {
-            "cursor": "IKmVQJJoNKIRBeIAQszU5tVjlAOMkELOdpLEy45/zgW1AQAAAAAAAAA=",
+            "cursor": "IJBs4l7PDwA4jl9ZLSOR1ky7UurAGyfT5F0cxHGrXQwTAQAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNg=="
+                "bcs": "A2RmMQ=="
               },
               "value": {
-                "json": "df6"
+                "json": "df1"
               }
             }
           },
           {
-            "cursor": "ILQkBdmgGlsflcYrZYOUeRezOrkHL9s+vfsXWAsxs2C7AQAAAAAAAAA=",
+            "cursor": "ILN4GZtK9jzjdM6iJqs8jW2H9iA3quae7IQ/Uj9YGuI8AQAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMg=="
+                "bcs": "A2RmNg=="
               },
               "value": {
-                "json": "df2"
+                "json": "df6"
               }
             }
           }
@@ -283,7 +283,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IEFpKGimJTXfu4K2buCNDYZ0ahvsBfVsyrFfwj3HY/RSAQAAAAAAAAA=",
+            "cursor": "IAuAWD5S+a9NiTE0NLMt51nZPdB/jGuIJU3KdhgC6Df1AQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNA=="
@@ -294,7 +294,7 @@ Response: {
             }
           },
           {
-            "cursor": "IHHdqaltVCBIzG7FbNTzlV5l2vXKxrmbz1icNABQonU5AQAAAAAAAAA=",
+            "cursor": "IIBWfNdnUHotfxzw7x0/GTs+i0n+uvDH4t4e7dc++v/aAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNQ=="
@@ -305,7 +305,7 @@ Response: {
             }
           },
           {
-            "cursor": "IKmVQJJoNKIRBeIAQszU5tVjlAOMkELOdpLEy45/zgW1AQAAAAAAAAA=",
+            "cursor": "ILN4GZtK9jzjdM6iJqs8jW2H9iA3quae7IQ/Uj9YGuI8AQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNg=="
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp
index 9f019ec3ea4..bc16742db97 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/deleted_dof.exp
@@ -41,7 +41,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IA1EhBl4bAMRpwBAfspMUlheMXDdRpPabFf5kYVo0f0iAQAAAAAAAAA=",
+            "cursor": "IBMFqUAoZ6AUW4xVrtEtpZlwuIkPQEZ7u9CNvTShr0LXAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -49,7 +49,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x8b7a4e5de8ceeeddb9b4e52430b47dca2983db7713006cc11b89f82110824da3",
+                    "id": "0xdff2655760856dfe5976bd26ba6be1ba48884517f9995b8725cfec67246162a3",
                     "count": "0"
                   }
                 }
@@ -65,7 +65,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x8b7a4e5de8ceeeddb9b4e52430b47dca2983db7713006cc11b89f82110824da3",
+              "id": "0xdff2655760856dfe5976bd26ba6be1ba48884517f9995b8725cfec67246162a3",
               "count": "0"
             }
           }
@@ -77,7 +77,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IA1EhBl4bAMRpwBAfspMUlheMXDdRpPabFf5kYVo0f0iAQAAAAAAAAA=",
+            "cursor": "IBMFqUAoZ6AUW4xVrtEtpZlwuIkPQEZ7u9CNvTShr0LXAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -85,7 +85,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x8b7a4e5de8ceeeddb9b4e52430b47dca2983db7713006cc11b89f82110824da3",
+                    "id": "0xdff2655760856dfe5976bd26ba6be1ba48884517f9995b8725cfec67246162a3",
                     "count": "0"
                   }
                 }
@@ -101,7 +101,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x8b7a4e5de8ceeeddb9b4e52430b47dca2983db7713006cc11b89f82110824da3",
+              "id": "0xdff2655760856dfe5976bd26ba6be1ba48884517f9995b8725cfec67246162a3",
               "count": "0"
             }
           }
@@ -117,7 +117,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x8b7a4e5de8ceeeddb9b4e52430b47dca2983db7713006cc11b89f82110824da3",
+              "id": "0xdff2655760856dfe5976bd26ba6be1ba48884517f9995b8725cfec67246162a3",
               "count": "0"
             }
           }
@@ -168,7 +168,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x8b7a4e5de8ceeeddb9b4e52430b47dca2983db7713006cc11b89f82110824da3",
+              "id": "0xdff2655760856dfe5976bd26ba6be1ba48884517f9995b8725cfec67246162a3",
               "count": "0"
             }
           }
@@ -222,7 +222,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x8b7a4e5de8ceeeddb9b4e52430b47dca2983db7713006cc11b89f82110824da3",
+              "id": "0xdff2655760856dfe5976bd26ba6be1ba48884517f9995b8725cfec67246162a3",
               "count": "0"
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp
index 8b31f6f2e23..28ff4b62216 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer.exp
@@ -36,7 +36,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IPL2mUHNZndi8KKb0BbJ5okrrA2Sd7Pjqoc54aexBMrqAQAAAAAAAAA=",
+            "cursor": "IGhLXj7qJNgj1w1Fhf5TPul10b9WNMqiNoNUgcbzE1bEAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -44,7 +44,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0xda3988d0094e49477f5e2549f662ca03614505757c6b9427d04f1b10d88f2843",
+                    "id": "0x947c364d85ca002b1a7d8cf032d17c1c254281751c3faff8b3556435c85beac4",
                     "count": "0"
                   }
                 }
@@ -60,7 +60,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0xda3988d0094e49477f5e2549f662ca03614505757c6b9427d04f1b10d88f2843",
+              "id": "0x947c364d85ca002b1a7d8cf032d17c1c254281751c3faff8b3556435c85beac4",
               "count": "0"
             }
           }
@@ -71,7 +71,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IPL2mUHNZndi8KKb0BbJ5okrrA2Sd7Pjqoc54aexBMrqAQAAAAAAAAA=",
+            "cursor": "IGhLXj7qJNgj1w1Fhf5TPul10b9WNMqiNoNUgcbzE1bEAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -79,7 +79,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0xda3988d0094e49477f5e2549f662ca03614505757c6b9427d04f1b10d88f2843",
+                    "id": "0x947c364d85ca002b1a7d8cf032d17c1c254281751c3faff8b3556435c85beac4",
                     "count": "0"
                   }
                 }
@@ -95,7 +95,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0xda3988d0094e49477f5e2549f662ca03614505757c6b9427d04f1b10d88f2843",
+              "id": "0x947c364d85ca002b1a7d8cf032d17c1c254281751c3faff8b3556435c85beac4",
               "count": "0"
             }
           }
@@ -107,7 +107,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IPL2mUHNZndi8KKb0BbJ5okrrA2Sd7Pjqoc54aexBMrqAQAAAAAAAAA=",
+            "cursor": "IGhLXj7qJNgj1w1Fhf5TPul10b9WNMqiNoNUgcbzE1bEAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -115,7 +115,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0xda3988d0094e49477f5e2549f662ca03614505757c6b9427d04f1b10d88f2843",
+                    "id": "0x947c364d85ca002b1a7d8cf032d17c1c254281751c3faff8b3556435c85beac4",
                     "count": "0"
                   }
                 }
@@ -131,7 +131,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0xda3988d0094e49477f5e2549f662ca03614505757c6b9427d04f1b10d88f2843",
+              "id": "0x947c364d85ca002b1a7d8cf032d17c1c254281751c3faff8b3556435c85beac4",
               "count": "0"
             }
           }
@@ -184,7 +184,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0xda3988d0094e49477f5e2549f662ca03614505757c6b9427d04f1b10d88f2843",
+              "id": "0x947c364d85ca002b1a7d8cf032d17c1c254281751c3faff8b3556435c85beac4",
               "count": "0"
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp
index 6d27abdcdf6..d86ee4c05c5 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dof_add_reclaim_transfer_reclaim_add.exp
@@ -61,7 +61,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IEpDqte8MMXm9D9sJX7qPeGTan9IQM30pQBRTbguUkS8AQAAAAAAAAA=",
+            "cursor": "IC5by40oSQQFSyABq2JB+cvPp5S/YvrZnauBk4FhnNxAAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -69,7 +69,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x750bdfe96c8b93ebf267e6967b1cd9fbb2670234a4502ce6b340b25e331d5fd2",
+                    "id": "0x1414cd06e05dbeccaddc253f3f28e5840299b6f2d02936921e93618915a3164e",
                     "count": "0"
                   }
                 }
@@ -85,7 +85,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x750bdfe96c8b93ebf267e6967b1cd9fbb2670234a4502ce6b340b25e331d5fd2",
+              "id": "0x1414cd06e05dbeccaddc253f3f28e5840299b6f2d02936921e93618915a3164e",
               "count": "0"
             }
           }
@@ -96,7 +96,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IEpDqte8MMXm9D9sJX7qPeGTan9IQM30pQBRTbguUkS8AQAAAAAAAAA=",
+            "cursor": "IC5by40oSQQFSyABq2JB+cvPp5S/YvrZnauBk4FhnNxAAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -104,7 +104,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x750bdfe96c8b93ebf267e6967b1cd9fbb2670234a4502ce6b340b25e331d5fd2",
+                    "id": "0x1414cd06e05dbeccaddc253f3f28e5840299b6f2d02936921e93618915a3164e",
                     "count": "0"
                   }
                 }
@@ -120,7 +120,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x750bdfe96c8b93ebf267e6967b1cd9fbb2670234a4502ce6b340b25e331d5fd2",
+              "id": "0x1414cd06e05dbeccaddc253f3f28e5840299b6f2d02936921e93618915a3164e",
               "count": "0"
             }
           }
@@ -139,7 +139,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IEpDqte8MMXm9D9sJX7qPeGTan9IQM30pQBRTbguUkS8AQAAAAAAAAA=",
+            "cursor": "IC5by40oSQQFSyABq2JB+cvPp5S/YvrZnauBk4FhnNxAAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -147,7 +147,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x750bdfe96c8b93ebf267e6967b1cd9fbb2670234a4502ce6b340b25e331d5fd2",
+                    "id": "0x1414cd06e05dbeccaddc253f3f28e5840299b6f2d02936921e93618915a3164e",
                     "count": "0"
                   }
                 }
@@ -163,7 +163,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x750bdfe96c8b93ebf267e6967b1cd9fbb2670234a4502ce6b340b25e331d5fd2",
+              "id": "0x1414cd06e05dbeccaddc253f3f28e5840299b6f2d02936921e93618915a3164e",
               "count": "0"
             }
           }
@@ -182,7 +182,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IEpDqte8MMXm9D9sJX7qPeGTan9IQM30pQBRTbguUkS8AQAAAAAAAAA=",
+            "cursor": "IC5by40oSQQFSyABq2JB+cvPp5S/YvrZnauBk4FhnNxAAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -190,7 +190,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x750bdfe96c8b93ebf267e6967b1cd9fbb2670234a4502ce6b340b25e331d5fd2",
+                    "id": "0x1414cd06e05dbeccaddc253f3f28e5840299b6f2d02936921e93618915a3164e",
                     "count": "0"
                   }
                 }
@@ -206,7 +206,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x750bdfe96c8b93ebf267e6967b1cd9fbb2670234a4502ce6b340b25e331d5fd2",
+              "id": "0x1414cd06e05dbeccaddc253f3f28e5840299b6f2d02936921e93618915a3164e",
               "count": "0"
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp
index 39494890eb5..ef77d20ff2f 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp
@@ -84,7 +84,7 @@ task 9, lines 103-165:
 Response: {
   "data": {
     "parent_version_2_no_dof": {
-      "address": "0x60be7a7f1da5091f6e4ddb12a79b5856bdddbc028d44d93d233c6e7629620394",
+      "address": "0xd857324c3aaf0300219e499f58d4db682f85bf29929cf4df2d0ac4d04e8564ae",
       "dynamicFields": {
         "edges": []
       }
@@ -93,7 +93,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZAQAAAAAAAAA=",
+            "cursor": "ID2KzyyfU8mVfw2Mocil29aw67i+40kRmIYBftkmbGjmAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "pAEAAAAAAAA=",
@@ -104,7 +104,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
+                    "id": "0xb72102191dc66682b7bf98beb3ddb6b0540bdf525640c97463bb9000b154866b",
                     "count": "1"
                   }
                 }
@@ -115,13 +115,13 @@ Response: {
       }
     },
     "child_version_2_no_parent": {
-      "address": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
+      "address": "0xb72102191dc66682b7bf98beb3ddb6b0540bdf525640c97463bb9000b154866b",
       "owner": {}
     },
     "child_version_3_has_parent": {
       "owner": {
         "parent": {
-          "address": "0xd8572dd4abdf75099835ec3b50a736b19a03aaae5ebf8d61ca67c1b25e147919"
+          "address": "0x3d8acf2c9f53c9957f0d8ca1c8a5dbd6b0ebb8bee349119886017ed9266c68e6"
         }
       }
     }
@@ -173,63 +173,63 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IDzEFN9B3ECkQG8K2yQKsifDsla6P7K4kFscyi2JgF+rAgAAAAAAAAA=",
+            "cursor": "IBSfrXi9lZjyN9A1CH9v/2DfsppKQ1aOwnN0VjXo9sZkAgAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMQ==",
+                "bcs": "A2RmMg==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df1"
+                "json": "df2"
               }
             }
           },
           {
-            "cursor": "IEwGDnUGIlCGANYOgL6XOH2RuA/hlonX4jZQbJ8RchihAgAAAAAAAAA=",
+            "cursor": "ID2KzyyfU8mVfw2Mocil29aw67i+40kRmIYBftkmbGjmAgAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMw==",
+                "bcs": "pAEAAAAAAAA=",
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
+                  "repr": "u64"
                 }
               },
               "value": {
-                "json": "df3"
+                "contents": {
+                  "json": {
+                    "id": "0xb72102191dc66682b7bf98beb3ddb6b0540bdf525640c97463bb9000b154866b",
+                    "count": "2"
+                  }
+                }
               }
             }
           },
           {
-            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZAgAAAAAAAAA=",
+            "cursor": "IGsG93WeJ5vzD4eXXjB+JqygUNFWYkBY7Gb6vGnJq1A0AgAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "pAEAAAAAAAA=",
+                "bcs": "A2RmMQ==",
                 "type": {
-                  "repr": "u64"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "contents": {
-                  "json": {
-                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
-                    "count": "2"
-                  }
-                }
+                "json": "df1"
               }
             }
           },
           {
-            "cursor": "IOtYC4XoLnPt825JAKmqKPuFAUpW/nnVfPxQbiSYMQl+AgAAAAAAAAA=",
+            "cursor": "ILtJsyFyYxDGBWrsZEoNTb1MQBEAv02i5KI5wtglKZhIAgAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMg==",
+                "bcs": "A2RmMw==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df2"
+                "json": "df3"
               }
             }
           }
@@ -240,7 +240,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZAgAAAAAAAAA=",
+            "cursor": "ID2KzyyfU8mVfw2Mocil29aw67i+40kRmIYBftkmbGjmAgAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "pAEAAAAAAAA=",
@@ -251,7 +251,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
+                    "id": "0xb72102191dc66682b7bf98beb3ddb6b0540bdf525640c97463bb9000b154866b",
                     "count": "1"
                   }
                 }
@@ -270,16 +270,30 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IOtYC4XoLnPt825JAKmqKPuFAUpW/nnVfPxQbiSYMQl+AgAAAAAAAAA=",
+            "cursor": "IGsG93WeJ5vzD4eXXjB+JqygUNFWYkBY7Gb6vGnJq1A0AgAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMg==",
+                "bcs": "A2RmMQ==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df2"
+                "json": "df1"
+              }
+            }
+          },
+          {
+            "cursor": "ILtJsyFyYxDGBWrsZEoNTb1MQBEAv02i5KI5wtglKZhIAgAAAAAAAAA=",
+            "node": {
+              "name": {
+                "bcs": "A2RmMw==",
+                "type": {
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
+                }
+              },
+              "value": {
+                "json": "df3"
               }
             }
           }
@@ -314,7 +328,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
+              "id": "0xb72102191dc66682b7bf98beb3ddb6b0540bdf525640c97463bb9000b154866b",
               "count": "1"
             }
           }
@@ -333,7 +347,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
+              "id": "0xb72102191dc66682b7bf98beb3ddb6b0540bdf525640c97463bb9000b154866b",
               "count": "2"
             }
           }
@@ -398,63 +412,63 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IDzEFN9B3ECkQG8K2yQKsifDsla6P7K4kFscyi2JgF+rAwAAAAAAAAA=",
+            "cursor": "IBSfrXi9lZjyN9A1CH9v/2DfsppKQ1aOwnN0VjXo9sZkAwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMQ==",
+                "bcs": "A2RmMg==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df1"
+                "json": "df2"
               }
             }
           },
           {
-            "cursor": "IEwGDnUGIlCGANYOgL6XOH2RuA/hlonX4jZQbJ8RchihAwAAAAAAAAA=",
+            "cursor": "ID2KzyyfU8mVfw2Mocil29aw67i+40kRmIYBftkmbGjmAwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMw==",
+                "bcs": "pAEAAAAAAAA=",
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
+                  "repr": "u64"
                 }
               },
               "value": {
-                "json": "df3"
+                "contents": {
+                  "json": {
+                    "id": "0xb72102191dc66682b7bf98beb3ddb6b0540bdf525640c97463bb9000b154866b",
+                    "count": "2"
+                  }
+                }
               }
             }
           },
           {
-            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZAwAAAAAAAAA=",
+            "cursor": "IGsG93WeJ5vzD4eXXjB+JqygUNFWYkBY7Gb6vGnJq1A0AwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "pAEAAAAAAAA=",
+                "bcs": "A2RmMQ==",
                 "type": {
-                  "repr": "u64"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "contents": {
-                  "json": {
-                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
-                    "count": "2"
-                  }
-                }
+                "json": "df1"
               }
             }
           },
           {
-            "cursor": "IOtYC4XoLnPt825JAKmqKPuFAUpW/nnVfPxQbiSYMQl+AwAAAAAAAAA=",
+            "cursor": "ILtJsyFyYxDGBWrsZEoNTb1MQBEAv02i5KI5wtglKZhIAwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMg==",
+                "bcs": "A2RmMw==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df2"
+                "json": "df3"
               }
             }
           }
@@ -465,69 +479,69 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IOtYC4XoLnPt825JAKmqKPuFAUpW/nnVfPxQbiSYMQl+AgAAAAAAAAA=",
+            "cursor": "IGsG93WeJ5vzD4eXXjB+JqygUNFWYkBY7Gb6vGnJq1A0AgAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMg==",
+                "bcs": "A2RmMQ==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df2"
+                "json": "df1"
               }
             }
-          }
-        ]
-      }
-    },
-    "parent_version_5_has_7_children": {
-      "dynamicFields": {
-        "edges": [
+          },
           {
-            "cursor": "IB9QurFrTWzZVemvNjgfBkIBf6HE3l1NNXL3eJc63v/DAwAAAAAAAAA=",
+            "cursor": "ILtJsyFyYxDGBWrsZEoNTb1MQBEAv02i5KI5wtglKZhIAgAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNA==",
+                "bcs": "A2RmMw==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df4"
+                "json": "df3"
               }
             }
-          },
+          }
+        ]
+      }
+    },
+    "parent_version_5_has_7_children": {
+      "dynamicFields": {
+        "edges": [
           {
-            "cursor": "IDzEFN9B3ECkQG8K2yQKsifDsla6P7K4kFscyi2JgF+rAwAAAAAAAAA=",
+            "cursor": "IBSfrXi9lZjyN9A1CH9v/2DfsppKQ1aOwnN0VjXo9sZkAwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMQ==",
+                "bcs": "A2RmMg==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df1"
+                "json": "df2"
               }
             }
           },
           {
-            "cursor": "IEwGDnUGIlCGANYOgL6XOH2RuA/hlonX4jZQbJ8RchihAwAAAAAAAAA=",
+            "cursor": "IBwOIU5Pl0oBnGhMGYJDHVPodOHNRUlWAaVPfSr3Zxy7AwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMw==",
+                "bcs": "A2RmNQ==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df3"
+                "json": "df5"
               }
             }
           },
           {
-            "cursor": "IMFZpg+IfFUNghSJHk2PR5wzAvgmr2XPePnUl6zF0FHsAwAAAAAAAAA=",
+            "cursor": "IDqEKcEoRAJoWgdeCqJTMNHAJ6OKbroYxX7ujVpIbfnfAwAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNg==",
@@ -541,7 +555,7 @@ Response: {
             }
           },
           {
-            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZAwAAAAAAAAA=",
+            "cursor": "ID2KzyyfU8mVfw2Mocil29aw67i+40kRmIYBftkmbGjmAwAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "pAEAAAAAAAA=",
@@ -552,7 +566,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
+                    "id": "0xb72102191dc66682b7bf98beb3ddb6b0540bdf525640c97463bb9000b154866b",
                     "count": "2"
                   }
                 }
@@ -560,30 +574,44 @@ Response: {
             }
           },
           {
-            "cursor": "IOtYC4XoLnPt825JAKmqKPuFAUpW/nnVfPxQbiSYMQl+AwAAAAAAAAA=",
+            "cursor": "IGsG93WeJ5vzD4eXXjB+JqygUNFWYkBY7Gb6vGnJq1A0AwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMg==",
+                "bcs": "A2RmMQ==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df2"
+                "json": "df1"
               }
             }
           },
           {
-            "cursor": "IPwbo52Y1Aumkk+Ko3+RTpl16x+vZqYFKC4WadnGzxR2AwAAAAAAAAA=",
+            "cursor": "IKbnqIiar0EZzE0LPb4aZWQP+Y2mJDUikwdZQJ9BpAIXAwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNQ==",
+                "bcs": "A2RmNA==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df5"
+                "json": "df4"
+              }
+            }
+          },
+          {
+            "cursor": "ILtJsyFyYxDGBWrsZEoNTb1MQBEAv02i5KI5wtglKZhIAwAAAAAAAAA=",
+            "node": {
+              "name": {
+                "bcs": "A2RmMw==",
+                "type": {
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
+                }
+              },
+              "value": {
+                "json": "df3"
               }
             }
           }
@@ -594,30 +622,44 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IOtYC4XoLnPt825JAKmqKPuFAUpW/nnVfPxQbiSYMQl+AwAAAAAAAAA=",
+            "cursor": "IGsG93WeJ5vzD4eXXjB+JqygUNFWYkBY7Gb6vGnJq1A0AwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMg==",
+                "bcs": "A2RmMQ==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df2"
+                "json": "df1"
               }
             }
           },
           {
-            "cursor": "IPwbo52Y1Aumkk+Ko3+RTpl16x+vZqYFKC4WadnGzxR2AwAAAAAAAAA=",
+            "cursor": "IKbnqIiar0EZzE0LPb4aZWQP+Y2mJDUikwdZQJ9BpAIXAwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNQ==",
+                "bcs": "A2RmNA==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df5"
+                "json": "df4"
+              }
+            }
+          },
+          {
+            "cursor": "ILtJsyFyYxDGBWrsZEoNTb1MQBEAv02i5KI5wtglKZhIAwAAAAAAAAA=",
+            "node": {
+              "name": {
+                "bcs": "A2RmMw==",
+                "type": {
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
+                }
+              },
+              "value": {
+                "json": "df3"
               }
             }
           }
@@ -671,63 +713,63 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IDzEFN9B3ECkQG8K2yQKsifDsla6P7K4kFscyi2JgF+rBAAAAAAAAAA=",
+            "cursor": "IBSfrXi9lZjyN9A1CH9v/2DfsppKQ1aOwnN0VjXo9sZkBAAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMQ==",
+                "bcs": "A2RmMg==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df1"
+                "json": "df2"
               }
             }
           },
           {
-            "cursor": "IEwGDnUGIlCGANYOgL6XOH2RuA/hlonX4jZQbJ8RchihBAAAAAAAAAA=",
+            "cursor": "ID2KzyyfU8mVfw2Mocil29aw67i+40kRmIYBftkmbGjmBAAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMw==",
+                "bcs": "pAEAAAAAAAA=",
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
+                  "repr": "u64"
                 }
               },
               "value": {
-                "json": "df3"
+                "contents": {
+                  "json": {
+                    "id": "0xb72102191dc66682b7bf98beb3ddb6b0540bdf525640c97463bb9000b154866b",
+                    "count": "2"
+                  }
+                }
               }
             }
           },
           {
-            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZBAAAAAAAAAA=",
+            "cursor": "IGsG93WeJ5vzD4eXXjB+JqygUNFWYkBY7Gb6vGnJq1A0BAAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "pAEAAAAAAAA=",
+                "bcs": "A2RmMQ==",
                 "type": {
-                  "repr": "u64"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "contents": {
-                  "json": {
-                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
-                    "count": "2"
-                  }
-                }
+                "json": "df1"
               }
             }
           },
           {
-            "cursor": "IOtYC4XoLnPt825JAKmqKPuFAUpW/nnVfPxQbiSYMQl+BAAAAAAAAAA=",
+            "cursor": "ILtJsyFyYxDGBWrsZEoNTb1MQBEAv02i5KI5wtglKZhIBAAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMg==",
+                "bcs": "A2RmMw==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df2"
+                "json": "df3"
               }
             }
           }
@@ -738,16 +780,30 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IOtYC4XoLnPt825JAKmqKPuFAUpW/nnVfPxQbiSYMQl+AgAAAAAAAAA=",
+            "cursor": "IGsG93WeJ5vzD4eXXjB+JqygUNFWYkBY7Gb6vGnJq1A0AgAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMg==",
+                "bcs": "A2RmMQ==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df2"
+                "json": "df1"
+              }
+            }
+          },
+          {
+            "cursor": "ILtJsyFyYxDGBWrsZEoNTb1MQBEAv02i5KI5wtglKZhIAgAAAAAAAAA=",
+            "node": {
+              "name": {
+                "bcs": "A2RmMw==",
+                "type": {
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
+                }
+              },
+              "value": {
+                "json": "df3"
               }
             }
           }
@@ -758,21 +814,21 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IB9QurFrTWzZVemvNjgfBkIBf6HE3l1NNXL3eJc63v/DBAAAAAAAAAA=",
+            "cursor": "IBwOIU5Pl0oBnGhMGYJDHVPodOHNRUlWAaVPfSr3Zxy7BAAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNA==",
+                "bcs": "A2RmNQ==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df4"
+                "json": "df5"
               }
             }
           },
           {
-            "cursor": "IMFZpg+IfFUNghSJHk2PR5wzAvgmr2XPePnUl6zF0FHsBAAAAAAAAAA=",
+            "cursor": "IDqEKcEoRAJoWgdeCqJTMNHAJ6OKbroYxX7ujVpIbfnfBAAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNg==",
@@ -786,7 +842,7 @@ Response: {
             }
           },
           {
-            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZBAAAAAAAAAA=",
+            "cursor": "ID2KzyyfU8mVfw2Mocil29aw67i+40kRmIYBftkmbGjmBAAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "pAEAAAAAAAA=",
@@ -797,7 +853,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
+                    "id": "0xb72102191dc66682b7bf98beb3ddb6b0540bdf525640c97463bb9000b154866b",
                     "count": "2"
                   }
                 }
@@ -805,16 +861,16 @@ Response: {
             }
           },
           {
-            "cursor": "IPwbo52Y1Aumkk+Ko3+RTpl16x+vZqYFKC4WadnGzxR2BAAAAAAAAAA=",
+            "cursor": "IKbnqIiar0EZzE0LPb4aZWQP+Y2mJDUikwdZQJ9BpAIXBAAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNQ==",
+                "bcs": "A2RmNA==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df5"
+                "json": "df4"
               }
             }
           }
@@ -825,16 +881,16 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IPwbo52Y1Aumkk+Ko3+RTpl16x+vZqYFKC4WadnGzxR2BAAAAAAAAAA=",
+            "cursor": "IKbnqIiar0EZzE0LPb4aZWQP+Y2mJDUikwdZQJ9BpAIXBAAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNQ==",
+                "bcs": "A2RmNA==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df5"
+                "json": "df4"
               }
             }
           }
@@ -891,7 +947,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZBwAAAAAAAAA=",
+            "cursor": "ID2KzyyfU8mVfw2Mocil29aw67i+40kRmIYBftkmbGjmBwAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "pAEAAAAAAAA=",
@@ -902,7 +958,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
+                    "id": "0xb72102191dc66682b7bf98beb3ddb6b0540bdf525640c97463bb9000b154866b",
                     "count": "2"
                   }
                 }
@@ -917,21 +973,21 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IB9QurFrTWzZVemvNjgfBkIBf6HE3l1NNXL3eJc63v/DBwAAAAAAAAA=",
+            "cursor": "IBwOIU5Pl0oBnGhMGYJDHVPodOHNRUlWAaVPfSr3Zxy7BwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNA==",
+                "bcs": "A2RmNQ==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df4"
+                "json": "df5"
               }
             }
           },
           {
-            "cursor": "IMFZpg+IfFUNghSJHk2PR5wzAvgmr2XPePnUl6zF0FHsBwAAAAAAAAA=",
+            "cursor": "IDqEKcEoRAJoWgdeCqJTMNHAJ6OKbroYxX7ujVpIbfnfBwAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmNg==",
@@ -945,7 +1001,7 @@ Response: {
             }
           },
           {
-            "cursor": "INhXLdSr33UJmDXsO1CnNrGaA6quXr+NYcpnwbJeFHkZBwAAAAAAAAA=",
+            "cursor": "ID2KzyyfU8mVfw2Mocil29aw67i+40kRmIYBftkmbGjmBwAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "pAEAAAAAAAA=",
@@ -956,7 +1012,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0xab475b045780dd6238ca186d2edebaf529a7b5479e4bf002b6553b35465dbcb6",
+                    "id": "0xb72102191dc66682b7bf98beb3ddb6b0540bdf525640c97463bb9000b154866b",
                     "count": "2"
                   }
                 }
@@ -964,16 +1020,16 @@ Response: {
             }
           },
           {
-            "cursor": "IPwbo52Y1Aumkk+Ko3+RTpl16x+vZqYFKC4WadnGzxR2BwAAAAAAAAA=",
+            "cursor": "IKbnqIiar0EZzE0LPb4aZWQP+Y2mJDUikwdZQJ9BpAIXBwAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNQ==",
+                "bcs": "A2RmNA==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df5"
+                "json": "df4"
               }
             }
           }
@@ -984,16 +1040,16 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IPwbo52Y1Aumkk+Ko3+RTpl16x+vZqYFKC4WadnGzxR2BAAAAAAAAAA=",
+            "cursor": "IKbnqIiar0EZzE0LPb4aZWQP+Y2mJDUikwdZQJ9BpAIXBAAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmNQ==",
+                "bcs": "A2RmNA==",
                 "type": {
                   "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
                 }
               },
               "value": {
-                "json": "df5"
+                "json": "df4"
               }
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp
index f3d90d2efc7..b2ccf3a268e 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/immutable_dof.exp
@@ -58,11 +58,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0x08c10075296bcba84370c1799c63e11e7f73cf4a96a244ea7a0cfe8e51c45e49",
+              "address": "0x7213d8b54baa510ebfbe8f8c80900a9645f88d5c3316950c3ff20c6c9c41b10e",
               "version": 5,
               "contents": {
                 "json": {
-                  "id": "0x08c10075296bcba84370c1799c63e11e7f73cf4a96a244ea7a0cfe8e51c45e49",
+                  "id": "0x7213d8b54baa510ebfbe8f8c80900a9645f88d5c3316950c3ff20c6c9c41b10e",
                   "count": "0"
                 }
               },
@@ -86,11 +86,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0x08c10075296bcba84370c1799c63e11e7f73cf4a96a244ea7a0cfe8e51c45e49",
+              "address": "0x7213d8b54baa510ebfbe8f8c80900a9645f88d5c3316950c3ff20c6c9c41b10e",
               "version": 5,
               "contents": {
                 "json": {
-                  "id": "0x08c10075296bcba84370c1799c63e11e7f73cf4a96a244ea7a0cfe8e51c45e49",
+                  "id": "0x7213d8b54baa510ebfbe8f8c80900a9645f88d5c3316950c3ff20c6c9c41b10e",
                   "count": "0"
                 }
               },
@@ -98,11 +98,11 @@ Response: {
                 "nodes": [
                   {
                     "value": {
-                      "address": "0x2a1dafe2d5bf291dfff18e859e02aff0ec2a03579e46a25072172ac0fded6049",
+                      "address": "0x14e0fbb3261eb9c70e262159994b0ab0808675ad1a02a226461b16e9349d5a28",
                       "version": 6,
                       "contents": {
                         "json": {
-                          "id": "0x2a1dafe2d5bf291dfff18e859e02aff0ec2a03579e46a25072172ac0fded6049",
+                          "id": "0x14e0fbb3261eb9c70e262159994b0ab0808675ad1a02a226461b16e9349d5a28",
                           "count": "0"
                         }
                       }
@@ -145,7 +145,7 @@ Response: {
     "object": {
       "owner": {
         "parent": {
-          "address": "0x7c3dc401104116ddde6c75b8862a97b87af54b531a17c640a4153fd9f3c83c9b"
+          "address": "0xae88d15fa632e40b9289a65f52d3d882bb05fd692a07db3e47012fff03ed48d4"
         }
       },
       "dynamicFields": {
@@ -175,11 +175,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0x2a1dafe2d5bf291dfff18e859e02aff0ec2a03579e46a25072172ac0fded6049",
+              "address": "0x14e0fbb3261eb9c70e262159994b0ab0808675ad1a02a226461b16e9349d5a28",
               "version": 6,
               "contents": {
                 "json": {
-                  "id": "0x2a1dafe2d5bf291dfff18e859e02aff0ec2a03579e46a25072172ac0fded6049",
+                  "id": "0x14e0fbb3261eb9c70e262159994b0ab0808675ad1a02a226461b16e9349d5a28",
                   "count": "0"
                 }
               }
@@ -203,11 +203,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0x2a1dafe2d5bf291dfff18e859e02aff0ec2a03579e46a25072172ac0fded6049",
+              "address": "0x14e0fbb3261eb9c70e262159994b0ab0808675ad1a02a226461b16e9349d5a28",
               "version": 6,
               "contents": {
                 "json": {
-                  "id": "0x2a1dafe2d5bf291dfff18e859e02aff0ec2a03579e46a25072172ac0fded6049",
+                  "id": "0x14e0fbb3261eb9c70e262159994b0ab0808675ad1a02a226461b16e9349d5a28",
                   "count": "0"
                 }
               }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp
index ce7edf0cfdb..886f9bfcf6a 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_df.exp
@@ -78,18 +78,18 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "ICe/3d5bmdNSWm8HQp4OxIS7myv6vR81PK4q+d/aVCarAQAAAAAAAAA=",
+            "cursor": "IF+A8WqX5cd5PnNIVrmGwDtS/oZTXCbVe5lii8ef5BxYAQAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMw=="
+                "bcs": "A2RmMQ=="
               },
               "value": {
-                "json": "df3"
+                "json": "df1"
               }
             }
           },
           {
-            "cursor": "INHtV7blivGUlH8ge+Ot0HNdhxQmu6S1+isPP7QdqKAWAQAAAAAAAAA=",
+            "cursor": "IJdRlozkqQqyNizjStV8brWmL0xQuwKcL6q4h6y9KxZEAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmMg=="
@@ -100,13 +100,13 @@ Response: {
             }
           },
           {
-            "cursor": "IOcMMTSl7NjohGrXGa14tjW96DwzsRpcYL1M8mD9D1HHAQAAAAAAAAA=",
+            "cursor": "INYQH9O+D1CqZWFE6qfQEbFCbdp0j1L48G3YSzKVAvVLAQAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMQ=="
+                "bcs": "A2RmMw=="
               },
               "value": {
-                "json": "df1"
+                "json": "df3"
               }
             }
           }
@@ -154,7 +154,7 @@ Contents: Test::M1::Parent {
 
 task 11, line 114:
 //# run Test::M1::mutate_df1 --sender A --args object(2,0)
-mutated: object(0,0), object(2,0), object(4,2)
+mutated: object(0,0), object(2,0), object(4,0)
 gas summary: computation_cost: 1000000, storage_cost: 4484000,  storage_rebate: 4423200, non_refundable_storage_fee: 0
 
 task 12, line 116:
@@ -201,18 +201,18 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "ICe/3d5bmdNSWm8HQp4OxIS7myv6vR81PK4q+d/aVCarAgAAAAAAAAA=",
+            "cursor": "IF+A8WqX5cd5PnNIVrmGwDtS/oZTXCbVe5lii8ef5BxYAgAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMw=="
+                "bcs": "A2RmMQ=="
               },
               "value": {
-                "json": "df3"
+                "json": "df1_mutated"
               }
             }
           },
           {
-            "cursor": "INHtV7blivGUlH8ge+Ot0HNdhxQmu6S1+isPP7QdqKAWAgAAAAAAAAA=",
+            "cursor": "IJdRlozkqQqyNizjStV8brWmL0xQuwKcL6q4h6y9KxZEAgAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "A2RmMg=="
@@ -223,13 +223,13 @@ Response: {
             }
           },
           {
-            "cursor": "IOcMMTSl7NjohGrXGa14tjW96DwzsRpcYL1M8mD9D1HHAgAAAAAAAAA=",
+            "cursor": "INYQH9O+D1CqZWFE6qfQEbFCbdp0j1L48G3YSzKVAvVLAgAAAAAAAAA=",
             "node": {
               "name": {
-                "bcs": "A2RmMQ=="
+                "bcs": "A2RmMw=="
               },
               "value": {
-                "json": "df1_mutated"
+                "json": "df3"
               }
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp
index ecb76d12619..10623b08340 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/mutated_dof.exp
@@ -41,7 +41,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IAkFcqaAXUWzkycpRLV7Z8BH6EenW5e+vB8/QtNZB+11AQAAAAAAAAA=",
+            "cursor": "IKN28qi03eNC5aqxFGWPLKfMRyuM8ocgJW+I5dsX7GnRAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -49,7 +49,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
+                    "id": "0x8e7dab2248fd42c115f3d1be99df937fbe159d92633f8df9293234a3c2bc37cb",
                     "count": "0"
                   }
                 }
@@ -65,7 +65,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
+              "id": "0x8e7dab2248fd42c115f3d1be99df937fbe159d92633f8df9293234a3c2bc37cb",
               "count": "0"
             }
           }
@@ -77,7 +77,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IAkFcqaAXUWzkycpRLV7Z8BH6EenW5e+vB8/QtNZB+11AQAAAAAAAAA=",
+            "cursor": "IKN28qi03eNC5aqxFGWPLKfMRyuM8ocgJW+I5dsX7GnRAQAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -85,7 +85,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
+                    "id": "0x8e7dab2248fd42c115f3d1be99df937fbe159d92633f8df9293234a3c2bc37cb",
                     "count": "0"
                   }
                 }
@@ -101,7 +101,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
+              "id": "0x8e7dab2248fd42c115f3d1be99df937fbe159d92633f8df9293234a3c2bc37cb",
               "count": "0"
             }
           }
@@ -117,7 +117,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
+              "id": "0x8e7dab2248fd42c115f3d1be99df937fbe159d92633f8df9293234a3c2bc37cb",
               "count": "0"
             }
           }
@@ -168,7 +168,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
+              "id": "0x8e7dab2248fd42c115f3d1be99df937fbe159d92633f8df9293234a3c2bc37cb",
               "count": "0"
             }
           }
@@ -202,7 +202,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IAkFcqaAXUWzkycpRLV7Z8BH6EenW5e+vB8/QtNZB+11AwAAAAAAAAA=",
+            "cursor": "IKN28qi03eNC5aqxFGWPLKfMRyuM8ocgJW+I5dsX7GnRAwAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -210,7 +210,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
+                    "id": "0x8e7dab2248fd42c115f3d1be99df937fbe159d92633f8df9293234a3c2bc37cb",
                     "count": "1"
                   }
                 }
@@ -226,7 +226,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
+              "id": "0x8e7dab2248fd42c115f3d1be99df937fbe159d92633f8df9293234a3c2bc37cb",
               "count": "1"
             }
           }
@@ -238,7 +238,7 @@ Response: {
       "dynamicFields": {
         "edges": [
           {
-            "cursor": "IAkFcqaAXUWzkycpRLV7Z8BH6EenW5e+vB8/QtNZB+11AwAAAAAAAAA=",
+            "cursor": "IKN28qi03eNC5aqxFGWPLKfMRyuM8ocgJW+I5dsX7GnRAwAAAAAAAAA=",
             "node": {
               "name": {
                 "bcs": "KgAAAAAAAAA="
@@ -246,7 +246,7 @@ Response: {
               "value": {
                 "contents": {
                   "json": {
-                    "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
+                    "id": "0x8e7dab2248fd42c115f3d1be99df937fbe159d92633f8df9293234a3c2bc37cb",
                     "count": "1"
                   }
                 }
@@ -262,7 +262,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
+              "id": "0x8e7dab2248fd42c115f3d1be99df937fbe159d92633f8df9293234a3c2bc37cb",
               "count": "1"
             }
           }
@@ -283,7 +283,7 @@ Response: {
         "value": {
           "contents": {
             "json": {
-              "id": "0x2af91b532c1e69309c25ae3cb9a81b5741d5c8ed5d91137e5e0cc98e12e2d996",
+              "id": "0x8e7dab2248fd42c115f3d1be99df937fbe159d92633f8df9293234a3c2bc37cb",
               "count": "0"
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp
index 6349cba3f17..943dc81e90b 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/dynamic_fields/nested_dof.exp
@@ -62,11 +62,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0xa021c1b8a3e22d34befa5887683f44f29939faf90d3512c0a8b4047e0e14417f",
+              "address": "0x7cdd23cf6ffe2b061504cf7d619e6e293db4f09f1feed0c829bcdb28bd19cecc",
               "version": 5,
               "contents": {
                 "json": {
-                  "id": "0xa021c1b8a3e22d34befa5887683f44f29939faf90d3512c0a8b4047e0e14417f",
+                  "id": "0x7cdd23cf6ffe2b061504cf7d619e6e293db4f09f1feed0c829bcdb28bd19cecc",
                   "count": "0"
                 }
               },
@@ -90,11 +90,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0xa021c1b8a3e22d34befa5887683f44f29939faf90d3512c0a8b4047e0e14417f",
+              "address": "0x7cdd23cf6ffe2b061504cf7d619e6e293db4f09f1feed0c829bcdb28bd19cecc",
               "version": 5,
               "contents": {
                 "json": {
-                  "id": "0xa021c1b8a3e22d34befa5887683f44f29939faf90d3512c0a8b4047e0e14417f",
+                  "id": "0x7cdd23cf6ffe2b061504cf7d619e6e293db4f09f1feed0c829bcdb28bd19cecc",
                   "count": "0"
                 }
               },
@@ -102,11 +102,11 @@ Response: {
                 "nodes": [
                   {
                     "value": {
-                      "address": "0x3584d0e9ad4fc3d96fba22aa7c0deeb055f7219f9a9bfe2e1382ae7a65117a92",
+                      "address": "0x5f299c6eea97e6799f66501a7844fe3a9bc9f8f64792fd4442a5359c5465d1a4",
                       "version": 6,
                       "contents": {
                         "json": {
-                          "id": "0x3584d0e9ad4fc3d96fba22aa7c0deeb055f7219f9a9bfe2e1382ae7a65117a92",
+                          "id": "0x5f299c6eea97e6799f66501a7844fe3a9bc9f8f64792fd4442a5359c5465d1a4",
                           "count": "0"
                         }
                       }
@@ -131,11 +131,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0xa021c1b8a3e22d34befa5887683f44f29939faf90d3512c0a8b4047e0e14417f",
+              "address": "0x7cdd23cf6ffe2b061504cf7d619e6e293db4f09f1feed0c829bcdb28bd19cecc",
               "version": 7,
               "contents": {
                 "json": {
-                  "id": "0xa021c1b8a3e22d34befa5887683f44f29939faf90d3512c0a8b4047e0e14417f",
+                  "id": "0x7cdd23cf6ffe2b061504cf7d619e6e293db4f09f1feed0c829bcdb28bd19cecc",
                   "count": "1"
                 }
               },
@@ -143,11 +143,11 @@ Response: {
                 "nodes": [
                   {
                     "value": {
-                      "address": "0x3584d0e9ad4fc3d96fba22aa7c0deeb055f7219f9a9bfe2e1382ae7a65117a92",
+                      "address": "0x5f299c6eea97e6799f66501a7844fe3a9bc9f8f64792fd4442a5359c5465d1a4",
                       "version": 6,
                       "contents": {
                         "json": {
-                          "id": "0x3584d0e9ad4fc3d96fba22aa7c0deeb055f7219f9a9bfe2e1382ae7a65117a92",
+                          "id": "0x5f299c6eea97e6799f66501a7844fe3a9bc9f8f64792fd4442a5359c5465d1a4",
                           "count": "0"
                         }
                       }
@@ -172,11 +172,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0xa021c1b8a3e22d34befa5887683f44f29939faf90d3512c0a8b4047e0e14417f",
+              "address": "0x7cdd23cf6ffe2b061504cf7d619e6e293db4f09f1feed0c829bcdb28bd19cecc",
               "version": 7,
               "contents": {
                 "json": {
-                  "id": "0xa021c1b8a3e22d34befa5887683f44f29939faf90d3512c0a8b4047e0e14417f",
+                  "id": "0x7cdd23cf6ffe2b061504cf7d619e6e293db4f09f1feed0c829bcdb28bd19cecc",
                   "count": "1"
                 }
               },
@@ -184,11 +184,11 @@ Response: {
                 "nodes": [
                   {
                     "value": {
-                      "address": "0x3584d0e9ad4fc3d96fba22aa7c0deeb055f7219f9a9bfe2e1382ae7a65117a92",
+                      "address": "0x5f299c6eea97e6799f66501a7844fe3a9bc9f8f64792fd4442a5359c5465d1a4",
                       "version": 8,
                       "contents": {
                         "json": {
-                          "id": "0x3584d0e9ad4fc3d96fba22aa7c0deeb055f7219f9a9bfe2e1382ae7a65117a92",
+                          "id": "0x5f299c6eea97e6799f66501a7844fe3a9bc9f8f64792fd4442a5359c5465d1a4",
                           "count": "1"
                         }
                       }
@@ -233,11 +233,11 @@ Response: {
         "nodes": [
           {
             "value": {
-              "address": "0x3584d0e9ad4fc3d96fba22aa7c0deeb055f7219f9a9bfe2e1382ae7a65117a92",
+              "address": "0x5f299c6eea97e6799f66501a7844fe3a9bc9f8f64792fd4442a5359c5465d1a4",
               "version": 6,
               "contents": {
                 "json": {
-                  "id": "0x3584d0e9ad4fc3d96fba22aa7c0deeb055f7219f9a9bfe2e1382ae7a65117a92",
+                  "id": "0x5f299c6eea97e6799f66501a7844fe3a9bc9f8f64792fd4442a5359c5465d1a4",
                   "count": "0"
                 }
               }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp b/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp
index 839c1846d40..239a0f67257 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp
@@ -41,19 +41,19 @@ Response: {
           {
             "cursor": "eyJjIjozLCJ0IjowLCJpIjpmYWxzZX0",
             "node": {
-              "digest": "BK3Kekkcdo6pkxFkib2gWaw7ozbTd1P9GFJf1Gdkk4Tw"
+              "digest": "4pDtmR9vkzE8azKseWj5VXQQiz7616KJAGftpBncdmnF"
             }
           },
           {
             "cursor": "eyJjIjozLCJ0IjoxLCJpIjpmYWxzZX0",
             "node": {
-              "digest": "DkwkZiCC7skJSfsXTPQEzRXkXYC7PVT7XWi2vRJqsAfq"
+              "digest": "GUKReG1RoqowmWq3yRJNwHJFiUtCARZnmiccRaBtCi98"
             }
           },
           {
             "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
             "node": {
-              "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H"
+              "digest": "ARW7Huh9GW72bMvDoEUY2BQkU2TbgkJeuCtk538E65ud"
             }
           },
           {
@@ -154,19 +154,19 @@ Response: {
           {
             "cursor": "eyJjIjoxMiwidCI6MCwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "BK3Kekkcdo6pkxFkib2gWaw7ozbTd1P9GFJf1Gdkk4Tw"
+              "digest": "4pDtmR9vkzE8azKseWj5VXQQiz7616KJAGftpBncdmnF"
             }
           },
           {
             "cursor": "eyJjIjoxMiwidCI6MSwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "DkwkZiCC7skJSfsXTPQEzRXkXYC7PVT7XWi2vRJqsAfq"
+              "digest": "GUKReG1RoqowmWq3yRJNwHJFiUtCARZnmiccRaBtCi98"
             }
           },
           {
             "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H"
+              "digest": "ARW7Huh9GW72bMvDoEUY2BQkU2TbgkJeuCtk538E65ud"
             }
           },
           {
@@ -183,19 +183,19 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjowLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "BK3Kekkcdo6pkxFkib2gWaw7ozbTd1P9GFJf1Gdkk4Tw"
+            "digest": "4pDtmR9vkzE8azKseWj5VXQQiz7616KJAGftpBncdmnF"
           }
         },
         {
           "cursor": "eyJjIjo0LCJ0IjoxLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "DkwkZiCC7skJSfsXTPQEzRXkXYC7PVT7XWi2vRJqsAfq"
+            "digest": "GUKReG1RoqowmWq3yRJNwHJFiUtCARZnmiccRaBtCi98"
           }
         },
         {
           "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H"
+            "digest": "ARW7Huh9GW72bMvDoEUY2BQkU2TbgkJeuCtk538E65ud"
           }
         }
       ]
@@ -207,19 +207,19 @@ Response: {
           {
             "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "2rBdnEwKTdVy95JSVPD9z2xLFWUpkCtqQvuByXTYA7tG"
+              "digest": "Ay1h3NAkKnrkUif97h8ra2cf8ZyXzQvxUrJp7eaN89cV"
             }
           },
           {
             "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "HWTSUrHn5zbMcP2aixY3vhtjyyP4GnZUBbqKDoVjpd53"
+              "digest": "CaWJtdWxxV8QcJyNnX8hnKRxeZsDTwNbRd3MHdRAnswP"
             }
           },
           {
             "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "2HmXBYuoPVLZB55KPw2wtbkrq1VRAGHrXKVCzUieuaHJ"
+              "digest": "8ThoJwqQb8Qfk6FCa4rm3ZaGZXPQNRJV5Q9juj1MKRPV"
             }
           },
           {
@@ -236,19 +236,19 @@ Response: {
         {
           "cursor": "eyJjIjo4LCJ0IjowLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "BK3Kekkcdo6pkxFkib2gWaw7ozbTd1P9GFJf1Gdkk4Tw"
+            "digest": "4pDtmR9vkzE8azKseWj5VXQQiz7616KJAGftpBncdmnF"
           }
         },
         {
           "cursor": "eyJjIjo4LCJ0IjoxLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "DkwkZiCC7skJSfsXTPQEzRXkXYC7PVT7XWi2vRJqsAfq"
+            "digest": "GUKReG1RoqowmWq3yRJNwHJFiUtCARZnmiccRaBtCi98"
           }
         },
         {
           "cursor": "eyJjIjo4LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H"
+            "digest": "ARW7Huh9GW72bMvDoEUY2BQkU2TbgkJeuCtk538E65ud"
           }
         },
         {
@@ -260,19 +260,19 @@ Response: {
         {
           "cursor": "eyJjIjo4LCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "2rBdnEwKTdVy95JSVPD9z2xLFWUpkCtqQvuByXTYA7tG"
+            "digest": "Ay1h3NAkKnrkUif97h8ra2cf8ZyXzQvxUrJp7eaN89cV"
           }
         },
         {
           "cursor": "eyJjIjo4LCJ0Ijo1LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "HWTSUrHn5zbMcP2aixY3vhtjyyP4GnZUBbqKDoVjpd53"
+            "digest": "CaWJtdWxxV8QcJyNnX8hnKRxeZsDTwNbRd3MHdRAnswP"
           }
         },
         {
           "cursor": "eyJjIjo4LCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "2HmXBYuoPVLZB55KPw2wtbkrq1VRAGHrXKVCzUieuaHJ"
+            "digest": "8ThoJwqQb8Qfk6FCa4rm3ZaGZXPQNRJV5Q9juj1MKRPV"
           }
         }
       ]
@@ -284,19 +284,19 @@ Response: {
           {
             "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "75rRkUvMDa7YshVPFCbbAtaMghmFy57QtfZ5LL4JF5SB"
+              "digest": "CvhQVJ7numDYf6yZL4nWtw6Xh5iGYGEyVo23eYzQrBg1"
             }
           },
           {
             "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "EkKiCJcM1ZfV5y23CQLSsrf2HxDfY2bmukyYGdPWP8Ed"
+              "digest": "DQHEeQgLHCrvGvvMCwSf6nkPJSHPau76ubpxmh1dQpE9"
             }
           },
           {
             "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ",
             "node": {
-              "digest": "HbjiBNbABYK4a5iEZa1vyVt7Y7rYrGTUFAiSgr9c4zke"
+              "digest": "FyorXheep61dt4Uwv6tAGULrjYVKwZMdzQr13C8y1Nwk"
             }
           },
           {
@@ -313,19 +313,19 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6MCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "BK3Kekkcdo6pkxFkib2gWaw7ozbTd1P9GFJf1Gdkk4Tw"
+            "digest": "4pDtmR9vkzE8azKseWj5VXQQiz7616KJAGftpBncdmnF"
           }
         },
         {
           "cursor": "eyJjIjoxMiwidCI6MSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "DkwkZiCC7skJSfsXTPQEzRXkXYC7PVT7XWi2vRJqsAfq"
+            "digest": "GUKReG1RoqowmWq3yRJNwHJFiUtCARZnmiccRaBtCi98"
           }
         },
         {
           "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H"
+            "digest": "ARW7Huh9GW72bMvDoEUY2BQkU2TbgkJeuCtk538E65ud"
           }
         },
         {
@@ -337,19 +337,19 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "2rBdnEwKTdVy95JSVPD9z2xLFWUpkCtqQvuByXTYA7tG"
+            "digest": "Ay1h3NAkKnrkUif97h8ra2cf8ZyXzQvxUrJp7eaN89cV"
           }
         },
         {
           "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "HWTSUrHn5zbMcP2aixY3vhtjyyP4GnZUBbqKDoVjpd53"
+            "digest": "CaWJtdWxxV8QcJyNnX8hnKRxeZsDTwNbRd3MHdRAnswP"
           }
         },
         {
           "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "2HmXBYuoPVLZB55KPw2wtbkrq1VRAGHrXKVCzUieuaHJ"
+            "digest": "8ThoJwqQb8Qfk6FCa4rm3ZaGZXPQNRJV5Q9juj1MKRPV"
           }
         },
         {
@@ -361,19 +361,19 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "75rRkUvMDa7YshVPFCbbAtaMghmFy57QtfZ5LL4JF5SB"
+            "digest": "CvhQVJ7numDYf6yZL4nWtw6Xh5iGYGEyVo23eYzQrBg1"
           }
         },
         {
           "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "EkKiCJcM1ZfV5y23CQLSsrf2HxDfY2bmukyYGdPWP8Ed"
+            "digest": "DQHEeQgLHCrvGvvMCwSf6nkPJSHPau76ubpxmh1dQpE9"
           }
         },
         {
           "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ",
           "node": {
-            "digest": "HbjiBNbABYK4a5iEZa1vyVt7Y7rYrGTUFAiSgr9c4zke"
+            "digest": "FyorXheep61dt4Uwv6tAGULrjYVKwZMdzQr13C8y1Nwk"
           }
         }
       ]
@@ -395,13 +395,13 @@ Response: {
           {
             "cursor": "eyJjIjo3LCJ0IjoxLCJpIjpmYWxzZX0",
             "node": {
-              "digest": "DkwkZiCC7skJSfsXTPQEzRXkXYC7PVT7XWi2vRJqsAfq"
+              "digest": "GUKReG1RoqowmWq3yRJNwHJFiUtCARZnmiccRaBtCi98"
             }
           },
           {
             "cursor": "eyJjIjo3LCJ0IjoyLCJpIjpmYWxzZX0",
             "node": {
-              "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H"
+              "digest": "ARW7Huh9GW72bMvDoEUY2BQkU2TbgkJeuCtk538E65ud"
             }
           },
           {
@@ -420,13 +420,13 @@ Response: {
           {
             "cursor": "eyJjIjoxMSwidCI6NSwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "HWTSUrHn5zbMcP2aixY3vhtjyyP4GnZUBbqKDoVjpd53"
+              "digest": "CaWJtdWxxV8QcJyNnX8hnKRxeZsDTwNbRd3MHdRAnswP"
             }
           },
           {
             "cursor": "eyJjIjoxMSwidCI6NiwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "2HmXBYuoPVLZB55KPw2wtbkrq1VRAGHrXKVCzUieuaHJ"
+              "digest": "8ThoJwqQb8Qfk6FCa4rm3ZaGZXPQNRJV5Q9juj1MKRPV"
             }
           },
           {
@@ -445,13 +445,13 @@ Response: {
           {
             "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9",
             "node": {
-              "digest": "EkKiCJcM1ZfV5y23CQLSsrf2HxDfY2bmukyYGdPWP8Ed"
+              "digest": "DQHEeQgLHCrvGvvMCwSf6nkPJSHPau76ubpxmh1dQpE9"
             }
           },
           {
             "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ",
             "node": {
-              "digest": "HbjiBNbABYK4a5iEZa1vyVt7Y7rYrGTUFAiSgr9c4zke"
+              "digest": "FyorXheep61dt4Uwv6tAGULrjYVKwZMdzQr13C8y1Nwk"
             }
           },
           {
@@ -480,7 +480,7 @@ Response: {
           {
             "cursor": "eyJjIjoyLCJ0IjoyLCJpIjpmYWxzZX0",
             "node": {
-              "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H"
+              "digest": "ARW7Huh9GW72bMvDoEUY2BQkU2TbgkJeuCtk538E65ud"
             }
           }
         ]
@@ -493,7 +493,7 @@ Response: {
           {
             "cursor": "eyJjIjo2LCJ0Ijo2LCJpIjpmYWxzZX0",
             "node": {
-              "digest": "2HmXBYuoPVLZB55KPw2wtbkrq1VRAGHrXKVCzUieuaHJ"
+              "digest": "8ThoJwqQb8Qfk6FCa4rm3ZaGZXPQNRJV5Q9juj1MKRPV"
             }
           }
         ]
@@ -506,7 +506,7 @@ Response: {
           {
             "cursor": "eyJjIjoxMCwidCI6MTAsImkiOmZhbHNlfQ",
             "node": {
-              "digest": "HbjiBNbABYK4a5iEZa1vyVt7Y7rYrGTUFAiSgr9c4zke"
+              "digest": "FyorXheep61dt4Uwv6tAGULrjYVKwZMdzQr13C8y1Nwk"
             }
           }
         ]
@@ -527,24 +527,24 @@ Response: {
         {
           "cursor": "eyJjIjo2LCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "2HmXBYuoPVLZB55KPw2wtbkrq1VRAGHrXKVCzUieuaHJ",
+            "digest": "8ThoJwqQb8Qfk6FCa4rm3ZaGZXPQNRJV5Q9juj1MKRPV",
             "sender": {
               "objects": {
                 "edges": [
                   {
-                    "cursor": "IBhiLKSACh03qzwTLolt1BgzdrQWDlVVljrJUMSQGFTuBgAAAAAAAAA="
+                    "cursor": "IF6bLapP8AYKd+75F6XPdtdVNSohn1HTgbIpXJvDkyPcBgAAAAAAAAA="
                   },
                   {
-                    "cursor": "IDeJmTiindmAQBd+pVPFBjB7sVU7z0fGvQyB+rsDDqBeBgAAAAAAAAA="
+                    "cursor": "IIK7UOq2UoSWJJse6R8AmECvlpCy5Y1sZzCDUSROuCg8BgAAAAAAAAA="
                   },
                   {
-                    "cursor": "IFx15WB4kYt1vWj/sv4nMcEeIGFCvzzveeSQ/8mUOVjEBgAAAAAAAAA="
+                    "cursor": "IJMX5vma2m2RAFDijPaXuQNjfxxT9M8W9SYEAq9aaeohBgAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHB1eJ+2D/LSY0p89xUpULRGvC7hLBHTzh96+8T5xoo8BgAAAAAAAAA="
+                    "cursor": "IL4q2gkTPbbIZdg6PhcaGW1pw0J9PuGOjTFzGWK9xPHEBgAAAAAAAAA="
                   },
                   {
-                    "cursor": "IH3KRDwEPenou3uSyW4UxFAnz4OJE/zi2jyBy/1Kmsj/BgAAAAAAAAA="
+                    "cursor": "IOgjTJtf/6FlTpu0BCSEiQre3ONPUDwTdz0xbRu+TVWuBgAAAAAAAAA="
                   }
                 ]
               }
@@ -558,33 +558,33 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "3bPBEGHhrpFoxzV3jwHDTuMTkUtnZsSrbmtbppw8Mr7H",
+            "digest": "ARW7Huh9GW72bMvDoEUY2BQkU2TbgkJeuCtk538E65ud",
             "sender": {
               "objects": {
                 "edges": [
                   {
-                    "cursor": "IBhiLKSACh03qzwTLolt1BgzdrQWDlVVljrJUMSQGFTuDAAAAAAAAAA="
+                    "cursor": "IF6bLapP8AYKd+75F6XPdtdVNSohn1HTgbIpXJvDkyPcDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IDeJmTiindmAQBd+pVPFBjB7sVU7z0fGvQyB+rsDDqBeDAAAAAAAAAA="
+                    "cursor": "IHPKWDFJOJ7ilxfCMAN7xvmIhjb1MGWJ9d0bcwAZGMDmDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IFx15WB4kYt1vWj/sv4nMcEeIGFCvzzveeSQ/8mUOVjEDAAAAAAAAAA="
+                    "cursor": "IIK7UOq2UoSWJJse6R8AmECvlpCy5Y1sZzCDUSROuCg8DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHB1eJ+2D/LSY0p89xUpULRGvC7hLBHTzh96+8T5xoo8DAAAAAAAAAA="
+                    "cursor": "IIYxPQues5oY+YIAYbAFU8PoNxE5Ro7nNZdwLtqZX+XmDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHnaNDoqcGH3Lewit7KMbNVl6+NMnWxcWJxkH16fwySNDAAAAAAAAAA="
+                    "cursor": "IJMX5vma2m2RAFDijPaXuQNjfxxT9M8W9SYEAq9aaeohDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IH3KRDwEPenou3uSyW4UxFAnz4OJE/zi2jyBy/1Kmsj/DAAAAAAAAAA="
+                    "cursor": "IKo/fcaQDpNoJ8FL/ba/CYsYyIkoh6Cc+b3hqvqhk4LPDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IJzMgwPtTHYROWRpRit7h9rQQvqG1qTuwxXF0ovflzTQDAAAAAAAAAA="
+                    "cursor": "IL4q2gkTPbbIZdg6PhcaGW1pw0J9PuGOjTFzGWK9xPHEDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IKVrQjxlEPJcc7PYfiR1Bn7gaGKCjuE7aqNNgyCBIM6bDAAAAAAAAAA="
+                    "cursor": "IOgjTJtf/6FlTpu0BCSEiQre3ONPUDwTdz0xbRu+TVWuDAAAAAAAAAA="
                   }
                 ]
               }
@@ -594,33 +594,33 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "2rBdnEwKTdVy95JSVPD9z2xLFWUpkCtqQvuByXTYA7tG",
+            "digest": "Ay1h3NAkKnrkUif97h8ra2cf8ZyXzQvxUrJp7eaN89cV",
             "sender": {
               "objects": {
                 "edges": [
                   {
-                    "cursor": "IBhiLKSACh03qzwTLolt1BgzdrQWDlVVljrJUMSQGFTuDAAAAAAAAAA="
+                    "cursor": "IF6bLapP8AYKd+75F6XPdtdVNSohn1HTgbIpXJvDkyPcDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IDeJmTiindmAQBd+pVPFBjB7sVU7z0fGvQyB+rsDDqBeDAAAAAAAAAA="
+                    "cursor": "IHPKWDFJOJ7ilxfCMAN7xvmIhjb1MGWJ9d0bcwAZGMDmDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IFx15WB4kYt1vWj/sv4nMcEeIGFCvzzveeSQ/8mUOVjEDAAAAAAAAAA="
+                    "cursor": "IIK7UOq2UoSWJJse6R8AmECvlpCy5Y1sZzCDUSROuCg8DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHB1eJ+2D/LSY0p89xUpULRGvC7hLBHTzh96+8T5xoo8DAAAAAAAAAA="
+                    "cursor": "IIYxPQues5oY+YIAYbAFU8PoNxE5Ro7nNZdwLtqZX+XmDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHnaNDoqcGH3Lewit7KMbNVl6+NMnWxcWJxkH16fwySNDAAAAAAAAAA="
+                    "cursor": "IJMX5vma2m2RAFDijPaXuQNjfxxT9M8W9SYEAq9aaeohDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IH3KRDwEPenou3uSyW4UxFAnz4OJE/zi2jyBy/1Kmsj/DAAAAAAAAAA="
+                    "cursor": "IKo/fcaQDpNoJ8FL/ba/CYsYyIkoh6Cc+b3hqvqhk4LPDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IJzMgwPtTHYROWRpRit7h9rQQvqG1qTuwxXF0ovflzTQDAAAAAAAAAA="
+                    "cursor": "IL4q2gkTPbbIZdg6PhcaGW1pw0J9PuGOjTFzGWK9xPHEDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IKVrQjxlEPJcc7PYfiR1Bn7gaGKCjuE7aqNNgyCBIM6bDAAAAAAAAAA="
+                    "cursor": "IOgjTJtf/6FlTpu0BCSEiQre3ONPUDwTdz0xbRu+TVWuDAAAAAAAAAA="
                   }
                 ]
               }
@@ -630,33 +630,33 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "HWTSUrHn5zbMcP2aixY3vhtjyyP4GnZUBbqKDoVjpd53",
+            "digest": "CaWJtdWxxV8QcJyNnX8hnKRxeZsDTwNbRd3MHdRAnswP",
             "sender": {
               "objects": {
                 "edges": [
                   {
-                    "cursor": "IBhiLKSACh03qzwTLolt1BgzdrQWDlVVljrJUMSQGFTuDAAAAAAAAAA="
+                    "cursor": "IF6bLapP8AYKd+75F6XPdtdVNSohn1HTgbIpXJvDkyPcDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IDeJmTiindmAQBd+pVPFBjB7sVU7z0fGvQyB+rsDDqBeDAAAAAAAAAA="
+                    "cursor": "IHPKWDFJOJ7ilxfCMAN7xvmIhjb1MGWJ9d0bcwAZGMDmDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IFx15WB4kYt1vWj/sv4nMcEeIGFCvzzveeSQ/8mUOVjEDAAAAAAAAAA="
+                    "cursor": "IIK7UOq2UoSWJJse6R8AmECvlpCy5Y1sZzCDUSROuCg8DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHB1eJ+2D/LSY0p89xUpULRGvC7hLBHTzh96+8T5xoo8DAAAAAAAAAA="
+                    "cursor": "IIYxPQues5oY+YIAYbAFU8PoNxE5Ro7nNZdwLtqZX+XmDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHnaNDoqcGH3Lewit7KMbNVl6+NMnWxcWJxkH16fwySNDAAAAAAAAAA="
+                    "cursor": "IJMX5vma2m2RAFDijPaXuQNjfxxT9M8W9SYEAq9aaeohDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IH3KRDwEPenou3uSyW4UxFAnz4OJE/zi2jyBy/1Kmsj/DAAAAAAAAAA="
+                    "cursor": "IKo/fcaQDpNoJ8FL/ba/CYsYyIkoh6Cc+b3hqvqhk4LPDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IJzMgwPtTHYROWRpRit7h9rQQvqG1qTuwxXF0ovflzTQDAAAAAAAAAA="
+                    "cursor": "IL4q2gkTPbbIZdg6PhcaGW1pw0J9PuGOjTFzGWK9xPHEDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IKVrQjxlEPJcc7PYfiR1Bn7gaGKCjuE7aqNNgyCBIM6bDAAAAAAAAAA="
+                    "cursor": "IOgjTJtf/6FlTpu0BCSEiQre3ONPUDwTdz0xbRu+TVWuDAAAAAAAAAA="
                   }
                 ]
               }
@@ -666,33 +666,33 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "2HmXBYuoPVLZB55KPw2wtbkrq1VRAGHrXKVCzUieuaHJ",
+            "digest": "8ThoJwqQb8Qfk6FCa4rm3ZaGZXPQNRJV5Q9juj1MKRPV",
             "sender": {
               "objects": {
                 "edges": [
                   {
-                    "cursor": "IBhiLKSACh03qzwTLolt1BgzdrQWDlVVljrJUMSQGFTuDAAAAAAAAAA="
+                    "cursor": "IF6bLapP8AYKd+75F6XPdtdVNSohn1HTgbIpXJvDkyPcDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IDeJmTiindmAQBd+pVPFBjB7sVU7z0fGvQyB+rsDDqBeDAAAAAAAAAA="
+                    "cursor": "IHPKWDFJOJ7ilxfCMAN7xvmIhjb1MGWJ9d0bcwAZGMDmDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IFx15WB4kYt1vWj/sv4nMcEeIGFCvzzveeSQ/8mUOVjEDAAAAAAAAAA="
+                    "cursor": "IIK7UOq2UoSWJJse6R8AmECvlpCy5Y1sZzCDUSROuCg8DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHB1eJ+2D/LSY0p89xUpULRGvC7hLBHTzh96+8T5xoo8DAAAAAAAAAA="
+                    "cursor": "IIYxPQues5oY+YIAYbAFU8PoNxE5Ro7nNZdwLtqZX+XmDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHnaNDoqcGH3Lewit7KMbNVl6+NMnWxcWJxkH16fwySNDAAAAAAAAAA="
+                    "cursor": "IJMX5vma2m2RAFDijPaXuQNjfxxT9M8W9SYEAq9aaeohDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IH3KRDwEPenou3uSyW4UxFAnz4OJE/zi2jyBy/1Kmsj/DAAAAAAAAAA="
+                    "cursor": "IKo/fcaQDpNoJ8FL/ba/CYsYyIkoh6Cc+b3hqvqhk4LPDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IJzMgwPtTHYROWRpRit7h9rQQvqG1qTuwxXF0ovflzTQDAAAAAAAAAA="
+                    "cursor": "IL4q2gkTPbbIZdg6PhcaGW1pw0J9PuGOjTFzGWK9xPHEDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IKVrQjxlEPJcc7PYfiR1Bn7gaGKCjuE7aqNNgyCBIM6bDAAAAAAAAAA="
+                    "cursor": "IOgjTJtf/6FlTpu0BCSEiQre3ONPUDwTdz0xbRu+TVWuDAAAAAAAAAA="
                   }
                 ]
               }
@@ -702,33 +702,33 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "75rRkUvMDa7YshVPFCbbAtaMghmFy57QtfZ5LL4JF5SB",
+            "digest": "CvhQVJ7numDYf6yZL4nWtw6Xh5iGYGEyVo23eYzQrBg1",
             "sender": {
               "objects": {
                 "edges": [
                   {
-                    "cursor": "IBhiLKSACh03qzwTLolt1BgzdrQWDlVVljrJUMSQGFTuDAAAAAAAAAA="
+                    "cursor": "IF6bLapP8AYKd+75F6XPdtdVNSohn1HTgbIpXJvDkyPcDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IDeJmTiindmAQBd+pVPFBjB7sVU7z0fGvQyB+rsDDqBeDAAAAAAAAAA="
+                    "cursor": "IHPKWDFJOJ7ilxfCMAN7xvmIhjb1MGWJ9d0bcwAZGMDmDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IFx15WB4kYt1vWj/sv4nMcEeIGFCvzzveeSQ/8mUOVjEDAAAAAAAAAA="
+                    "cursor": "IIK7UOq2UoSWJJse6R8AmECvlpCy5Y1sZzCDUSROuCg8DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHB1eJ+2D/LSY0p89xUpULRGvC7hLBHTzh96+8T5xoo8DAAAAAAAAAA="
+                    "cursor": "IIYxPQues5oY+YIAYbAFU8PoNxE5Ro7nNZdwLtqZX+XmDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHnaNDoqcGH3Lewit7KMbNVl6+NMnWxcWJxkH16fwySNDAAAAAAAAAA="
+                    "cursor": "IJMX5vma2m2RAFDijPaXuQNjfxxT9M8W9SYEAq9aaeohDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IH3KRDwEPenou3uSyW4UxFAnz4OJE/zi2jyBy/1Kmsj/DAAAAAAAAAA="
+                    "cursor": "IKo/fcaQDpNoJ8FL/ba/CYsYyIkoh6Cc+b3hqvqhk4LPDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IJzMgwPtTHYROWRpRit7h9rQQvqG1qTuwxXF0ovflzTQDAAAAAAAAAA="
+                    "cursor": "IL4q2gkTPbbIZdg6PhcaGW1pw0J9PuGOjTFzGWK9xPHEDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IKVrQjxlEPJcc7PYfiR1Bn7gaGKCjuE7aqNNgyCBIM6bDAAAAAAAAAA="
+                    "cursor": "IOgjTJtf/6FlTpu0BCSEiQre3ONPUDwTdz0xbRu+TVWuDAAAAAAAAAA="
                   }
                 ]
               }
@@ -738,33 +738,33 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "EkKiCJcM1ZfV5y23CQLSsrf2HxDfY2bmukyYGdPWP8Ed",
+            "digest": "DQHEeQgLHCrvGvvMCwSf6nkPJSHPau76ubpxmh1dQpE9",
             "sender": {
               "objects": {
                 "edges": [
                   {
-                    "cursor": "IBhiLKSACh03qzwTLolt1BgzdrQWDlVVljrJUMSQGFTuDAAAAAAAAAA="
+                    "cursor": "IF6bLapP8AYKd+75F6XPdtdVNSohn1HTgbIpXJvDkyPcDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IDeJmTiindmAQBd+pVPFBjB7sVU7z0fGvQyB+rsDDqBeDAAAAAAAAAA="
+                    "cursor": "IHPKWDFJOJ7ilxfCMAN7xvmIhjb1MGWJ9d0bcwAZGMDmDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IFx15WB4kYt1vWj/sv4nMcEeIGFCvzzveeSQ/8mUOVjEDAAAAAAAAAA="
+                    "cursor": "IIK7UOq2UoSWJJse6R8AmECvlpCy5Y1sZzCDUSROuCg8DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHB1eJ+2D/LSY0p89xUpULRGvC7hLBHTzh96+8T5xoo8DAAAAAAAAAA="
+                    "cursor": "IIYxPQues5oY+YIAYbAFU8PoNxE5Ro7nNZdwLtqZX+XmDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHnaNDoqcGH3Lewit7KMbNVl6+NMnWxcWJxkH16fwySNDAAAAAAAAAA="
+                    "cursor": "IJMX5vma2m2RAFDijPaXuQNjfxxT9M8W9SYEAq9aaeohDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IH3KRDwEPenou3uSyW4UxFAnz4OJE/zi2jyBy/1Kmsj/DAAAAAAAAAA="
+                    "cursor": "IKo/fcaQDpNoJ8FL/ba/CYsYyIkoh6Cc+b3hqvqhk4LPDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IJzMgwPtTHYROWRpRit7h9rQQvqG1qTuwxXF0ovflzTQDAAAAAAAAAA="
+                    "cursor": "IL4q2gkTPbbIZdg6PhcaGW1pw0J9PuGOjTFzGWK9xPHEDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IKVrQjxlEPJcc7PYfiR1Bn7gaGKCjuE7aqNNgyCBIM6bDAAAAAAAAAA="
+                    "cursor": "IOgjTJtf/6FlTpu0BCSEiQre3ONPUDwTdz0xbRu+TVWuDAAAAAAAAAA="
                   }
                 ]
               }
@@ -774,33 +774,33 @@ Response: {
         {
           "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ",
           "node": {
-            "digest": "HbjiBNbABYK4a5iEZa1vyVt7Y7rYrGTUFAiSgr9c4zke",
+            "digest": "FyorXheep61dt4Uwv6tAGULrjYVKwZMdzQr13C8y1Nwk",
             "sender": {
               "objects": {
                 "edges": [
                   {
-                    "cursor": "IBhiLKSACh03qzwTLolt1BgzdrQWDlVVljrJUMSQGFTuDAAAAAAAAAA="
+                    "cursor": "IF6bLapP8AYKd+75F6XPdtdVNSohn1HTgbIpXJvDkyPcDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IDeJmTiindmAQBd+pVPFBjB7sVU7z0fGvQyB+rsDDqBeDAAAAAAAAAA="
+                    "cursor": "IHPKWDFJOJ7ilxfCMAN7xvmIhjb1MGWJ9d0bcwAZGMDmDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IFx15WB4kYt1vWj/sv4nMcEeIGFCvzzveeSQ/8mUOVjEDAAAAAAAAAA="
+                    "cursor": "IIK7UOq2UoSWJJse6R8AmECvlpCy5Y1sZzCDUSROuCg8DAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHB1eJ+2D/LSY0p89xUpULRGvC7hLBHTzh96+8T5xoo8DAAAAAAAAAA="
+                    "cursor": "IIYxPQues5oY+YIAYbAFU8PoNxE5Ro7nNZdwLtqZX+XmDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IHnaNDoqcGH3Lewit7KMbNVl6+NMnWxcWJxkH16fwySNDAAAAAAAAAA="
+                    "cursor": "IJMX5vma2m2RAFDijPaXuQNjfxxT9M8W9SYEAq9aaeohDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IH3KRDwEPenou3uSyW4UxFAnz4OJE/zi2jyBy/1Kmsj/DAAAAAAAAAA="
+                    "cursor": "IKo/fcaQDpNoJ8FL/ba/CYsYyIkoh6Cc+b3hqvqhk4LPDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IJzMgwPtTHYROWRpRit7h9rQQvqG1qTuwxXF0ovflzTQDAAAAAAAAAA="
+                    "cursor": "IL4q2gkTPbbIZdg6PhcaGW1pw0J9PuGOjTFzGWK9xPHEDAAAAAAAAAA="
                   },
                   {
-                    "cursor": "IKVrQjxlEPJcc7PYfiR1Bn7gaGKCjuE7aqNNgyCBIM6bDAAAAAAAAAA="
+                    "cursor": "IOgjTJtf/6FlTpu0BCSEiQre3ONPUDwTdz0xbRu+TVWuDAAAAAAAAAA="
                   }
                 ]
               }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp b/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp
index 641b1fba51c..63d8d5150c2 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/object_at_version.exp
@@ -29,7 +29,7 @@ Response: {
       "asMoveObject": {
         "contents": {
           "json": {
-            "id": "0x5f5b687661f8e057c27c2ce0e32817f9afbb79e1547aed2437636c026a7eaef4",
+            "id": "0xb9c8ffbf83054e03d776bcb9bb8d81c2792323fb60b16911840b8cd1223d7f35",
             "value": "0"
           }
         }
@@ -57,7 +57,7 @@ Response: {
       "asMoveObject": {
         "contents": {
           "json": {
-            "id": "0x5f5b687661f8e057c27c2ce0e32817f9afbb79e1547aed2437636c026a7eaef4",
+            "id": "0xb9c8ffbf83054e03d776bcb9bb8d81c2792323fb60b16911840b8cd1223d7f35",
             "value": "1"
           }
         }
@@ -69,7 +69,7 @@ Response: {
       "asMoveObject": {
         "contents": {
           "json": {
-            "id": "0x5f5b687661f8e057c27c2ce0e32817f9afbb79e1547aed2437636c026a7eaef4",
+            "id": "0xb9c8ffbf83054e03d776bcb9bb8d81c2792323fb60b16911840b8cd1223d7f35",
             "value": "0"
           }
         }
@@ -104,7 +104,7 @@ Response: {
       "asMoveObject": {
         "contents": {
           "json": {
-            "id": "0x5f5b687661f8e057c27c2ce0e32817f9afbb79e1547aed2437636c026a7eaef4",
+            "id": "0xb9c8ffbf83054e03d776bcb9bb8d81c2792323fb60b16911840b8cd1223d7f35",
             "value": "1"
           }
         }
@@ -134,7 +134,7 @@ Response: {
       "asMoveObject": {
         "contents": {
           "json": {
-            "id": "0x5f5b687661f8e057c27c2ce0e32817f9afbb79e1547aed2437636c026a7eaef4",
+            "id": "0xb9c8ffbf83054e03d776bcb9bb8d81c2792323fb60b16911840b8cd1223d7f35",
             "value": "1"
           }
         }
@@ -151,7 +151,7 @@ Response: {
       "asMoveObject": {
         "contents": {
           "json": {
-            "id": "0x5f5b687661f8e057c27c2ce0e32817f9afbb79e1547aed2437636c026a7eaef4",
+            "id": "0xb9c8ffbf83054e03d776bcb9bb8d81c2792323fb60b16911840b8cd1223d7f35",
             "value": "0"
           }
         }
@@ -205,7 +205,7 @@ Response: {
       "asMoveObject": {
         "contents": {
           "json": {
-            "id": "0x5f5b687661f8e057c27c2ce0e32817f9afbb79e1547aed2437636c026a7eaef4",
+            "id": "0xb9c8ffbf83054e03d776bcb9bb8d81c2792323fb60b16911840b8cd1223d7f35",
             "value": "1"
           }
         }
@@ -222,7 +222,7 @@ Response: {
       "asMoveObject": {
         "contents": {
           "json": {
-            "id": "0x5f5b687661f8e057c27c2ce0e32817f9afbb79e1547aed2437636c026a7eaef4",
+            "id": "0xb9c8ffbf83054e03d776bcb9bb8d81c2792323fb60b16911840b8cd1223d7f35",
             "value": "0"
           }
         }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp
index 8d9f57fcc14..07ed6957498 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination.exp
@@ -31,24 +31,26 @@ Response: {
   "data": {
     "one_of_these_will_yield_an_object": {
       "objects": {
-        "nodes": [
-          {
-            "version": 4,
+        "nodes": []
+      }
+    },
+    "if_the_other_does_not": {
+      "nodes": [
+        {
+          "version": 3,
+          "asMoveObject": {
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
-                "value": "1"
+                "id": "0xe7cdb4bd9233f7915645ae5d90815f8c80731ecc24f3c304864a55ddd6d9ec32",
+                "value": "0"
               }
             }
           }
-        ]
-      }
-    },
-    "if_the_other_does_not": {
-      "nodes": []
+        }
+      ]
     }
   }
 }
@@ -75,24 +77,26 @@ Response: {
   "data": {
     "paginating_on_checkpoint_1": {
       "objects": {
-        "nodes": [
-          {
-            "version": 4,
+        "nodes": []
+      }
+    },
+    "should_not_have_more_than_one_result": {
+      "nodes": [
+        {
+          "version": 3,
+          "asMoveObject": {
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
-                "value": "1"
+                "id": "0xe7cdb4bd9233f7915645ae5d90815f8c80731ecc24f3c304864a55ddd6d9ec32",
+                "value": "0"
               }
             }
           }
-        ]
-      }
-    },
-    "should_not_have_more_than_one_result": {
-      "nodes": []
+        }
+      ]
     }
   }
 }
@@ -105,14 +109,14 @@ Response: {
       "objects": {
         "nodes": [
           {
-            "version": 3,
+            "version": 6,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0x03b5491210b2265639d6a630269b4aad9f843e9a758f00fec2d053f9b3f671d5",
-                "value": "0"
+                "id": "0x78f73f033bbf6fe3154d191698b44a8d574f18c87765489c6fe6336a07ade478",
+                "value": "3"
               }
             }
           },
@@ -120,35 +124,35 @@ Response: {
             "version": 5,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0x33a4b4d4c88186a63036280f21ebb4d969c6d65b7831cc6f2efdfe179a43fa4a",
+                "id": "0x7a2e93dcbe6a24b9129772a38bdfbf4f92e34ed32bac3a67d24d7826940c490b",
                 "value": "2"
               }
             }
           },
           {
-            "version": 6,
+            "version": 4,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0x50969dcd55318e27509c59bf373acb660f0b961a227f52d449c1b3443392fe4e",
-                "value": "3"
+                "id": "0x90a7d6dc83c8a6a5c755de2dff7f23eb1476dabcdf62c178af306e11c8e31eec",
+                "value": "1"
               }
             }
           },
           {
-            "version": 4,
+            "version": 3,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
-                "value": "1"
+                "id": "0xe7cdb4bd9233f7915645ae5d90815f8c80731ecc24f3c304864a55ddd6d9ec32",
+                "value": "0"
               }
             }
           }
@@ -166,14 +170,14 @@ Response: {
       "objects": {
         "nodes": [
           {
-            "version": 3,
+            "version": 6,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0x03b5491210b2265639d6a630269b4aad9f843e9a758f00fec2d053f9b3f671d5",
-                "value": "0"
+                "id": "0x78f73f033bbf6fe3154d191698b44a8d574f18c87765489c6fe6336a07ade478",
+                "value": "3"
               }
             }
           },
@@ -181,35 +185,35 @@ Response: {
             "version": 5,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0x33a4b4d4c88186a63036280f21ebb4d969c6d65b7831cc6f2efdfe179a43fa4a",
+                "id": "0x7a2e93dcbe6a24b9129772a38bdfbf4f92e34ed32bac3a67d24d7826940c490b",
                 "value": "2"
               }
             }
           },
           {
-            "version": 6,
+            "version": 4,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0x50969dcd55318e27509c59bf373acb660f0b961a227f52d449c1b3443392fe4e",
-                "value": "3"
+                "id": "0x90a7d6dc83c8a6a5c755de2dff7f23eb1476dabcdf62c178af306e11c8e31eec",
+                "value": "1"
               }
             }
           },
           {
-            "version": 4,
+            "version": 3,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
-                "value": "1"
+                "id": "0xe7cdb4bd9233f7915645ae5d90815f8c80731ecc24f3c304864a55ddd6d9ec32",
+                "value": "0"
               }
             }
           }
@@ -237,14 +241,14 @@ Response: {
       "objects": {
         "nodes": [
           {
-            "version": 6,
+            "version": 4,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0x50969dcd55318e27509c59bf373acb660f0b961a227f52d449c1b3443392fe4e",
-                "value": "3"
+                "id": "0x90a7d6dc83c8a6a5c755de2dff7f23eb1476dabcdf62c178af306e11c8e31eec",
+                "value": "1"
               }
             },
             "owner_at_latest_state_has_iota_only": {
@@ -252,14 +256,14 @@ Response: {
                 "objects": {
                   "nodes": [
                     {
-                      "version": 3,
+                      "version": 6,
                       "contents": {
                         "type": {
-                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                          "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
                         },
                         "json": {
-                          "id": "0x03b5491210b2265639d6a630269b4aad9f843e9a758f00fec2d053f9b3f671d5",
-                          "value": "0"
+                          "id": "0x78f73f033bbf6fe3154d191698b44a8d574f18c87765489c6fe6336a07ade478",
+                          "value": "3"
                         }
                       }
                     },
@@ -267,49 +271,49 @@ Response: {
                       "version": 5,
                       "contents": {
                         "type": {
-                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                          "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
                         },
                         "json": {
-                          "id": "0x33a4b4d4c88186a63036280f21ebb4d969c6d65b7831cc6f2efdfe179a43fa4a",
+                          "id": "0x7a2e93dcbe6a24b9129772a38bdfbf4f92e34ed32bac3a67d24d7826940c490b",
                           "value": "2"
                         }
                       }
                     },
                     {
-                      "version": 6,
+                      "version": 1,
                       "contents": {
                         "type": {
-                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         },
                         "json": {
-                          "id": "0x50969dcd55318e27509c59bf373acb660f0b961a227f52d449c1b3443392fe4e",
-                          "value": "3"
+                          "id": "0x82bb50eab6528496249b1ee91f009840af9690b2e58d6c67308351244eb8283c",
+                          "balance": {
+                            "value": "300000000000000"
+                          }
                         }
                       }
                     },
                     {
-                      "version": 1,
+                      "version": 4,
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                          "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
                         },
                         "json": {
-                          "id": "0x7dca443c043de9e8bb7b92c96e14c45027cf838913fce2da3c81cbfd4a9ac8ff",
-                          "balance": {
-                            "value": "300000000000000"
-                          }
+                          "id": "0x90a7d6dc83c8a6a5c755de2dff7f23eb1476dabcdf62c178af306e11c8e31eec",
+                          "value": "1"
                         }
                       }
                     },
                     {
-                      "version": 4,
+                      "version": 3,
                       "contents": {
                         "type": {
-                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                          "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
                         },
                         "json": {
-                          "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
-                          "value": "1"
+                          "id": "0xe7cdb4bd9233f7915645ae5d90815f8c80731ecc24f3c304864a55ddd6d9ec32",
+                          "value": "0"
                         }
                       }
                     }
@@ -319,14 +323,14 @@ Response: {
             }
           },
           {
-            "version": 4,
+            "version": 3,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
-                "value": "1"
+                "id": "0xe7cdb4bd9233f7915645ae5d90815f8c80731ecc24f3c304864a55ddd6d9ec32",
+                "value": "0"
               }
             },
             "owner_at_latest_state_has_iota_only": {
@@ -334,14 +338,14 @@ Response: {
                 "objects": {
                   "nodes": [
                     {
-                      "version": 3,
+                      "version": 6,
                       "contents": {
                         "type": {
-                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                          "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
                         },
                         "json": {
-                          "id": "0x03b5491210b2265639d6a630269b4aad9f843e9a758f00fec2d053f9b3f671d5",
-                          "value": "0"
+                          "id": "0x78f73f033bbf6fe3154d191698b44a8d574f18c87765489c6fe6336a07ade478",
+                          "value": "3"
                         }
                       }
                     },
@@ -349,49 +353,49 @@ Response: {
                       "version": 5,
                       "contents": {
                         "type": {
-                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                          "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
                         },
                         "json": {
-                          "id": "0x33a4b4d4c88186a63036280f21ebb4d969c6d65b7831cc6f2efdfe179a43fa4a",
+                          "id": "0x7a2e93dcbe6a24b9129772a38bdfbf4f92e34ed32bac3a67d24d7826940c490b",
                           "value": "2"
                         }
                       }
                     },
                     {
-                      "version": 6,
+                      "version": 1,
                       "contents": {
                         "type": {
-                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         },
                         "json": {
-                          "id": "0x50969dcd55318e27509c59bf373acb660f0b961a227f52d449c1b3443392fe4e",
-                          "value": "3"
+                          "id": "0x82bb50eab6528496249b1ee91f009840af9690b2e58d6c67308351244eb8283c",
+                          "balance": {
+                            "value": "300000000000000"
+                          }
                         }
                       }
                     },
                     {
-                      "version": 1,
+                      "version": 4,
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                          "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
                         },
                         "json": {
-                          "id": "0x7dca443c043de9e8bb7b92c96e14c45027cf838913fce2da3c81cbfd4a9ac8ff",
-                          "balance": {
-                            "value": "300000000000000"
-                          }
+                          "id": "0x90a7d6dc83c8a6a5c755de2dff7f23eb1476dabcdf62c178af306e11c8e31eec",
+                          "value": "1"
                         }
                       }
                     },
                     {
-                      "version": 4,
+                      "version": 3,
                       "contents": {
                         "type": {
-                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                          "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
                         },
                         "json": {
-                          "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
-                          "value": "1"
+                          "id": "0xe7cdb4bd9233f7915645ae5d90815f8c80731ecc24f3c304864a55ddd6d9ec32",
+                          "value": "0"
                         }
                       }
                     }
@@ -406,15 +410,15 @@ Response: {
     "before_obj_6_0_at_checkpoint_2": {
       "nodes": [
         {
-          "version": 3,
+          "version": 6,
           "asMoveObject": {
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0x03b5491210b2265639d6a630269b4aad9f843e9a758f00fec2d053f9b3f671d5",
-                "value": "0"
+                "id": "0x78f73f033bbf6fe3154d191698b44a8d574f18c87765489c6fe6336a07ade478",
+                "value": "3"
               }
             },
             "note_that_owner_result_should_reflect_latest_state": {
@@ -422,14 +426,14 @@ Response: {
                 "objects": {
                   "nodes": [
                     {
-                      "version": 3,
+                      "version": 6,
                       "contents": {
                         "type": {
-                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                          "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
                         },
                         "json": {
-                          "id": "0x03b5491210b2265639d6a630269b4aad9f843e9a758f00fec2d053f9b3f671d5",
-                          "value": "0"
+                          "id": "0x78f73f033bbf6fe3154d191698b44a8d574f18c87765489c6fe6336a07ade478",
+                          "value": "3"
                         }
                       }
                     },
@@ -437,49 +441,49 @@ Response: {
                       "version": 5,
                       "contents": {
                         "type": {
-                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                          "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
                         },
                         "json": {
-                          "id": "0x33a4b4d4c88186a63036280f21ebb4d969c6d65b7831cc6f2efdfe179a43fa4a",
+                          "id": "0x7a2e93dcbe6a24b9129772a38bdfbf4f92e34ed32bac3a67d24d7826940c490b",
                           "value": "2"
                         }
                       }
                     },
                     {
-                      "version": 6,
+                      "version": 1,
                       "contents": {
                         "type": {
-                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         },
                         "json": {
-                          "id": "0x50969dcd55318e27509c59bf373acb660f0b961a227f52d449c1b3443392fe4e",
-                          "value": "3"
+                          "id": "0x82bb50eab6528496249b1ee91f009840af9690b2e58d6c67308351244eb8283c",
+                          "balance": {
+                            "value": "300000000000000"
+                          }
                         }
                       }
                     },
                     {
-                      "version": 1,
+                      "version": 4,
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                          "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
                         },
                         "json": {
-                          "id": "0x7dca443c043de9e8bb7b92c96e14c45027cf838913fce2da3c81cbfd4a9ac8ff",
-                          "balance": {
-                            "value": "300000000000000"
-                          }
+                          "id": "0x90a7d6dc83c8a6a5c755de2dff7f23eb1476dabcdf62c178af306e11c8e31eec",
+                          "value": "1"
                         }
                       }
                     },
                     {
-                      "version": 4,
+                      "version": 3,
                       "contents": {
                         "type": {
-                          "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                          "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
                         },
                         "json": {
-                          "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
-                          "value": "1"
+                          "id": "0xe7cdb4bd9233f7915645ae5d90815f8c80731ecc24f3c304864a55ddd6d9ec32",
+                          "value": "0"
                         }
                       }
                     }
@@ -544,11 +548,11 @@ Response: {
             "version": 7,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0x03b5491210b2265639d6a630269b4aad9f843e9a758f00fec2d053f9b3f671d5",
-                "value": "0"
+                "id": "0x78f73f033bbf6fe3154d191698b44a8d574f18c87765489c6fe6336a07ade478",
+                "value": "3"
               }
             }
           },
@@ -556,10 +560,10 @@ Response: {
             "version": 7,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0x33a4b4d4c88186a63036280f21ebb4d969c6d65b7831cc6f2efdfe179a43fa4a",
+                "id": "0x7a2e93dcbe6a24b9129772a38bdfbf4f92e34ed32bac3a67d24d7826940c490b",
                 "value": "2"
               }
             }
@@ -568,11 +572,11 @@ Response: {
             "version": 7,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0x50969dcd55318e27509c59bf373acb660f0b961a227f52d449c1b3443392fe4e",
-                "value": "3"
+                "id": "0x90a7d6dc83c8a6a5c755de2dff7f23eb1476dabcdf62c178af306e11c8e31eec",
+                "value": "1"
               }
             }
           },
@@ -580,11 +584,11 @@ Response: {
             "version": 7,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
-                "value": "1"
+                "id": "0xe7cdb4bd9233f7915645ae5d90815f8c80731ecc24f3c304864a55ddd6d9ec32",
+                "value": "0"
               }
             }
           }
@@ -602,14 +606,14 @@ Response: {
       "objects": {
         "nodes": [
           {
-            "version": 3,
+            "version": 6,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0x03b5491210b2265639d6a630269b4aad9f843e9a758f00fec2d053f9b3f671d5",
-                "value": "0"
+                "id": "0x78f73f033bbf6fe3154d191698b44a8d574f18c87765489c6fe6336a07ade478",
+                "value": "3"
               }
             }
           },
@@ -617,35 +621,35 @@ Response: {
             "version": 5,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0x33a4b4d4c88186a63036280f21ebb4d969c6d65b7831cc6f2efdfe179a43fa4a",
+                "id": "0x7a2e93dcbe6a24b9129772a38bdfbf4f92e34ed32bac3a67d24d7826940c490b",
                 "value": "2"
               }
             }
           },
           {
-            "version": 6,
+            "version": 4,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0x50969dcd55318e27509c59bf373acb660f0b961a227f52d449c1b3443392fe4e",
-                "value": "3"
+                "id": "0x90a7d6dc83c8a6a5c755de2dff7f23eb1476dabcdf62c178af306e11c8e31eec",
+                "value": "1"
               }
             }
           },
           {
-            "version": 4,
+            "version": 3,
             "contents": {
               "type": {
-                "repr": "0xa36a9a249d8122932687d98cd88c207daeb511e3ce7986d4ca56bf1ff9f84af0::M1::Object"
+                "repr": "0xbcdfcf3eb356188b9d56bd906654682be4e2701812b8b85d295fb2cf0c8eb540::M1::Object"
               },
               "json": {
-                "id": "0xea32d72ff4d9a913b958bfa800d13222c423a2929b7a47cffe3a869d67ae5a96",
-                "value": "1"
+                "id": "0xe7cdb4bd9233f7915645ae5d90815f8c80731ecc24f3c304864a55ddd6d9ec32",
+                "value": "0"
               }
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp
index 64f2d52a2ac..e6a1ae72d8a 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/objects_pagination_single.exp
@@ -35,27 +35,27 @@ task 6, lines 38-66:
 Response: {
   "data": {
     "after_obj_3_0": {
+      "objects": {
+        "nodes": []
+      }
+    },
+    "before_obj_3_0": {
       "objects": {
         "nodes": [
           {
             "version": 4,
             "contents": {
               "type": {
-                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
+                "repr": "0x63a48560be4455576c42db1f2087091d1f49d97370eb5840211d6d96922a38e6::M1::Object"
               },
               "json": {
-                "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
+                "id": "0x3b3871be586c1577dc2762b64c5d96dd133d646d1451ee4422879772df9fd47c",
                 "value": "100"
               }
             }
           }
         ]
       }
-    },
-    "before_obj_3_0": {
-      "objects": {
-        "nodes": []
-      }
     }
   }
 }
@@ -74,27 +74,27 @@ task 9, lines 72-101:
 Response: {
   "data": {
     "after_obj_3_0_chkpt_1": {
+      "objects": {
+        "nodes": []
+      }
+    },
+    "before_obj_3_0_chkpt_1": {
       "objects": {
         "nodes": [
           {
             "version": 4,
             "contents": {
               "type": {
-                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
+                "repr": "0x63a48560be4455576c42db1f2087091d1f49d97370eb5840211d6d96922a38e6::M1::Object"
               },
               "json": {
-                "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
+                "id": "0x3b3871be586c1577dc2762b64c5d96dd133d646d1451ee4422879772df9fd47c",
                 "value": "100"
               }
             }
           }
         ]
       }
-    },
-    "before_obj_3_0_chkpt_1": {
-      "objects": {
-        "nodes": []
-      }
     }
   }
 }
@@ -107,26 +107,26 @@ Response: {
       "objects": {
         "nodes": [
           {
-            "version": 4,
+            "version": 5,
             "contents": {
               "type": {
-                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
+                "repr": "0x63a48560be4455576c42db1f2087091d1f49d97370eb5840211d6d96922a38e6::M1::Object"
               },
               "json": {
-                "id": "0x62667ab9dcc05a8e142344d516f796fe0f7cad2b50c8bdb4944a4eee03d0eda2",
-                "value": "1"
+                "id": "0x3b3871be586c1577dc2762b64c5d96dd133d646d1451ee4422879772df9fd47c",
+                "value": "200"
               }
             }
           },
           {
-            "version": 5,
+            "version": 4,
             "contents": {
               "type": {
-                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
+                "repr": "0x63a48560be4455576c42db1f2087091d1f49d97370eb5840211d6d96922a38e6::M1::Object"
               },
               "json": {
-                "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
-                "value": "200"
+                "id": "0x9ec42e10c73fb04284e39acf692469336f5f7b4c9dfa0cee79e12776aa3b9564",
+                "value": "1"
               }
             }
           }
@@ -134,16 +134,21 @@ Response: {
       }
     },
     "after_obj_3_0_chkpt_2": {
+      "consistent_with_above": {
+        "nodes": []
+      }
+    },
+    "before_obj_3_0_chkpt_2": {
       "consistent_with_above": {
         "nodes": [
           {
             "version": 5,
             "contents": {
               "type": {
-                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
+                "repr": "0x63a48560be4455576c42db1f2087091d1f49d97370eb5840211d6d96922a38e6::M1::Object"
               },
               "json": {
-                "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
+                "id": "0x3b3871be586c1577dc2762b64c5d96dd133d646d1451ee4422879772df9fd47c",
                 "value": "200"
               }
             },
@@ -152,26 +157,26 @@ Response: {
                 "objects": {
                   "nodes": [
                     {
-                      "version": 4,
+                      "version": 5,
                       "contents": {
                         "type": {
-                          "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
+                          "repr": "0x63a48560be4455576c42db1f2087091d1f49d97370eb5840211d6d96922a38e6::M1::Object"
                         },
                         "json": {
-                          "id": "0x62667ab9dcc05a8e142344d516f796fe0f7cad2b50c8bdb4944a4eee03d0eda2",
-                          "value": "1"
+                          "id": "0x3b3871be586c1577dc2762b64c5d96dd133d646d1451ee4422879772df9fd47c",
+                          "value": "200"
                         }
                       }
                     },
                     {
-                      "version": 5,
+                      "version": 4,
                       "contents": {
                         "type": {
-                          "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
+                          "repr": "0x63a48560be4455576c42db1f2087091d1f49d97370eb5840211d6d96922a38e6::M1::Object"
                         },
                         "json": {
-                          "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
-                          "value": "200"
+                          "id": "0x9ec42e10c73fb04284e39acf692469336f5f7b4c9dfa0cee79e12776aa3b9564",
+                          "value": "1"
                         }
                       }
                     }
@@ -182,11 +187,6 @@ Response: {
           }
         ]
       }
-    },
-    "before_obj_3_0_chkpt_2": {
-      "consistent_with_above": {
-        "nodes": []
-      }
     }
   }
 }
@@ -205,16 +205,21 @@ task 13, lines 184-247:
 Response: {
   "data": {
     "after_obj_3_0_chkpt_2": {
+      "objects": {
+        "nodes": []
+      }
+    },
+    "before_obj_3_0_chkpt_2": {
       "objects": {
         "nodes": [
           {
             "version": 5,
             "contents": {
               "type": {
-                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
+                "repr": "0x63a48560be4455576c42db1f2087091d1f49d97370eb5840211d6d96922a38e6::M1::Object"
               },
               "json": {
-                "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
+                "id": "0x3b3871be586c1577dc2762b64c5d96dd133d646d1451ee4422879772df9fd47c",
                 "value": "200"
               }
             },
@@ -223,26 +228,26 @@ Response: {
                 "objects": {
                   "nodes": [
                     {
-                      "version": 4,
+                      "version": 5,
                       "contents": {
                         "type": {
-                          "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
+                          "repr": "0x63a48560be4455576c42db1f2087091d1f49d97370eb5840211d6d96922a38e6::M1::Object"
                         },
                         "json": {
-                          "id": "0x62667ab9dcc05a8e142344d516f796fe0f7cad2b50c8bdb4944a4eee03d0eda2",
-                          "value": "1"
+                          "id": "0x3b3871be586c1577dc2762b64c5d96dd133d646d1451ee4422879772df9fd47c",
+                          "value": "200"
                         }
                       }
                     },
                     {
-                      "version": 5,
+                      "version": 4,
                       "contents": {
                         "type": {
-                          "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
+                          "repr": "0x63a48560be4455576c42db1f2087091d1f49d97370eb5840211d6d96922a38e6::M1::Object"
                         },
                         "json": {
-                          "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
-                          "value": "200"
+                          "id": "0x9ec42e10c73fb04284e39acf692469336f5f7b4c9dfa0cee79e12776aa3b9564",
+                          "value": "1"
                         }
                       }
                     }
@@ -253,11 +258,6 @@ Response: {
           }
         ]
       }
-    },
-    "before_obj_3_0_chkpt_2": {
-      "objects": {
-        "nodes": []
-      }
     }
   }
 }
@@ -270,26 +270,26 @@ Response: {
       "objects": {
         "nodes": [
           {
-            "version": 6,
+            "version": 5,
             "contents": {
               "type": {
-                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
+                "repr": "0x63a48560be4455576c42db1f2087091d1f49d97370eb5840211d6d96922a38e6::M1::Object"
               },
               "json": {
-                "id": "0x62667ab9dcc05a8e142344d516f796fe0f7cad2b50c8bdb4944a4eee03d0eda2",
-                "value": "300"
+                "id": "0x3b3871be586c1577dc2762b64c5d96dd133d646d1451ee4422879772df9fd47c",
+                "value": "200"
               }
             }
           },
           {
-            "version": 5,
+            "version": 6,
             "contents": {
               "type": {
-                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
+                "repr": "0x63a48560be4455576c42db1f2087091d1f49d97370eb5840211d6d96922a38e6::M1::Object"
               },
               "json": {
-                "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
-                "value": "200"
+                "id": "0x9ec42e10c73fb04284e39acf692469336f5f7b4c9dfa0cee79e12776aa3b9564",
+                "value": "300"
               }
             }
           }
@@ -297,16 +297,21 @@ Response: {
       }
     },
     "after_obj_3_0_chkpt_3": {
+      "consistent_with_above": {
+        "nodes": []
+      }
+    },
+    "before_obj_3_0_chkpt_3": {
       "consistent_with_above": {
         "nodes": [
           {
             "version": 5,
             "contents": {
               "type": {
-                "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
+                "repr": "0x63a48560be4455576c42db1f2087091d1f49d97370eb5840211d6d96922a38e6::M1::Object"
               },
               "json": {
-                "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
+                "id": "0x3b3871be586c1577dc2762b64c5d96dd133d646d1451ee4422879772df9fd47c",
                 "value": "200"
               }
             },
@@ -315,26 +320,26 @@ Response: {
                 "objects": {
                   "nodes": [
                     {
-                      "version": 6,
+                      "version": 5,
                       "contents": {
                         "type": {
-                          "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
+                          "repr": "0x63a48560be4455576c42db1f2087091d1f49d97370eb5840211d6d96922a38e6::M1::Object"
                         },
                         "json": {
-                          "id": "0x62667ab9dcc05a8e142344d516f796fe0f7cad2b50c8bdb4944a4eee03d0eda2",
-                          "value": "300"
+                          "id": "0x3b3871be586c1577dc2762b64c5d96dd133d646d1451ee4422879772df9fd47c",
+                          "value": "200"
                         }
                       }
                     },
                     {
-                      "version": 5,
+                      "version": 6,
                       "contents": {
                         "type": {
-                          "repr": "0xfd187d68c2af018bc15874c1eccdafcf4993cfb6d0f576edecf2e76b23351a04::M1::Object"
+                          "repr": "0x63a48560be4455576c42db1f2087091d1f49d97370eb5840211d6d96922a38e6::M1::Object"
                         },
                         "json": {
-                          "id": "0xab1b31396d4daf2e033795f600d307744617e58153b65eeb66c0066d9631088d",
-                          "value": "200"
+                          "id": "0x9ec42e10c73fb04284e39acf692469336f5f7b4c9dfa0cee79e12776aa3b9564",
+                          "value": "300"
                         }
                       }
                     }
@@ -345,11 +350,6 @@ Response: {
           }
         ]
       }
-    },
-    "before_obj_3_0_chkpt_3": {
-      "consistent_with_above": {
-        "nodes": []
-      }
     }
   }
 }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp b/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp
index 7f4171d7f4e..5f6eb5b936c 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/performance/many_objects.exp
@@ -35,11 +35,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xff751c87f3b883a7ff93abee60ca050a29ec6ea09fd66061ff4829c8a7c69ee5",
-                "value": "375"
+                "id": "0xfee25a3c0ad2918c5715216ccc1064d51e8e119253a858d9c505e49829ce12f2",
+                "value": "79"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           }
@@ -54,11 +54,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffaf991778fc4d4562b90d83f97e681ea71d347ccd77169202b4a6867c23a34e",
-                "value": "122"
+                "id": "0xffbee3b5a935e9df0fd3672f21cba8af4090e405d09a153e4c7d303b9a601c83",
+                "value": "82"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           }
@@ -76,11 +76,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xfb7c7cef2cb5913912cd2e6a285b0c6d42e54dc6d78a5f10253b83deb36efd03",
-                "value": "193"
+                "id": "0xfea2e64d50da304df3f0bdd198bdd55950ba2ad8428ba36a71c50499e81196e6",
+                "value": "84"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           },
@@ -92,11 +92,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xfebe8d22fb68647c1aa5244ed4e11750a255615ffff505868a8ba08ed7af8d51",
-                "value": "290"
+                "id": "0xfecc8c412ef16dfd8c66a8d4d06b43b4cf64029e319a726b7e0dff3e1d75a85a",
+                "value": "425"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           },
@@ -108,11 +108,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xff751c87f3b883a7ff93abee60ca050a29ec6ea09fd66061ff4829c8a7c69ee5",
-                "value": "375"
+                "id": "0xfee25a3c0ad2918c5715216ccc1064d51e8e119253a858d9c505e49829ce12f2",
+                "value": "79"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           },
@@ -124,11 +124,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffaf991778fc4d4562b90d83f97e681ea71d347ccd77169202b4a6867c23a34e",
-                "value": "122"
+                "id": "0xffbee3b5a935e9df0fd3672f21cba8af4090e405d09a153e4c7d303b9a601c83",
+                "value": "82"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           }
@@ -163,7 +163,7 @@ Contents: Test::M1::Object {
             bytes: fake(2,498),
         },
     },
-    value: 375u64,
+    value: 79u64,
 }
 
 task 9, line 93:
@@ -176,7 +176,7 @@ Contents: Test::M1::Object {
             bytes: fake(2,497),
         },
     },
-    value: 290u64,
+    value: 425u64,
 }
 
 task 10, line 95:
@@ -199,11 +199,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xfebe8d22fb68647c1aa5244ed4e11750a255615ffff505868a8ba08ed7af8d51",
-                "value": "290"
+                "id": "0xfecc8c412ef16dfd8c66a8d4d06b43b4cf64029e319a726b7e0dff3e1d75a85a",
+                "value": "425"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           }
@@ -218,11 +218,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xff751c87f3b883a7ff93abee60ca050a29ec6ea09fd66061ff4829c8a7c69ee5",
-                "value": "375"
+                "id": "0xfee25a3c0ad2918c5715216ccc1064d51e8e119253a858d9c505e49829ce12f2",
+                "value": "79"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           }
@@ -237,11 +237,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffaf991778fc4d4562b90d83f97e681ea71d347ccd77169202b4a6867c23a34e",
-                "value": "122"
+                "id": "0xffbee3b5a935e9df0fd3672f21cba8af4090e405d09a153e4c7d303b9a601c83",
+                "value": "82"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           }
@@ -260,11 +260,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xfb7c7cef2cb5913912cd2e6a285b0c6d42e54dc6d78a5f10253b83deb36efd03",
-                "value": "193"
+                "id": "0xfea2e64d50da304df3f0bdd198bdd55950ba2ad8428ba36a71c50499e81196e6",
+                "value": "84"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           }
@@ -287,11 +287,11 @@ Response: {
         },
         "contents": {
           "json": {
-            "id": "0xffaf991778fc4d4562b90d83f97e681ea71d347ccd77169202b4a6867c23a34e",
-            "value": "122"
+            "id": "0xffbee3b5a935e9df0fd3672f21cba8af4090e405d09a153e4c7d303b9a601c83",
+            "value": "82"
           },
           "type": {
-            "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+            "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
           }
         }
       }
@@ -305,11 +305,11 @@ Response: {
         },
         "contents": {
           "json": {
-            "id": "0xffaf991778fc4d4562b90d83f97e681ea71d347ccd77169202b4a6867c23a34e",
-            "value": "122"
+            "id": "0xffbee3b5a935e9df0fd3672f21cba8af4090e405d09a153e4c7d303b9a601c83",
+            "value": "82"
           },
           "type": {
-            "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+            "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
           }
         }
       }
@@ -325,11 +325,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xfebe8d22fb68647c1aa5244ed4e11750a255615ffff505868a8ba08ed7af8d51",
-                "value": "290"
+                "id": "0xfecc8c412ef16dfd8c66a8d4d06b43b4cf64029e319a726b7e0dff3e1d75a85a",
+                "value": "425"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           }
@@ -343,11 +343,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xff751c87f3b883a7ff93abee60ca050a29ec6ea09fd66061ff4829c8a7c69ee5",
-                "value": "375"
+                "id": "0xfee25a3c0ad2918c5715216ccc1064d51e8e119253a858d9c505e49829ce12f2",
+                "value": "79"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           }
@@ -361,11 +361,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffaf991778fc4d4562b90d83f97e681ea71d347ccd77169202b4a6867c23a34e",
-                "value": "122"
+                "id": "0xffbee3b5a935e9df0fd3672f21cba8af4090e405d09a153e4c7d303b9a601c83",
+                "value": "82"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           }
@@ -383,11 +383,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xfebe8d22fb68647c1aa5244ed4e11750a255615ffff505868a8ba08ed7af8d51",
-                "value": "290"
+                "id": "0xfecc8c412ef16dfd8c66a8d4d06b43b4cf64029e319a726b7e0dff3e1d75a85a",
+                "value": "425"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           }
@@ -401,11 +401,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xff751c87f3b883a7ff93abee60ca050a29ec6ea09fd66061ff4829c8a7c69ee5",
-                "value": "375"
+                "id": "0xfee25a3c0ad2918c5715216ccc1064d51e8e119253a858d9c505e49829ce12f2",
+                "value": "79"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           }
@@ -419,11 +419,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffaf991778fc4d4562b90d83f97e681ea71d347ccd77169202b4a6867c23a34e",
-                "value": "122"
+                "id": "0xffbee3b5a935e9df0fd3672f21cba8af4090e405d09a153e4c7d303b9a601c83",
+                "value": "82"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           }
@@ -442,7 +442,7 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xbbaf7071fac8234841e340556e61315e7a2cfeab104b247c00ece6c4b61f91cc",
+                "id": "0x8c83e12848c9a7e043ba418598935d03fb0b57c9400df73504561b03ef0f57aa",
                 "balance": {
                   "value": "300000000000000"
                 }
@@ -461,11 +461,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xfebe8d22fb68647c1aa5244ed4e11750a255615ffff505868a8ba08ed7af8d51",
-                "value": "290"
+                "id": "0xfecc8c412ef16dfd8c66a8d4d06b43b4cf64029e319a726b7e0dff3e1d75a85a",
+                "value": "425"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           },
@@ -478,11 +478,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xff751c87f3b883a7ff93abee60ca050a29ec6ea09fd66061ff4829c8a7c69ee5",
-                "value": "375"
+                "id": "0xfee25a3c0ad2918c5715216ccc1064d51e8e119253a858d9c505e49829ce12f2",
+                "value": "79"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           },
@@ -495,11 +495,11 @@ Response: {
             },
             "contents": {
               "json": {
-                "id": "0xffaf991778fc4d4562b90d83f97e681ea71d347ccd77169202b4a6867c23a34e",
-                "value": "122"
+                "id": "0xffbee3b5a935e9df0fd3672f21cba8af4090e405d09a153e4c7d303b9a601c83",
+                "value": "82"
               },
               "type": {
-                "repr": "0x4a1014e018c9d665e8c955f55c48bd29d03eef8b8e2d1e843322d47466222d26::M1::Object"
+                "repr": "0x89a32608e93b711b15c16024864bc4c9cd544304a074178501304621fce34eeb::M1::Object"
               }
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp b/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp
index 5df7931c6c7..8d81fcbcba7 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/staked_iota.exp
@@ -25,7 +25,7 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000,  storage_rebate:
 
 task 3, line 25:
 //# run 0x3::iota_system::request_add_stake --args object(0x5) object(2,0) @validator_0 --sender C
-events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [145, 15, 164, 84, 142, 11, 207, 217, 113, 243, 177, 152, 98, 76, 51, 77, 95, 109, 180, 159, 85, 128, 9, 168, 91, 120, 227, 240, 142, 33, 89, 9, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
+events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [49, 170, 24, 91, 48, 51, 59, 190, 186, 64, 208, 42, 198, 226, 201, 28, 175, 76, 24, 236, 175, 216, 35, 217, 155, 5, 253, 225, 16, 3, 242, 32, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
 created: object(3,0)
 mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0)
 deleted: object(2,0)
@@ -49,7 +49,7 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000,  storage_rebate:
 
 task 7, line 35:
 //# run 0x3::iota_system::request_add_stake --args object(0x5) object(6,0) @validator_0 --sender C
-events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [145, 15, 164, 84, 142, 11, 207, 217, 113, 243, 177, 152, 98, 76, 51, 77, 95, 109, 180, 159, 85, 128, 9, 168, 91, 120, 227, 240, 142, 33, 89, 9, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
+events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [49, 170, 24, 91, 48, 51, 59, 190, 186, 64, 208, 42, 198, 226, 201, 28, 175, 76, 24, 236, 175, 216, 35, 217, 155, 5, 253, 225, 16, 3, 242, 32, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
 created: object(7,0)
 mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0)
 deleted: object(6,0)
@@ -109,13 +109,13 @@ Response: {
       "stakedIotas": {
         "edges": [
           {
-            "cursor": "IB4nCdY4SKIGpX9OX6BoEseOb5Di70Ir4QOHIZ6Hlv2bBAAAAAAAAAA=",
+            "cursor": "IAQrAZOt5Tzb2RJIfSxa7ZKgeo4PBwtgbBIDXKYNuoPLBAAAAAAAAAA=",
             "node": {
               "principal": "10000000000"
             }
           },
           {
-            "cursor": "IPZBsCp9CdP9iBWQhFfN6A2fcDP34decXACxmwerwQnGBAAAAAAAAAA=",
+            "cursor": "IJrDd+d17c/WP+y988FjFenwhf7ri3M2an2ad/goKgRVBAAAAAAAAAA=",
             "node": {
               "principal": "10000000000"
             }
@@ -161,7 +161,7 @@ Response: {
       "stakedIotas": {
         "edges": [
           {
-            "cursor": "IPZBsCp9CdP9iBWQhFfN6A2fcDP34decXACxmwerwQnGAwAAAAAAAAA=",
+            "cursor": "IJrDd+d17c/WP+y988FjFenwhf7ri3M2an2ad/goKgRVAwAAAAAAAAA=",
             "node": {
               "principal": "10000000000"
             }
@@ -183,7 +183,7 @@ Response: {
       "stakedIotas": {
         "edges": [
           {
-            "cursor": "IB4nCdY4SKIGpX9OX6BoEseOb5Di70Ir4QOHIZ6Hlv2bAwAAAAAAAAA=",
+            "cursor": "IAQrAZOt5Tzb2RJIfSxa7ZKgeo4PBwtgbBIDXKYNuoPLAwAAAAAAAAA=",
             "node": {
               "principal": "10000000000"
             }
diff --git a/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp b/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp
index 98dd88779da..3b300cca1d2 100644
--- a/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp
+++ b/crates/iota-graphql-e2e-tests/tests/consistency/tx_address_objects.exp
@@ -61,66 +61,66 @@ Response: {
           {
             "contents": {
               "json": {
-                "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                "value": "4"
+                "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                "value": "2"
               },
               "type": {
-                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                "value": "5"
+                "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                "value": "3"
               },
               "type": {
-                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                "value": "3"
+                "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                "value": "6"
               },
               "type": {
-                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                "value": "200"
+                "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                "value": "5"
               },
               "type": {
-                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                "value": "2"
+                "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                "value": "200"
               },
               "type": {
-                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                "value": "6"
+                "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                "value": "4"
               },
               "type": {
-                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
               }
             }
           }
@@ -136,66 +136,66 @@ Response: {
                 {
                   "contents": {
                     "json": {
-                      "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                      "value": "4"
+                      "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                      "value": "2"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                      "value": "5"
+                      "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                      "value": "3"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                      "value": "3"
+                      "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                      "value": "6"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                      "value": "200"
+                      "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                      "value": "5"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                      "value": "2"
+                      "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                      "value": "200"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                      "value": "6"
+                      "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                      "value": "4"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 }
@@ -209,66 +209,66 @@ Response: {
                   {
                     "contents": {
                       "json": {
-                        "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                        "value": "4"
+                        "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                        "value": "2"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                        "value": "5"
+                        "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                        "value": "3"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                        "value": "3"
+                        "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                        "value": "6"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                        "value": "200"
+                        "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                        "value": "5"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                        "value": "2"
+                        "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                        "value": "200"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                        "value": "6"
+                        "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                        "value": "4"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   }
@@ -284,7 +284,7 @@ Response: {
                         "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                       },
                       "json": {
-                        "id": "0x7dca443c043de9e8bb7b92c96e14c45027cf838913fce2da3c81cbfd4a9ac8ff",
+                        "id": "0x82bb50eab6528496249b1ee91f009840af9690b2e58d6c67308351244eb8283c",
                         "balance": {
                           "value": "299999993067600"
                         }
@@ -306,66 +306,66 @@ Response: {
               {
                 "contents": {
                   "json": {
-                    "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                    "value": "4"
+                    "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                    "value": "2"
                   },
                   "type": {
-                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                    "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                    "value": "5"
+                    "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                    "value": "3"
                   },
                   "type": {
-                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                    "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                    "value": "3"
+                    "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                    "value": "6"
                   },
                   "type": {
-                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                    "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                    "value": "200"
+                    "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                    "value": "5"
                   },
                   "type": {
-                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                    "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                    "value": "2"
+                    "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                    "value": "200"
                   },
                   "type": {
-                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                    "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                    "value": "6"
+                    "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                    "value": "4"
                   },
                   "type": {
-                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                    "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                   }
                 }
               }
@@ -390,66 +390,66 @@ Response: {
                 {
                   "contents": {
                     "json": {
-                      "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                      "value": "4"
+                      "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                      "value": "2"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                      "value": "5"
+                      "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                      "value": "3"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                      "value": "3"
+                      "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                      "value": "6"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                      "value": "200"
+                      "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                      "value": "5"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                      "value": "2"
+                      "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                      "value": "200"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                      "value": "6"
+                      "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                      "value": "4"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 }
@@ -463,66 +463,66 @@ Response: {
                   {
                     "contents": {
                       "json": {
-                        "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                        "value": "4"
+                        "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                        "value": "2"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                        "value": "5"
+                        "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                        "value": "3"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                        "value": "3"
+                        "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                        "value": "6"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                        "value": "200"
+                        "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                        "value": "5"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                        "value": "2"
+                        "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                        "value": "200"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                        "value": "6"
+                        "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                        "value": "4"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   }
@@ -538,7 +538,7 @@ Response: {
                         "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                       },
                       "json": {
-                        "id": "0x7dca443c043de9e8bb7b92c96e14c45027cf838913fce2da3c81cbfd4a9ac8ff",
+                        "id": "0x82bb50eab6528496249b1ee91f009840af9690b2e58d6c67308351244eb8283c",
                         "balance": {
                           "value": "300000000000000"
                         }
@@ -557,66 +557,66 @@ Response: {
                 {
                   "contents": {
                     "json": {
-                      "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                      "value": "4"
+                      "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                      "value": "2"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                      "value": "5"
+                      "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                      "value": "3"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                      "value": "3"
+                      "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                      "value": "6"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                      "value": "200"
+                      "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                      "value": "5"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                      "value": "2"
+                      "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                      "value": "200"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                      "value": "6"
+                      "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                      "value": "4"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 }
@@ -630,66 +630,66 @@ Response: {
                   {
                     "contents": {
                       "json": {
-                        "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                        "value": "4"
+                        "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                        "value": "2"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                        "value": "5"
+                        "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                        "value": "3"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                        "value": "3"
+                        "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                        "value": "6"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                        "value": "200"
+                        "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                        "value": "5"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                        "value": "2"
+                        "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                        "value": "200"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                        "value": "6"
+                        "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                        "value": "4"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   }
@@ -705,7 +705,7 @@ Response: {
                         "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                       },
                       "json": {
-                        "id": "0x7dca443c043de9e8bb7b92c96e14c45027cf838913fce2da3c81cbfd4a9ac8ff",
+                        "id": "0x82bb50eab6528496249b1ee91f009840af9690b2e58d6c67308351244eb8283c",
                         "balance": {
                           "value": "299999996697200"
                         }
@@ -724,66 +724,66 @@ Response: {
                 {
                   "contents": {
                     "json": {
-                      "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                      "value": "4"
+                      "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                      "value": "2"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                      "value": "5"
+                      "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                      "value": "3"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                      "value": "3"
+                      "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                      "value": "6"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                      "value": "200"
+                      "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                      "value": "5"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                      "value": "2"
+                      "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                      "value": "200"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                      "value": "6"
+                      "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                      "value": "4"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 }
@@ -797,66 +797,66 @@ Response: {
                   {
                     "contents": {
                       "json": {
-                        "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                        "value": "4"
+                        "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                        "value": "2"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                        "value": "5"
+                        "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                        "value": "3"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                        "value": "3"
+                        "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                        "value": "6"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                        "value": "200"
+                        "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                        "value": "5"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                        "value": "2"
+                        "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                        "value": "200"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                        "value": "6"
+                        "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                        "value": "4"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   }
@@ -872,7 +872,7 @@ Response: {
                         "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                       },
                       "json": {
-                        "id": "0x7dca443c043de9e8bb7b92c96e14c45027cf838913fce2da3c81cbfd4a9ac8ff",
+                        "id": "0x82bb50eab6528496249b1ee91f009840af9690b2e58d6c67308351244eb8283c",
                         "balance": {
                           "value": "299999993067600"
                         }
@@ -907,66 +907,66 @@ Response: {
           {
             "contents": {
               "json": {
-                "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                "value": "4"
+                "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                "value": "2"
               },
               "type": {
-                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                "value": "5"
+                "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                "value": "3"
               },
               "type": {
-                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                "value": "3"
+                "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                "value": "6"
               },
               "type": {
-                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                "value": "200"
+                "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                "value": "5"
               },
               "type": {
-                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                "value": "2"
+                "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                "value": "200"
               },
               "type": {
-                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
               }
             }
           },
           {
             "contents": {
               "json": {
-                "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                "value": "6"
+                "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                "value": "4"
               },
               "type": {
-                "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
               }
             }
           }
@@ -982,66 +982,66 @@ Response: {
                 {
                   "contents": {
                     "json": {
-                      "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                      "value": "4"
+                      "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                      "value": "2"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                      "value": "5"
+                      "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                      "value": "3"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                      "value": "3"
+                      "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                      "value": "6"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                      "value": "200"
+                      "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                      "value": "5"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                      "value": "2"
+                      "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                      "value": "200"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                      "value": "6"
+                      "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                      "value": "4"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 }
@@ -1055,66 +1055,66 @@ Response: {
                   {
                     "contents": {
                       "json": {
-                        "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                        "value": "4"
+                        "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                        "value": "2"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                        "value": "5"
+                        "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                        "value": "3"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                        "value": "3"
+                        "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                        "value": "6"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                        "value": "200"
+                        "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                        "value": "5"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                        "value": "2"
+                        "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                        "value": "200"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                        "value": "6"
+                        "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                        "value": "4"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   }
@@ -1130,7 +1130,7 @@ Response: {
                         "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                       },
                       "json": {
-                        "id": "0x7dca443c043de9e8bb7b92c96e14c45027cf838913fce2da3c81cbfd4a9ac8ff",
+                        "id": "0x82bb50eab6528496249b1ee91f009840af9690b2e58d6c67308351244eb8283c",
                         "balance": {
                           "value": "299999993067600"
                         }
@@ -1152,66 +1152,66 @@ Response: {
               {
                 "contents": {
                   "json": {
-                    "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                    "value": "4"
+                    "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                    "value": "2"
                   },
                   "type": {
-                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                    "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                    "value": "5"
+                    "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                    "value": "3"
                   },
                   "type": {
-                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                    "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                    "value": "3"
+                    "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                    "value": "6"
                   },
                   "type": {
-                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                    "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                    "value": "200"
+                    "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                    "value": "5"
                   },
                   "type": {
-                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                    "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                    "value": "2"
+                    "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                    "value": "200"
                   },
                   "type": {
-                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                    "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                   }
                 }
               },
               {
                 "contents": {
                   "json": {
-                    "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                    "value": "6"
+                    "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                    "value": "4"
                   },
                   "type": {
-                    "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                    "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                   }
                 }
               }
@@ -1240,66 +1240,66 @@ Response: {
                 {
                   "contents": {
                     "json": {
-                      "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                      "value": "4"
+                      "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                      "value": "2"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                      "value": "5"
+                      "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                      "value": "3"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                      "value": "3"
+                      "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                      "value": "6"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                      "value": "200"
+                      "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                      "value": "5"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                      "value": "2"
+                      "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                      "value": "200"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                      "value": "6"
+                      "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                      "value": "4"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 }
@@ -1313,66 +1313,66 @@ Response: {
                   {
                     "contents": {
                       "json": {
-                        "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                        "value": "4"
+                        "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                        "value": "2"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                        "value": "5"
+                        "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                        "value": "3"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                        "value": "3"
+                        "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                        "value": "6"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                        "value": "200"
+                        "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                        "value": "5"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                        "value": "2"
+                        "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                        "value": "200"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                        "value": "6"
+                        "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                        "value": "4"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   }
@@ -1388,66 +1388,66 @@ Response: {
                 {
                   "contents": {
                     "json": {
-                      "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                      "value": "4"
+                      "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                      "value": "2"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                      "value": "5"
+                      "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                      "value": "3"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                      "value": "3"
+                      "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                      "value": "6"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                      "value": "200"
+                      "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                      "value": "5"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                      "value": "2"
+                      "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                      "value": "200"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                      "value": "6"
+                      "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                      "value": "4"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 }
@@ -1461,66 +1461,66 @@ Response: {
                   {
                     "contents": {
                       "json": {
-                        "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                        "value": "4"
+                        "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                        "value": "2"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                        "value": "5"
+                        "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                        "value": "3"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                        "value": "3"
+                        "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                        "value": "6"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                        "value": "200"
+                        "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                        "value": "5"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                        "value": "2"
+                        "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                        "value": "200"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                        "value": "6"
+                        "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                        "value": "4"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   }
@@ -1536,66 +1536,66 @@ Response: {
                 {
                   "contents": {
                     "json": {
-                      "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                      "value": "4"
+                      "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                      "value": "2"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                      "value": "5"
+                      "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                      "value": "3"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                      "value": "3"
+                      "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                      "value": "6"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                      "value": "200"
+                      "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                      "value": "5"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                      "value": "2"
+                      "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                      "value": "200"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 },
                 {
                   "contents": {
                     "json": {
-                      "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                      "value": "6"
+                      "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                      "value": "4"
                     },
                     "type": {
-                      "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                      "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                     }
                   }
                 }
@@ -1609,66 +1609,66 @@ Response: {
                   {
                     "contents": {
                       "json": {
-                        "id": "0x30b0a4aa83133af52effa30cdabb3a9cc5a41e47b42267e49cd0d6c00b68d6dd",
-                        "value": "4"
+                        "id": "0x0dfd7a9cdee94766d4c1b19270f7dbd7047e333c3cfd44df8f1e2661a2ac5732",
+                        "value": "2"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x42fbbc99914a3ff0d1bf9dbbf177376217aa8b0dfefa64b24132302e9962d919",
-                        "value": "5"
+                        "id": "0x192e471166c47da606780a22e86f8a7e2c70e68d041960e09bcaa2c0c1b678b8",
+                        "value": "3"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0x92a4abb2533035be88b3f9f8ec48d40ef77ac1fc2e420c721b27f99ff962780b",
-                        "value": "3"
+                        "id": "0x5cf582fc547b526e90fa12b6b4ee03a31f4998e47555971daa39fb90b635acab",
+                        "value": "6"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xb7d71a7e67b79e908b9f8fd1114e05d6e4123b33e7b28cce6505d85b2cd69322",
-                        "value": "200"
+                        "id": "0x8a62e0e4fbced5ff4f9a1ad3644f1af80a2f844b6ef0c2b640f403d5fa3f5f96",
+                        "value": "5"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xddb6e5dd089ae403459f5396fcb6c8a308165924900b092be848943f74798b1a",
-                        "value": "2"
+                        "id": "0xa028335888c10360e8bd8851992994e834926d82ae1b0b97fcbe79fae04317f0",
+                        "value": "200"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   },
                   {
                     "contents": {
                       "json": {
-                        "id": "0xe82941ec7e1c9bdec6d109c6b980f1c88fb8d97fbebef07c4ab425c109c8051a",
-                        "value": "6"
+                        "id": "0xa3f7a32c0d6c8249a8022873aac692ed3fb9b21b24f670f384727d8462e6f29b",
+                        "value": "4"
                       },
                       "type": {
-                        "repr": "0xadaa13f57cf90e2a06a93cec28558e9b32a3eaf38f869c901bfb6e4a056335d2::M1::Object"
+                        "repr": "0x52bdbdebdd919e4a48b0a4d5debed87d2ef865900f1e7633960e97744d276e77::M1::Object"
                       }
                     }
                   }
diff --git a/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp b/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp
index b39d16de5ae..bce1c37583a 100644
--- a/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp
+++ b/crates/iota-graphql-e2e-tests/tests/epoch/chain_identifier.exp
@@ -11,6 +11,6 @@ task 2, lines 10-13:
 //# run-graphql
 Response: {
   "data": {
-    "chainIdentifier": "498fc7b7"
+    "chainIdentifier": "a505a911"
   }
 }
diff --git a/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp b/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp
index bdaf4103ec1..f9a2b40f756 100644
--- a/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp
+++ b/crates/iota-graphql-e2e-tests/tests/epoch/epoch.exp
@@ -21,7 +21,7 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000,  storage_rebate:
 
 task 4, lines 17-19:
 //# run 0x3::iota_system::request_add_stake --args object(0x5) object(3,0) @validator_0 --sender C
-events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [145, 15, 164, 84, 142, 11, 207, 217, 113, 243, 177, 152, 98, 76, 51, 77, 95, 109, 180, 159, 85, 128, 9, 168, 91, 120, 227, 240, 142, 33, 89, 9, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
+events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [49, 170, 24, 91, 48, 51, 59, 190, 186, 64, 208, 42, 198, 226, 201, 28, 175, 76, 24, 236, 175, 216, 35, 217, 155, 5, 253, 225, 16, 3, 242, 32, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
 created: object(4,0)
 mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0)
 deleted: object(3,0)
@@ -67,7 +67,7 @@ Response: {
           ]
         },
         "validatorCandidatesSize": 0,
-        "inactivePoolsId": "0x25f932331484290d3a7a9d1969b2a8179ab1856a3f2537c08a8f00065b0fff42"
+        "inactivePoolsId": "0x4fa514f402221f721a2b8ae3b09a5fedfd8b1574ef77f18579e9f78d914dc132"
       },
       "totalGasFees": "1000000",
       "totalStakeRewards": "767000000000000",
@@ -81,7 +81,7 @@ Response: {
             "kind": {
               "__typename": "ProgrammableTransactionBlock"
             },
-            "digest": "HG2EFvhhYApKyYKztCN2gz7VYne4SzpZUJhkHYJrqDrM"
+            "digest": "6HbK4VgBo4CXAsHZ3VKMJEa71LbHSqwQXMpWQanwdpBA"
           },
           {
             "kind": {
diff --git a/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp b/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp
index 12625db6f11..738fd6061e4 100644
--- a/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp
+++ b/crates/iota-graphql-e2e-tests/tests/epoch/system_state.exp
@@ -21,7 +21,7 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000,  storage_rebate:
 
 task 4, line 19:
 //# run 0x3::iota_system::request_add_stake --args object(0x5) object(3,0) @validator_0 --sender C
-events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [33, 207, 79, 188, 228, 111, 5, 28, 153, 171, 107, 187, 220, 163, 119, 157, 232, 0, 111, 197, 115, 2, 188, 216, 234, 10, 144, 127, 229, 209, 251, 1, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
+events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [210, 122, 151, 179, 143, 27, 83, 95, 180, 90, 2, 236, 215, 205, 52, 58, 137, 83, 186, 2, 9, 157, 59, 1, 11, 98, 143, 198, 7, 56, 210, 82, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
 created: object(4,0)
 mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0)
 deleted: object(3,0)
@@ -61,7 +61,7 @@ Epoch advanced: 3
 
 task 12, line 37:
 //# run 0x3::iota_system::request_withdraw_stake --args object(0x5) object(4,0) --sender C
-events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("UnstakingRequestEvent"), type_params: [] }, contents: [33, 207, 79, 188, 228, 111, 5, 28, 153, 171, 107, 187, 220, 163, 119, 157, 232, 0, 111, 197, 115, 2, 188, 216, 234, 10, 144, 127, 229, 209, 251, 1, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 2, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0, 12, 33, 189, 38, 1, 0, 0, 0] }
+events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("UnstakingRequestEvent"), type_params: [] }, contents: [210, 122, 151, 179, 143, 27, 83, 95, 180, 90, 2, 236, 215, 205, 52, 58, 137, 83, 186, 2, 9, 157, 59, 1, 11, 98, 143, 198, 7, 56, 210, 82, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 2, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0, 12, 33, 189, 38, 1, 0, 0, 0] }
 created: object(12,0)
 mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0)
 deleted: object(4,0)
diff --git a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp
index a3bae6617ee..5b7bad40bc2 100644
--- a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp
+++ b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors.exp
@@ -77,67 +77,67 @@ Response: {
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callU8' (line 30), abort 'ImAU8': 0"
+            "errors": "Error in 1st command, from '0x94c6029c2434df14ff8c96780213d2c3ca23bb41b41d917d6b2f2ebb5948bba2::m::callU8' (line 30), abort 'ImAU8': 0"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callU16' (line 33), abort 'ImAU16': 1"
+            "errors": "Error in 1st command, from '0x94c6029c2434df14ff8c96780213d2c3ca23bb41b41d917d6b2f2ebb5948bba2::m::callU16' (line 33), abort 'ImAU16': 1"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callU32' (line 36), abort 'ImAU32': 2"
+            "errors": "Error in 1st command, from '0x94c6029c2434df14ff8c96780213d2c3ca23bb41b41d917d6b2f2ebb5948bba2::m::callU32' (line 36), abort 'ImAU32': 2"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callU64' (line 39), abort 'ImAU64': 3"
+            "errors": "Error in 1st command, from '0x94c6029c2434df14ff8c96780213d2c3ca23bb41b41d917d6b2f2ebb5948bba2::m::callU64' (line 39), abort 'ImAU64': 3"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callU128' (line 42), abort 'ImAU128': 4"
+            "errors": "Error in 1st command, from '0x94c6029c2434df14ff8c96780213d2c3ca23bb41b41d917d6b2f2ebb5948bba2::m::callU128' (line 42), abort 'ImAU128': 4"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callU256' (line 45), abort 'ImAU256': 5"
+            "errors": "Error in 1st command, from '0x94c6029c2434df14ff8c96780213d2c3ca23bb41b41d917d6b2f2ebb5948bba2::m::callU256' (line 45), abort 'ImAU256': 5"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callAddress' (line 48), abort 'ImAnAddress': 0x0000000000000000000000000000000000000000000000000000000000000006"
+            "errors": "Error in 1st command, from '0x94c6029c2434df14ff8c96780213d2c3ca23bb41b41d917d6b2f2ebb5948bba2::m::callAddress' (line 48), abort 'ImAnAddress': 0x0000000000000000000000000000000000000000000000000000000000000006"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callString' (line 51), abort 'ImAString': This is a string"
+            "errors": "Error in 1st command, from '0x94c6029c2434df14ff8c96780213d2c3ca23bb41b41d917d6b2f2ebb5948bba2::m::callString' (line 51), abort 'ImAString': This is a string"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::callU64vec' (line 54), abort 'ImNotAString': BQEAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAQAAAAAAAAABQAAAAAAAAA="
+            "errors": "Error in 1st command, from '0x94c6029c2434df14ff8c96780213d2c3ca23bb41b41d917d6b2f2ebb5948bba2::m::callU64vec' (line 54), abort 'ImNotAString': BQEAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAQAAAAAAAAABQAAAAAAAAA="
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::normalAbort' (instruction 1), abort code: 0"
+            "errors": "Error in 1st command, from '0x94c6029c2434df14ff8c96780213d2c3ca23bb41b41d917d6b2f2ebb5948bba2::m::normalAbort' (instruction 1), abort code: 0"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0x1ef0f7ff2c4fa585c756a7a9034a2dd9e3bf4839395db8477162ab237a661e4f::m::assertLineNo' (line 60)"
+            "errors": "Error in 1st command, from '0x94c6029c2434df14ff8c96780213d2c3ca23bb41b41d917d6b2f2ebb5948bba2::m::assertLineNo' (line 60)"
           }
         }
       ]
@@ -248,7 +248,7 @@ Response: {
   },
   "errors": [
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 0f50ae8dea49abaf86777040792217d6569d4a9a478efe805648bbf001b32736",
       "locations": [
         {
           "line": 6,
@@ -264,7 +264,7 @@ Response: {
       ]
     },
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 0f50ae8dea49abaf86777040792217d6569d4a9a478efe805648bbf001b32736",
       "locations": [
         {
           "line": 6,
@@ -280,7 +280,7 @@ Response: {
       ]
     },
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 0f50ae8dea49abaf86777040792217d6569d4a9a478efe805648bbf001b32736",
       "locations": [
         {
           "line": 6,
@@ -296,7 +296,7 @@ Response: {
       ]
     },
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 0f50ae8dea49abaf86777040792217d6569d4a9a478efe805648bbf001b32736",
       "locations": [
         {
           "line": 6,
@@ -312,7 +312,7 @@ Response: {
       ]
     },
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 0f50ae8dea49abaf86777040792217d6569d4a9a478efe805648bbf001b32736",
       "locations": [
         {
           "line": 6,
@@ -328,7 +328,7 @@ Response: {
       ]
     },
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 0f50ae8dea49abaf86777040792217d6569d4a9a478efe805648bbf001b32736",
       "locations": [
         {
           "line": 6,
@@ -344,7 +344,7 @@ Response: {
       ]
     },
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 0f50ae8dea49abaf86777040792217d6569d4a9a478efe805648bbf001b32736",
       "locations": [
         {
           "line": 6,
@@ -360,7 +360,7 @@ Response: {
       ]
     },
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 0f50ae8dea49abaf86777040792217d6569d4a9a478efe805648bbf001b32736",
       "locations": [
         {
           "line": 6,
@@ -376,7 +376,7 @@ Response: {
       ]
     },
     {
-      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: e7db10091d30195c56df7cde67743f13e39da96ea5dae2c1c8b1ebf5ec3e10a7",
+      "message": "Internal error occurred while processing request: Error resolving Move location: Linkage not found for package: 0f50ae8dea49abaf86777040792217d6569d4a9a478efe805648bbf001b32736",
       "locations": [
         {
           "line": 6,
diff --git a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp
index 8a2f319a681..59061ed71c7 100644
--- a/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp
+++ b/crates/iota-graphql-e2e-tests/tests/errors/clever_errors_in_macros.exp
@@ -37,19 +37,19 @@ Response: {
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0xeb106ad70b9acf80d3e9f6c5f743121eb49d466dd80d22b55dffbde7efdd78cb::m::t_a' (line 21)"
+            "errors": "Error in 1st command, from '0x241fae3e4d798a2f17994debb2b0ad6fd6cd51b346c9d8ac0e03e2ccebca5572::m::t_a' (line 21)"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0xeb106ad70b9acf80d3e9f6c5f743121eb49d466dd80d22b55dffbde7efdd78cb::m::t_calls_a' (line 24)"
+            "errors": "Error in 1st command, from '0x241fae3e4d798a2f17994debb2b0ad6fd6cd51b346c9d8ac0e03e2ccebca5572::m::t_calls_a' (line 24)"
           }
         },
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0xeb106ad70b9acf80d3e9f6c5f743121eb49d466dd80d22b55dffbde7efdd78cb::m::t_const_assert' (line 10), abort 'EMsg': This is a string"
+            "errors": "Error in 1st command, from '0x241fae3e4d798a2f17994debb2b0ad6fd6cd51b346c9d8ac0e03e2ccebca5572::m::t_const_assert' (line 10), abort 'EMsg': This is a string"
           }
         }
       ]
diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp
index 9d9836f26c1..f632fa8a6b0 100644
--- a/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp
+++ b/crates/iota-graphql-e2e-tests/tests/event_connection/event_connection.exp
@@ -62,7 +62,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::EventA"
+              "repr": "0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -80,7 +80,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::EventB<0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::Object>"
+              "repr": "0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M1::EventB<0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M1::Object>"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -98,7 +98,7 @@ Response: {
               "name": "M2"
             },
             "type": {
-              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M2::EventA"
+              "repr": "0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M2::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -116,7 +116,7 @@ Response: {
               "name": "M2"
             },
             "type": {
-              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M2::EventB<0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M2::Object>"
+              "repr": "0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M2::EventB<0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M2::Object>"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -145,7 +145,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::EventA"
+              "repr": "0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -163,7 +163,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::EventB<0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::Object>"
+              "repr": "0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M1::EventB<0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M1::Object>"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -181,7 +181,7 @@ Response: {
               "name": "M2"
             },
             "type": {
-              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M2::EventA"
+              "repr": "0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M2::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -199,7 +199,7 @@ Response: {
               "name": "M2"
             },
             "type": {
-              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M2::EventB<0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M2::Object>"
+              "repr": "0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M2::EventB<0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M2::Object>"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -228,7 +228,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::EventA"
+              "repr": "0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -246,7 +246,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::EventB<0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::Object>"
+              "repr": "0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M1::EventB<0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M1::Object>"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -275,7 +275,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::EventA"
+              "repr": "0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -304,7 +304,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::EventB<0x957dbe7d15a79a6a5ef4843175ada985d4dafb52898cab9f148140a12b7e3611::M1::Object>"
+              "repr": "0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M1::EventB<0x18734bafba8425fa0cfcef1d81c2404447b7aba9377894991fdb48ec8178579f::M1::Object>"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp
index 0860ad4e755..3e0f0d1ba06 100644
--- a/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp
+++ b/crates/iota-graphql-e2e-tests/tests/event_connection/nested_emit_event.exp
@@ -30,7 +30,7 @@ Response: {
             "name": "M3"
           },
           "type": {
-            "repr": "0xe669e19726574786da1e6d1f4dccdd53ed82531033eedd54fdbf7b18413eb4e5::M1::EventA"
+            "repr": "0xca1ff4dd1b62e221255883bca417b321a5c1ace22988b9fc30533b45bead8d7a::M1::EventA"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -56,7 +56,7 @@ Response: {
             "name": "M3"
           },
           "type": {
-            "repr": "0xe669e19726574786da1e6d1f4dccdd53ed82531033eedd54fdbf7b18413eb4e5::M1::EventA"
+            "repr": "0xca1ff4dd1b62e221255883bca417b321a5c1ace22988b9fc30533b45bead8d7a::M1::EventA"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -102,7 +102,7 @@ Response: {
             "name": "M3"
           },
           "type": {
-            "repr": "0xe669e19726574786da1e6d1f4dccdd53ed82531033eedd54fdbf7b18413eb4e5::M1::EventA"
+            "repr": "0xca1ff4dd1b62e221255883bca417b321a5c1ace22988b9fc30533b45bead8d7a::M1::EventA"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp
index 4883dc9faea..ec8183e645c 100644
--- a/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp
+++ b/crates/iota-graphql-e2e-tests/tests/event_connection/no_filter.exp
@@ -33,12 +33,12 @@ Response: {
       "nodes": [
         {
           "json": {
-            "id": "0x5d8d5aba4c9f2a7f2b1aec08255c1218349dd40d72385152f22419a5550dde6d"
+            "id": "0xb6e011ba43a8f27aee78bbc435c234b3fce376c8d60344943a44559ade21177f"
           }
         },
         {
           "json": {
-            "id": "0x5d8d5aba4c9f2a7f2b1aec08255c1218349dd40d72385152f22419a5550dde6d",
+            "id": "0xb6e011ba43a8f27aee78bbc435c234b3fce376c8d60344943a44559ade21177f",
             "version": 1,
             "fields": {
               "contents": [
diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp
index f988c8ec9a1..2bbbd7814fd 100644
--- a/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp
+++ b/crates/iota-graphql-e2e-tests/tests/event_connection/pagination.exp
@@ -42,7 +42,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
+              "repr": "0x3c6f36ccaf3c22c331de4bc921054be9415a5ddaee8e84cdb3fe6c0ceba0be63::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -60,7 +60,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
+              "repr": "0x3c6f36ccaf3c22c331de4bc921054be9415a5ddaee8e84cdb3fe6c0ceba0be63::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -78,7 +78,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
+              "repr": "0x3c6f36ccaf3c22c331de4bc921054be9415a5ddaee8e84cdb3fe6c0ceba0be63::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -111,7 +111,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
+              "repr": "0x3c6f36ccaf3c22c331de4bc921054be9415a5ddaee8e84cdb3fe6c0ceba0be63::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -129,7 +129,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
+              "repr": "0x3c6f36ccaf3c22c331de4bc921054be9415a5ddaee8e84cdb3fe6c0ceba0be63::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -162,7 +162,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
+              "repr": "0x3c6f36ccaf3c22c331de4bc921054be9415a5ddaee8e84cdb3fe6c0ceba0be63::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -180,7 +180,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
+              "repr": "0x3c6f36ccaf3c22c331de4bc921054be9415a5ddaee8e84cdb3fe6c0ceba0be63::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -213,7 +213,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
+              "repr": "0x3c6f36ccaf3c22c331de4bc921054be9415a5ddaee8e84cdb3fe6c0ceba0be63::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -231,7 +231,7 @@ Response: {
               "name": "M1"
             },
             "type": {
-              "repr": "0x498d8aac03f90011de5cbbf5712cde070a9d4b97db73ce939903b35a157581f4::M1::EventA"
+              "repr": "0x3c6f36ccaf3c22c331de4bc921054be9415a5ddaee8e84cdb3fe6c0ceba0be63::M1::EventA"
             },
             "sender": {
               "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp
index adab78103cb..1c6bf222bbd 100644
--- a/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp
+++ b/crates/iota-graphql-e2e-tests/tests/event_connection/tx_digest.exp
@@ -37,19 +37,19 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "BK3Kekkcdo6pkxFkib2gWaw7ozbTd1P9GFJf1Gdkk4Tw"
+          "digest": "4pDtmR9vkzE8azKseWj5VXQQiz7616KJAGftpBncdmnF"
         },
         {
-          "digest": "GS1LUR1UjD8peuQQh48Nwz8typs5zgKKc98nKMruXyWM"
+          "digest": "HUi3tvRsCvbSjuhnFvniVBSd9s74cnLkMmg7r39tUciy"
         },
         {
-          "digest": "69jE7Qho2T86X2SV89rF1esL9kM62eiTnuKADDmtThHT"
+          "digest": "G3D18M1UjMxG2anS67U9iiKNzT8vEpohY85LNcvaQoZR"
         },
         {
-          "digest": "5pbswh7EYi78wk6TQSWZ1v2vPrxnmHLbzGEK7UZ2wKJs"
+          "digest": "GzkLZu91TX1CQKpAPmUMVUBETfuK48NjhYt9ikD4bSwh"
         },
         {
-          "digest": "sywyCLK4TcmA9BVQtTjoqUdBAErTELaMhDL5bt7ALcb"
+          "digest": "2Wn17H19KQAHB8f9XhdP16DVKdZhEt1e3o7nWK6fAVMS"
         }
       ]
     }
diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp
index 3906f8ebf7c..1b3c812fe2b 100644
--- a/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp
+++ b/crates/iota-graphql-e2e-tests/tests/event_connection/type_filter.exp
@@ -30,7 +30,7 @@ Response: {
             "name": "M2"
           },
           "type": {
-            "repr": "0x422e0763776294d86553fb26e6b1c8d97552f094b3806c6ddd81236de58d7e4a::M1::EventA"
+            "repr": "0xf431b4cab19dce38fdeb5af2f25aa5c7642cbf5a6736bcf4cd0cf6cedcd6e563::M1::EventA"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -72,7 +72,7 @@ Response: {
             "name": "M2"
           },
           "type": {
-            "repr": "0x422e0763776294d86553fb26e6b1c8d97552f094b3806c6ddd81236de58d7e4a::M1::EventA"
+            "repr": "0xf431b4cab19dce38fdeb5af2f25aa5c7642cbf5a6736bcf4cd0cf6cedcd6e563::M1::EventA"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -98,7 +98,7 @@ Response: {
             "name": "M2"
           },
           "type": {
-            "repr": "0x422e0763776294d86553fb26e6b1c8d97552f094b3806c6ddd81236de58d7e4a::M2::EventB"
+            "repr": "0xf431b4cab19dce38fdeb5af2f25aa5c7642cbf5a6736bcf4cd0cf6cedcd6e563::M2::EventB"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -124,7 +124,7 @@ Response: {
             "name": "M2"
           },
           "type": {
-            "repr": "0x422e0763776294d86553fb26e6b1c8d97552f094b3806c6ddd81236de58d7e4a::M1::EventA"
+            "repr": "0xf431b4cab19dce38fdeb5af2f25aa5c7642cbf5a6736bcf4cd0cf6cedcd6e563::M1::EventA"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -139,7 +139,7 @@ Response: {
             "name": "M2"
           },
           "type": {
-            "repr": "0x422e0763776294d86553fb26e6b1c8d97552f094b3806c6ddd81236de58d7e4a::M2::EventB"
+            "repr": "0xf431b4cab19dce38fdeb5af2f25aa5c7642cbf5a6736bcf4cd0cf6cedcd6e563::M2::EventB"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -165,7 +165,7 @@ Response: {
             "name": "M2"
           },
           "type": {
-            "repr": "0x422e0763776294d86553fb26e6b1c8d97552f094b3806c6ddd81236de58d7e4a::M1::EventA"
+            "repr": "0xf431b4cab19dce38fdeb5af2f25aa5c7642cbf5a6736bcf4cd0cf6cedcd6e563::M1::EventA"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -180,7 +180,7 @@ Response: {
             "name": "M2"
           },
           "type": {
-            "repr": "0x422e0763776294d86553fb26e6b1c8d97552f094b3806c6ddd81236de58d7e4a::M2::EventB"
+            "repr": "0xf431b4cab19dce38fdeb5af2f25aa5c7642cbf5a6736bcf4cd0cf6cedcd6e563::M2::EventB"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -195,7 +195,7 @@ Response: {
             "name": "M2"
           },
           "type": {
-            "repr": "0x422e0763776294d86553fb26e6b1c8d97552f094b3806c6ddd81236de58d7e4a::M2::EventB"
+            "repr": "0xf431b4cab19dce38fdeb5af2f25aa5c7642cbf5a6736bcf4cd0cf6cedcd6e563::M2::EventB"
           },
           "sender": {
             "address": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80"
diff --git a/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp b/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp
index 4a907d85fff..f20d79dfa38 100644
--- a/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp
+++ b/crates/iota-graphql-e2e-tests/tests/event_connection/type_param_filter.exp
@@ -38,19 +38,19 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "BK3Kekkcdo6pkxFkib2gWaw7ozbTd1P9GFJf1Gdkk4Tw"
+          "digest": "4pDtmR9vkzE8azKseWj5VXQQiz7616KJAGftpBncdmnF"
         },
         {
-          "digest": "2BkQ3DT8voU6VpD8Z14HUc8pBWg4Lp1BAxHgWHr3Wzw9"
+          "digest": "CN1bk5oGVbQh2cTepoMpk3vJ4Rss16Pciz7q69vtSfBK"
         },
         {
-          "digest": "3NfqshRsCameiFzacuNTCeZuCPdXreAPnoYUZaHGBKcu"
+          "digest": "6sxce4EnoEKB5a8Kkb7j9Y2kdvM25cQ4AR7ZhhQaHoNf"
         },
         {
-          "digest": "9rnY4B22nCrQvmhtcD1M3iqT8YHHiJgX4TzXMB2PLu71"
+          "digest": "7Jn3bBawv39UcLpSwNJy4d8sZjvXm6HDaUvAzAkzymfu"
         },
         {
-          "digest": "Gz7VG7NigsGxm8Jzve4t1CC8ioTd3XKU5H2d2hBXBoGq"
+          "digest": "5cXJjik7eCRpzRAZhZFczJ8NLXVAHr2ZtKMAkKunCGWb"
         }
       ]
     }
@@ -65,7 +65,7 @@ Response: {
       "nodes": [
         {
           "type": {
-            "repr": "0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::EventA<0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::T1>"
+            "repr": "0xa78e531f537de9ea340c341127d77b622c0b1744aef6f50fd6e85e3de3151894::M1::EventA<0xa78e531f537de9ea340c341127d77b622c0b1744aef6f50fd6e85e3de3151894::M1::T1>"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -78,7 +78,7 @@ Response: {
         },
         {
           "type": {
-            "repr": "0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::EventA<0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::T2>"
+            "repr": "0xa78e531f537de9ea340c341127d77b622c0b1744aef6f50fd6e85e3de3151894::M1::EventA<0xa78e531f537de9ea340c341127d77b622c0b1744aef6f50fd6e85e3de3151894::M1::T2>"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -91,7 +91,7 @@ Response: {
         },
         {
           "type": {
-            "repr": "0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::EventA<0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::T1>"
+            "repr": "0xa78e531f537de9ea340c341127d77b622c0b1744aef6f50fd6e85e3de3151894::M1::EventA<0xa78e531f537de9ea340c341127d77b622c0b1744aef6f50fd6e85e3de3151894::M1::T1>"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -104,7 +104,7 @@ Response: {
         },
         {
           "type": {
-            "repr": "0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::EventA<0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::T2>"
+            "repr": "0xa78e531f537de9ea340c341127d77b622c0b1744aef6f50fd6e85e3de3151894::M1::EventA<0xa78e531f537de9ea340c341127d77b622c0b1744aef6f50fd6e85e3de3151894::M1::T2>"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -128,7 +128,7 @@ Response: {
       "nodes": [
         {
           "type": {
-            "repr": "0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::EventA<0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::T1>"
+            "repr": "0xa78e531f537de9ea340c341127d77b622c0b1744aef6f50fd6e85e3de3151894::M1::EventA<0xa78e531f537de9ea340c341127d77b622c0b1744aef6f50fd6e85e3de3151894::M1::T1>"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
@@ -141,7 +141,7 @@ Response: {
         },
         {
           "type": {
-            "repr": "0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::EventA<0x1c319e03a07f747b7ca8954ec17dce780476652ab1d6729d684d4754b3a01874::M1::T1>"
+            "repr": "0xa78e531f537de9ea340c341127d77b622c0b1744aef6f50fd6e85e3de3151894::M1::EventA<0xa78e531f537de9ea340c341127d77b622c0b1744aef6f50fd6e85e3de3151894::M1::T1>"
           },
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
diff --git a/crates/iota-graphql-e2e-tests/tests/limits/directives.exp b/crates/iota-graphql-e2e-tests/tests/limits/directives.exp
index 17d543837fd..a3d59975e32 100644
--- a/crates/iota-graphql-e2e-tests/tests/limits/directives.exp
+++ b/crates/iota-graphql-e2e-tests/tests/limits/directives.exp
@@ -73,7 +73,7 @@ task 5, lines 59-63:
 //# run-graphql
 Response: {
   "data": {
-    "chainIdentifier": "498fc7b7"
+    "chainIdentifier": "a505a911"
   }
 }
 
@@ -81,7 +81,7 @@ task 6, lines 65-69:
 //# run-graphql
 Response: {
   "data": {
-    "chainIdentifier": "498fc7b7"
+    "chainIdentifier": "a505a911"
   }
 }
 
diff --git a/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp b/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp
index 840343a950c..0eeb20274e3 100644
--- a/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp
+++ b/crates/iota-graphql-e2e-tests/tests/limits/output_node_estimation.exp
@@ -30,7 +30,7 @@ Response: {
       "edges": [
         {
           "node": {
-            "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
+            "digest": "A47B3FAttYy3F2YU1xp9uiMPHw7D8VAaf46hNRuDBEKj"
           }
         }
       ]
@@ -59,7 +59,7 @@ Response: {
             "edges": [
               {
                 "txns": {
-                  "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
+                  "digest": "A47B3FAttYy3F2YU1xp9uiMPHw7D8VAaf46hNRuDBEKj"
                 }
               }
             ]
@@ -91,7 +91,7 @@ Response: {
             "edges": [
               {
                 "txns": {
-                  "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
+                  "digest": "A47B3FAttYy3F2YU1xp9uiMPHw7D8VAaf46hNRuDBEKj"
                 }
               }
             ]
@@ -100,7 +100,7 @@ Response: {
             "edges": [
               {
                 "txns": {
-                  "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
+                  "digest": "A47B3FAttYy3F2YU1xp9uiMPHw7D8VAaf46hNRuDBEKj"
                 }
               }
             ]
@@ -132,7 +132,7 @@ Response: {
             "edges": [
               {
                 "txns": {
-                  "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
+                  "digest": "A47B3FAttYy3F2YU1xp9uiMPHw7D8VAaf46hNRuDBEKj"
                 }
               }
             ]
@@ -164,7 +164,7 @@ Response: {
       "edges": [
         {
           "txns": {
-            "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
+            "digest": "A47B3FAttYy3F2YU1xp9uiMPHw7D8VAaf46hNRuDBEKj"
           }
         }
       ]
@@ -190,7 +190,7 @@ Response: {
       "edges": [
         {
           "txns": {
-            "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
+            "digest": "A47B3FAttYy3F2YU1xp9uiMPHw7D8VAaf46hNRuDBEKj"
           }
         }
       ]
@@ -216,7 +216,7 @@ Response: {
       "edges": [
         {
           "txns": {
-            "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV",
+            "digest": "A47B3FAttYy3F2YU1xp9uiMPHw7D8VAaf46hNRuDBEKj",
             "first": null,
             "last": null
           }
@@ -243,7 +243,7 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV",
+          "digest": "A47B3FAttYy3F2YU1xp9uiMPHw7D8VAaf46hNRuDBEKj",
           "first": null,
           "last": null
         }
@@ -270,7 +270,7 @@ Response: {
       "edges": [
         {
           "txns": {
-            "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV",
+            "digest": "A47B3FAttYy3F2YU1xp9uiMPHw7D8VAaf46hNRuDBEKj",
             "a": null,
             "b": null
           }
@@ -324,7 +324,7 @@ Response: {
       "edges": [
         {
           "node": {
-            "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV",
+            "digest": "A47B3FAttYy3F2YU1xp9uiMPHw7D8VAaf46hNRuDBEKj",
             "a": null
           }
         }
@@ -350,14 +350,14 @@ Response: {
     "fragmentSpread": {
       "nodes": [
         {
-          "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
+          "digest": "A47B3FAttYy3F2YU1xp9uiMPHw7D8VAaf46hNRuDBEKj"
         }
       ]
     },
     "inlineFragment": {
       "nodes": [
         {
-          "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
+          "digest": "A47B3FAttYy3F2YU1xp9uiMPHw7D8VAaf46hNRuDBEKj"
         }
       ]
     }
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/coin.exp b/crates/iota-graphql-e2e-tests/tests/objects/coin.exp
index f2b3fa94e47..a859d76ec9e 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/coin.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/coin.exp
@@ -21,9 +21,9 @@ Response: {
     "iotaCoins": {
       "edges": [
         {
-          "cursor": "IFWIszDYouqyV5FHmkjHL8VomWv4zfT9PeNSxpAcCjH7AQAAAAAAAAA=",
+          "cursor": "IFDCMJdJdLjT6Le+OZddM2C8ehm/ZJHKVlw51Hw+PN9LAQAAAAAAAAA=",
           "node": {
-            "coinBalance": "299999983336400",
+            "coinBalance": "30000000000000000",
             "contents": {
               "type": {
                 "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
@@ -32,9 +32,9 @@ Response: {
           }
         },
         {
-          "cursor": "IKAh5Dwcyc/kwt5ZIi7j9i0+5VOEhni5CiLnWNgvOlisAQAAAAAAAAA=",
+          "cursor": "IHDpnPLb0qHgSGOGbvrnR/7p74bRRkkFAnpR7Lg2PFTQAQAAAAAAAAA=",
           "node": {
-            "coinBalance": "30000000000000000",
+            "coinBalance": "300000000000000",
             "contents": {
               "type": {
                 "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
@@ -43,9 +43,9 @@ Response: {
           }
         },
         {
-          "cursor": "ILvZCg1Mz3zj3t29+KJ3JJdhvtfE79wdbj6VlrZgQ21OAQAAAAAAAAA=",
+          "cursor": "IL9P0IAc2pvdRxMxausgZ/QNypMBcUq568HF9Kd+G6qVAQAAAAAAAAA=",
           "node": {
-            "coinBalance": "300000000000000",
+            "coinBalance": "299999983336400",
             "contents": {
               "type": {
                 "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
@@ -58,34 +58,34 @@ Response: {
     "fakeCoins": {
       "edges": [
         {
-          "cursor": "IMylKIZ2RJ3yz2r1X/fRLN00OhpfEv4x/ZFhIG+/fMpQAQAAAAAAAAA=",
+          "cursor": "IFA4jBAHNkqHQtofzy4hIHphXB4tCAbEldUb4NRilcOGAQAAAAAAAAA=",
           "node": {
-            "coinBalance": "2",
+            "coinBalance": "1",
             "contents": {
               "type": {
-                "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0xfc060d55fe18ece1944ee4395008a9c09d893dbb30880052acf23d3d1ffb56b5::fake::FAKE>"
+                "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x1e33d29ef2dc3b026aa7266a3d2011e4aa201e84b5fb3f1367082b37f54da374::fake::FAKE>"
               }
             }
           }
         },
         {
-          "cursor": "IN/u1Oaq78H+r+vyT7pKHqY/K3Zp47bishEsQXymiGE5AQAAAAAAAAA=",
+          "cursor": "IGJIfsW7fZrYpkDNTP3pln7VBXM75eeK0ZA4ejDGv91yAQAAAAAAAAA=",
           "node": {
-            "coinBalance": "1",
+            "coinBalance": "2",
             "contents": {
               "type": {
-                "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0xfc060d55fe18ece1944ee4395008a9c09d893dbb30880052acf23d3d1ffb56b5::fake::FAKE>"
+                "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x1e33d29ef2dc3b026aa7266a3d2011e4aa201e84b5fb3f1367082b37f54da374::fake::FAKE>"
               }
             }
           }
         },
         {
-          "cursor": "IPRYQvyvi5GnfnmpWB0yjvjM9PWhmsPGIMIBKJKhr1XgAQAAAAAAAAA=",
+          "cursor": "II2PjSigywJzW7GoyZlAjsss5ivN5WyqNwcZOQL3v4UlAQAAAAAAAAA=",
           "node": {
             "coinBalance": "3",
             "contents": {
               "type": {
-                "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0xfc060d55fe18ece1944ee4395008a9c09d893dbb30880052acf23d3d1ffb56b5::fake::FAKE>"
+                "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x1e33d29ef2dc3b026aa7266a3d2011e4aa201e84b5fb3f1367082b37f54da374::fake::FAKE>"
               }
             }
           }
@@ -96,7 +96,7 @@ Response: {
       "coins": {
         "edges": [
           {
-            "cursor": "IFWIszDYouqyV5FHmkjHL8VomWv4zfT9PeNSxpAcCjH7AQAAAAAAAAA=",
+            "cursor": "IL9P0IAc2pvdRxMxausgZ/QNypMBcUq568HF9Kd+G6qVAQAAAAAAAAA=",
             "node": {
               "coinBalance": "299999983336400",
               "contents": {
@@ -121,10 +121,10 @@ Response: {
             }
           },
           {
-            "cursor": "eyJ0IjoiMHhmYzA2MGQ1NWZlMThlY2UxOTQ0ZWU0Mzk1MDA4YTljMDlkODkzZGJiMzA4ODAwNTJhY2YyM2QzZDFmZmI1NmI1OjpmYWtlOjpGQUtFIiwiYyI6MX0",
+            "cursor": "eyJ0IjoiMHgxZTMzZDI5ZWYyZGMzYjAyNmFhNzI2NmEzZDIwMTFlNGFhMjAxZTg0YjVmYjNmMTM2NzA4MmIzN2Y1NGRhMzc0OjpmYWtlOjpGQUtFIiwiYyI6MX0",
             "node": {
               "coinType": {
-                "repr": "0xfc060d55fe18ece1944ee4395008a9c09d893dbb30880052acf23d3d1ffb56b5::fake::FAKE"
+                "repr": "0x1e33d29ef2dc3b026aa7266a3d2011e4aa201e84b5fb3f1367082b37f54da374::fake::FAKE"
               },
               "coinObjectCount": 3,
               "totalBalance": "6"
@@ -142,7 +142,7 @@ Response: {
       "lastBalance": {
         "edges": [
           {
-            "cursor": "eyJ0IjoiMHhmYzA2MGQ1NWZlMThlY2UxOTQ0ZWU0Mzk1MDA4YTljMDlkODkzZGJiMzA4ODAwNTJhY2YyM2QzZDFmZmI1NmI1OjpmYWtlOjpGQUtFIiwiYyI6MX0"
+            "cursor": "eyJ0IjoiMHgxZTMzZDI5ZWYyZGMzYjAyNmFhNzI2NmEzZDIwMTFlNGFhMjAxZTg0YjVmYjNmMTM2NzA4MmIzN2Y1NGRhMzc0OjpmYWtlOjpGQUtFIiwiYyI6MX0"
           }
         ]
       }
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/data.exp b/crates/iota-graphql-e2e-tests/tests/objects/data.exp
index 033c0567460..503cca381fa 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/data.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/data.exp
@@ -36,7 +36,7 @@ Response: {
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x978be5e7629f7d75c29b5b62ad5f84689df6bd5732710db5f5536675bcaa5d18::m::Foo"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         },
                         "data": {
                           "Struct": [
@@ -44,38 +44,111 @@ Response: {
                               "name": "id",
                               "value": {
                                 "UID": [
-                                  97,
-                                  93,
-                                  215,
-                                  24,
-                                  228,
-                                  168,
-                                  1,
-                                  172,
-                                  56,
-                                  40,
-                                  236,
+                                  112,
+                                  233,
+                                  156,
+                                  242,
+                                  219,
+                                  210,
+                                  161,
+                                  224,
+                                  72,
+                                  99,
+                                  134,
+                                  110,
+                                  250,
+                                  231,
+                                  71,
+                                  254,
+                                  233,
+                                  239,
+                                  134,
+                                  209,
+                                  70,
+                                  73,
+                                  5,
+                                  2,
+                                  122,
+                                  81,
                                   236,
-                                  19,
-                                  138,
-                                  18,
+                                  184,
+                                  54,
+                                  60,
+                                  84,
+                                  208
+                                ]
+                              }
+                            },
+                            {
+                              "name": "balance",
+                              "value": {
+                                "Struct": [
+                                  {
+                                    "name": "value",
+                                    "value": {
+                                      "Number": "299999988454400"
+                                    }
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        },
+                        "json": {
+                          "id": "0x70e99cf2dbd2a1e04863866efae747fee9ef86d1464905027a51ecb8363c54d0",
+                          "balance": {
+                            "value": "299999988454400"
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                {
+                  "outputState": {
+                    "asMoveObject": {
+                      "contents": {
+                        "type": {
+                          "repr": "0x498711649918127f97a23a33f69bb23d636c094bf0a2dfb0b7928e70768f46ca::m::Foo"
+                        },
+                        "data": {
+                          "Struct": [
+                            {
+                              "name": "id",
+                              "value": {
+                                "UID": [
+                                  184,
                                   164,
-                                  226,
-                                  88,
-                                  41,
-                                  39,
-                                  189,
-                                  180,
-                                  87,
-                                  193,
-                                  70,
-                                  75,
+                                  255,
                                   211,
-                                  210,
-                                  3,
-                                  175,
-                                  61,
-                                  213
+                                  205,
+                                  0,
+                                  70,
+                                  88,
+                                  65,
+                                  141,
+                                  214,
+                                  253,
+                                  1,
+                                  103,
+                                  29,
+                                  67,
+                                  20,
+                                  52,
+                                  1,
+                                  37,
+                                  200,
+                                  49,
+                                  85,
+                                  45,
+                                  76,
+                                  59,
+                                  195,
+                                  241,
+                                  172,
+                                  24,
+                                  62,
+                                  220
                                 ]
                               }
                             },
@@ -83,38 +156,38 @@ Response: {
                               "name": "f0",
                               "value": {
                                 "ID": [
-                                  97,
-                                  93,
-                                  215,
-                                  24,
-                                  228,
-                                  168,
-                                  1,
-                                  172,
-                                  56,
-                                  40,
-                                  236,
-                                  236,
-                                  19,
-                                  138,
-                                  18,
+                                  184,
                                   164,
-                                  226,
-                                  88,
-                                  41,
-                                  39,
-                                  189,
-                                  180,
-                                  87,
-                                  193,
-                                  70,
-                                  75,
+                                  255,
                                   211,
-                                  210,
-                                  3,
-                                  175,
-                                  61,
-                                  213
+                                  205,
+                                  0,
+                                  70,
+                                  88,
+                                  65,
+                                  141,
+                                  214,
+                                  253,
+                                  1,
+                                  103,
+                                  29,
+                                  67,
+                                  20,
+                                  52,
+                                  1,
+                                  37,
+                                  200,
+                                  49,
+                                  85,
+                                  45,
+                                  76,
+                                  59,
+                                  195,
+                                  241,
+                                  172,
+                                  24,
+                                  62,
+                                  220
                                 ]
                               }
                             },
@@ -154,38 +227,38 @@ Response: {
                                 "Vector": [
                                   {
                                     "Address": [
-                                      97,
-                                      93,
-                                      215,
-                                      24,
-                                      228,
-                                      168,
-                                      1,
-                                      172,
-                                      56,
-                                      40,
-                                      236,
-                                      236,
-                                      19,
-                                      138,
-                                      18,
+                                      184,
                                       164,
-                                      226,
-                                      88,
-                                      41,
-                                      39,
-                                      189,
-                                      180,
-                                      87,
-                                      193,
-                                      70,
-                                      75,
+                                      255,
                                       211,
-                                      210,
-                                      3,
-                                      175,
-                                      61,
-                                      213
+                                      205,
+                                      0,
+                                      70,
+                                      88,
+                                      65,
+                                      141,
+                                      214,
+                                      253,
+                                      1,
+                                      103,
+                                      29,
+                                      67,
+                                      20,
+                                      52,
+                                      1,
+                                      37,
+                                      200,
+                                      49,
+                                      85,
+                                      45,
+                                      76,
+                                      59,
+                                      195,
+                                      241,
+                                      172,
+                                      24,
+                                      62,
+                                      220
                                     ]
                                   }
                                 ]
@@ -202,94 +275,21 @@ Response: {
                           ]
                         },
                         "json": {
-                          "id": "0x615dd718e4a801ac3828ecec138a12a4e2582927bdb457c1464bd3d203af3dd5",
-                          "f0": "0x615dd718e4a801ac3828ecec138a12a4e2582927bdb457c1464bd3d203af3dd5",
+                          "id": "0xb8a4ffd3cd004658418dd6fd01671d4314340125c831552d4c3bc3f1ac183edc",
+                          "f0": "0xb8a4ffd3cd004658418dd6fd01671d4314340125c831552d4c3bc3f1ac183edc",
                           "f1": true,
                           "f2": 42,
                           "f3": "43",
                           "f4": "hello",
                           "f5": "world",
                           "f6": [
-                            "0x615dd718e4a801ac3828ecec138a12a4e2582927bdb457c1464bd3d203af3dd5"
+                            "0xb8a4ffd3cd004658418dd6fd01671d4314340125c831552d4c3bc3f1ac183edc"
                           ],
                           "f7": 44
                         }
                       }
                     }
                   }
-                },
-                {
-                  "outputState": {
-                    "asMoveObject": {
-                      "contents": {
-                        "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
-                        },
-                        "data": {
-                          "Struct": [
-                            {
-                              "name": "id",
-                              "value": {
-                                "UID": [
-                                  187,
-                                  217,
-                                  10,
-                                  13,
-                                  76,
-                                  207,
-                                  124,
-                                  227,
-                                  222,
-                                  221,
-                                  189,
-                                  248,
-                                  162,
-                                  119,
-                                  36,
-                                  151,
-                                  97,
-                                  190,
-                                  215,
-                                  196,
-                                  239,
-                                  220,
-                                  29,
-                                  110,
-                                  62,
-                                  149,
-                                  150,
-                                  182,
-                                  96,
-                                  67,
-                                  109,
-                                  78
-                                ]
-                              }
-                            },
-                            {
-                              "name": "balance",
-                              "value": {
-                                "Struct": [
-                                  {
-                                    "name": "value",
-                                    "value": {
-                                      "Number": "299999988454400"
-                                    }
-                                  }
-                                ]
-                              }
-                            }
-                          ]
-                        },
-                        "json": {
-                          "id": "0xbbd90a0d4ccf7ce3deddbdf8a277249761bed7c4efdc1d6e3e9596b660436d4e",
-                          "balance": {
-                            "value": "299999988454400"
-                          }
-                        }
-                      }
-                    }
-                  }
                 }
               ]
             }
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/display.exp b/crates/iota-graphql-e2e-tests/tests/objects/display.exp
index 04143a4282a..a9f50951805 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/display.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/display.exp
@@ -5,7 +5,7 @@ A: object(0,0)
 
 task 1, lines 7-131:
 //# publish --sender A
-events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("DisplayCreated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [236, 49, 20, 90, 216, 179, 253, 28, 186, 3, 190, 176, 113, 62, 87, 240, 200, 160, 158, 204, 33, 110, 243, 45, 230, 44, 226, 250, 87, 246, 187, 236] }
+events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("DisplayCreated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [248, 137, 132, 239, 209, 171, 93, 58, 95, 75, 91, 157, 171, 12, 120, 197, 127, 173, 56, 170, 100, 196, 176, 190, 137, 70, 125, 38, 161, 168, 46, 158] }
 created: object(1,0), object(1,1), object(1,2)
 mutated: object(0,0)
 gas summary: computation_cost: 1000000, storage_cost: 21470000,  storage_rebate: 0, non_refundable_storage_fee: 0
@@ -16,7 +16,7 @@ Checkpoint created: 1
 
 task 3, line 135:
 //# view-checkpoint
-CheckpointSummary { epoch: 0, seq: 1, content_digest: 5nziQdp2tLxVAj5j7iXTyrYz7Hstn5Zh5iqLAd7TaxLt,
+CheckpointSummary { epoch: 0, seq: 1, content_digest: 8bqohxWi718dVQ8LyyLiY918owiBWuRnHkudztaTgK5p,
             epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 1000000, storage_cost: 21470000, storage_rebate: 0, non_refundable_storage_fee: 0 }}
 
 task 4, line 137:
@@ -27,7 +27,7 @@ gas summary: computation_cost: 1000000, storage_cost: 3556800,  storage_rebate:
 
 task 5, line 139:
 //# run Test::boars::update_display_faulty --sender A --args object(1,1)
-events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [236, 49, 20, 90, 216, 179, 253, 28, 186, 3, 190, 176, 113, 62, 87, 240, 200, 160, 158, 204, 33, 110, 243, 45, 230, 44, 226, 250, 87, 246, 187, 236, 1, 0, 3, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125] }
+events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [248, 137, 132, 239, 209, 171, 93, 58, 95, 75, 91, 157, 171, 12, 120, 197, 127, 173, 56, 170, 100, 196, 176, 190, 137, 70, 125, 38, 161, 168, 46, 158, 1, 0, 3, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125] }
 mutated: object(0,0), object(1,1)
 gas summary: computation_cost: 1000000, storage_cost: 2941200,  storage_rebate: 2652400, non_refundable_storage_fee: 0
 
@@ -37,7 +37,7 @@ Checkpoint created: 2
 
 task 7, line 143:
 //# view-checkpoint
-CheckpointSummary { epoch: 0, seq: 2, content_digest: DVQKDwtJsrqwugyr2EP4UCAKw1RRVVapnPADhXTs5vaX,
+CheckpointSummary { epoch: 0, seq: 2, content_digest: 3hLJWozoaCNj2NgL516hNXfzxNr5HZ936iDUAb7HEToC,
             epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 3000000, storage_cost: 27968000, storage_rebate: 3640400, non_refundable_storage_fee: 0 }}
 
 task 8, lines 145-158:
@@ -74,7 +74,7 @@ Response: {
 
 task 9, line 160:
 //# run Test::boars::single_add --sender A --args object(1,1)
-events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [236, 49, 20, 90, 216, 179, 253, 28, 186, 3, 190, 176, 113, 62, 87, 240, 200, 160, 158, 204, 33, 110, 243, 45, 230, 44, 226, 250, 87, 246, 187, 236, 2, 0, 4, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125] }
+events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [248, 137, 132, 239, 209, 171, 93, 58, 95, 75, 91, 157, 171, 12, 120, 197, 127, 173, 56, 170, 100, 196, 176, 190, 137, 70, 125, 38, 161, 168, 46, 158, 2, 0, 4, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125] }
 mutated: object(0,0), object(1,1)
 gas summary: computation_cost: 1000000, storage_cost: 3032400,  storage_rebate: 2941200, non_refundable_storage_fee: 0
 
@@ -84,7 +84,7 @@ Checkpoint created: 3
 
 task 11, line 164:
 //# view-checkpoint
-CheckpointSummary { epoch: 0, seq: 3, content_digest: C7sxx5GSvnuc5RNaYkToaPRVoBxctRgY3ZNGkyZWGYSe,
+CheckpointSummary { epoch: 0, seq: 3, content_digest: GT5JWyT5cHsdfW3ohoPM6KnKDGePn4DQTV7r2WGbL6YJ,
             epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 4000000, storage_cost: 31000400, storage_rebate: 6581600, non_refundable_storage_fee: 0 }}
 
 task 12, lines 166-179:
@@ -126,7 +126,7 @@ Response: {
 
 task 13, line 181:
 //# run Test::boars::multi_add --sender A --args object(1,1)
-events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [236, 49, 20, 90, 216, 179, 253, 28, 186, 3, 190, 176, 113, 62, 87, 240, 200, 160, 158, 204, 33, 110, 243, 45, 230, 44, 226, 250, 87, 246, 187, 236, 3, 0, 15, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125, 5, 98, 111, 111, 108, 115, 7, 123, 98, 111, 111, 108, 115, 125, 5, 98, 117, 121, 101, 114, 7, 123, 98, 117, 121, 101, 114, 125, 4, 110, 97, 109, 101, 6, 123, 110, 97, 109, 101, 125, 7, 99, 114, 101, 97, 116, 111, 114, 9, 123, 99, 114, 101, 97, 116, 111, 114, 125, 5, 112, 114, 105, 99, 101, 7, 123, 112, 114, 105, 99, 101, 125, 11, 112, 114, 111, 106, 101, 99, 116, 95, 117, 114, 108, 58, 85, 110, 105, 113, 117, 101, 32, 66, 111, 97, 114, 32, 102, 114, 111, 109, 32, 116, 104, 101, 32, 66, 111, 97, 114, 115, 32, 99, 111, 108, 108, 101, 99, 116, 105, 111, 110, 32, 119, 105, 116, 104, 32, 123, 110, 97, 109, 101, 125, 32, 97, 110, 100, 32, 123, 105, 100, 125, 8, 98, 97, 115, 101, 95, 117, 114, 108, 32, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 123, 105, 109, 103, 95, 117, 114, 108, 125, 11, 110, 111, 95, 116, 101, 109, 112, 108, 97, 116, 101, 23, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 3, 97, 103, 101, 21, 123, 109, 101, 116, 97, 100, 97, 116, 97, 46, 110, 101, 115, 116, 101, 100, 46, 97, 103, 101, 125, 8, 102, 117, 108, 108, 95, 117, 114, 108, 10, 123, 102, 117, 108, 108, 95, 117, 114, 108, 125, 13, 101, 115, 99, 97, 112, 101, 95, 115, 121, 110, 116, 97, 120, 8, 92, 123, 110, 97, 109, 101, 92, 125] }
+events: Event { package_id: Test, transaction_module: Identifier("boars"), sender: A, type_: StructTag { address: iota, module: Identifier("display"), name: Identifier("VersionUpdated"), type_params: [Struct(StructTag { address: Test, module: Identifier("boars"), name: Identifier("Boar"), type_params: [] })] }, contents: [248, 137, 132, 239, 209, 171, 93, 58, 95, 75, 91, 157, 171, 12, 120, 197, 127, 173, 56, 170, 100, 196, 176, 190, 137, 70, 125, 38, 161, 168, 46, 158, 3, 0, 15, 7, 118, 101, 99, 116, 111, 114, 115, 5, 123, 118, 101, 99, 125, 3, 105, 100, 100, 5, 123, 105, 100, 100, 125, 5, 110, 97, 109, 101, 101, 7, 123, 110, 97, 109, 101, 101, 125, 4, 110, 117, 109, 115, 6, 123, 110, 117, 109, 115, 125, 5, 98, 111, 111, 108, 115, 7, 123, 98, 111, 111, 108, 115, 125, 5, 98, 117, 121, 101, 114, 7, 123, 98, 117, 121, 101, 114, 125, 4, 110, 97, 109, 101, 6, 123, 110, 97, 109, 101, 125, 7, 99, 114, 101, 97, 116, 111, 114, 9, 123, 99, 114, 101, 97, 116, 111, 114, 125, 5, 112, 114, 105, 99, 101, 7, 123, 112, 114, 105, 99, 101, 125, 11, 112, 114, 111, 106, 101, 99, 116, 95, 117, 114, 108, 58, 85, 110, 105, 113, 117, 101, 32, 66, 111, 97, 114, 32, 102, 114, 111, 109, 32, 116, 104, 101, 32, 66, 111, 97, 114, 115, 32, 99, 111, 108, 108, 101, 99, 116, 105, 111, 110, 32, 119, 105, 116, 104, 32, 123, 110, 97, 109, 101, 125, 32, 97, 110, 100, 32, 123, 105, 100, 125, 8, 98, 97, 115, 101, 95, 117, 114, 108, 32, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 123, 105, 109, 103, 95, 117, 114, 108, 125, 11, 110, 111, 95, 116, 101, 109, 112, 108, 97, 116, 101, 23, 104, 116, 116, 112, 115, 58, 47, 47, 103, 101, 116, 45, 97, 45, 98, 111, 97, 114, 46, 99, 111, 109, 47, 3, 97, 103, 101, 21, 123, 109, 101, 116, 97, 100, 97, 116, 97, 46, 110, 101, 115, 116, 101, 100, 46, 97, 103, 101, 125, 8, 102, 117, 108, 108, 95, 117, 114, 108, 10, 123, 102, 117, 108, 108, 95, 117, 114, 108, 125, 13, 101, 115, 99, 97, 112, 101, 95, 115, 121, 110, 116, 97, 120, 8, 92, 123, 110, 97, 109, 101, 92, 125] }
 mutated: object(0,0), object(1,1)
 gas summary: computation_cost: 1000000, storage_cost: 5236400,  storage_rebate: 3032400, non_refundable_storage_fee: 0
 
@@ -136,7 +136,7 @@ Checkpoint created: 4
 
 task 15, line 185:
 //# view-checkpoint
-CheckpointSummary { epoch: 0, seq: 4, content_digest: 9CyEjTU1BKFkS61qtauKTbtPRYTZ2AtWaBNYq2unhxhU,
+CheckpointSummary { epoch: 0, seq: 4, content_digest: FZ3NUMDDNAYyo9F5SCfMWxiNhVBXBGXq2sExSuqFRci7,
             epoch_rolling_gas_cost_summary: GasCostSummary { computation_cost: 5000000, storage_cost: 36236800, storage_rebate: 9614000, non_refundable_storage_fee: 0 }}
 
 task 16, lines 187-200:
@@ -195,7 +195,7 @@ Response: {
               },
               {
                 "key": "project_url",
-                "value": "Unique Boar from the Boars collection with First Boar and 0xa4526250ab04115ddb2e91d45acfca1625ad309af01eb66867f3d5859a5a598c",
+                "value": "Unique Boar from the Boars collection with First Boar and 0x2ca38919c6ef2883f3e5b20bb603e89a26eb971435a4db4b422bdd0b510bb97a",
                 "error": null
               },
               {
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp b/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp
index fbe60c1bbc6..73e5a4c756f 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/enum_data.exp
@@ -36,7 +36,7 @@ Response: {
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x06a6545ddc2d380720e3639a402b1deb624dbd229a48c24d4054cf8997caac4f::m::Foo"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         },
                         "data": {
                           "Struct": [
@@ -44,38 +44,111 @@ Response: {
                               "name": "id",
                               "value": {
                                 "UID": [
-                                  75,
-                                  194,
-                                  4,
-                                  128,
-                                  167,
-                                  122,
-                                  247,
-                                  88,
-                                  165,
-                                  245,
+                                  112,
+                                  233,
+                                  156,
                                   242,
-                                  89,
-                                  22,
-                                  223,
-                                  140,
-                                  40,
+                                  219,
+                                  210,
+                                  161,
                                   224,
-                                  148,
-                                  248,
-                                  115,
-                                  33,
+                                  72,
+                                  99,
+                                  134,
+                                  110,
+                                  250,
                                   231,
-                                  31,
-                                  43,
-                                  201,
-                                  8,
-                                  74,
-                                  123,
-                                  42,
+                                  71,
+                                  254,
+                                  233,
+                                  239,
+                                  134,
+                                  209,
+                                  70,
+                                  73,
+                                  5,
+                                  2,
+                                  122,
+                                  81,
+                                  236,
+                                  184,
+                                  54,
+                                  60,
+                                  84,
+                                  208
+                                ]
+                              }
+                            },
+                            {
+                              "name": "balance",
+                              "value": {
+                                "Struct": [
+                                  {
+                                    "name": "value",
+                                    "value": {
+                                      "Number": "299999995967600"
+                                    }
+                                  }
+                                ]
+                              }
+                            }
+                          ]
+                        },
+                        "json": {
+                          "id": "0x70e99cf2dbd2a1e04863866efae747fee9ef86d1464905027a51ecb8363c54d0",
+                          "balance": {
+                            "value": "299999995967600"
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                {
+                  "outputState": {
+                    "asMoveObject": {
+                      "contents": {
+                        "type": {
+                          "repr": "0x09e9ea19900041e086ff7a4daea031f781e0b2b5fe4a6fc7d0aab9d96335405e::m::Foo"
+                        },
+                        "data": {
+                          "Struct": [
+                            {
+                              "name": "id",
+                              "value": {
+                                "UID": [
+                                  147,
+                                  80,
+                                  56,
+                                  94,
+                                  196,
+                                  219,
+                                  69,
+                                  255,
+                                  108,
+                                  11,
+                                  82,
+                                  234,
+                                  181,
+                                  174,
+                                  32,
+                                  45,
+                                  160,
                                   129,
-                                  91,
-                                  146
+                                  40,
+                                  102,
+                                  104,
+                                  73,
+                                  146,
+                                  209,
+                                  143,
+                                  102,
+                                  228,
+                                  61,
+                                  103,
+                                  79,
+                                  99,
+                                  143
                                 ]
                               }
                             },
@@ -83,38 +156,38 @@ Response: {
                               "name": "f0",
                               "value": {
                                 "ID": [
-                                  75,
-                                  194,
-                                  4,
-                                  128,
-                                  167,
-                                  122,
-                                  247,
-                                  88,
-                                  165,
-                                  245,
-                                  242,
-                                  89,
-                                  22,
-                                  223,
-                                  140,
-                                  40,
-                                  224,
-                                  148,
-                                  248,
-                                  115,
-                                  33,
-                                  231,
-                                  31,
-                                  43,
-                                  201,
-                                  8,
-                                  74,
-                                  123,
-                                  42,
+                                  147,
+                                  80,
+                                  56,
+                                  94,
+                                  196,
+                                  219,
+                                  69,
+                                  255,
+                                  108,
+                                  11,
+                                  82,
+                                  234,
+                                  181,
+                                  174,
+                                  32,
+                                  45,
+                                  160,
                                   129,
-                                  91,
-                                  146
+                                  40,
+                                  102,
+                                  104,
+                                  73,
+                                  146,
+                                  209,
+                                  143,
+                                  102,
+                                  228,
+                                  61,
+                                  103,
+                                  79,
+                                  99,
+                                  143
                                 ]
                               }
                             },
@@ -154,38 +227,38 @@ Response: {
                                 "Vector": [
                                   {
                                     "Address": [
-                                      75,
-                                      194,
-                                      4,
-                                      128,
-                                      167,
-                                      122,
-                                      247,
-                                      88,
-                                      165,
-                                      245,
-                                      242,
-                                      89,
-                                      22,
-                                      223,
-                                      140,
-                                      40,
-                                      224,
-                                      148,
-                                      248,
-                                      115,
-                                      33,
-                                      231,
-                                      31,
-                                      43,
-                                      201,
-                                      8,
-                                      74,
-                                      123,
-                                      42,
+                                      147,
+                                      80,
+                                      56,
+                                      94,
+                                      196,
+                                      219,
+                                      69,
+                                      255,
+                                      108,
+                                      11,
+                                      82,
+                                      234,
+                                      181,
+                                      174,
+                                      32,
+                                      45,
+                                      160,
                                       129,
-                                      91,
-                                      146
+                                      40,
+                                      102,
+                                      104,
+                                      73,
+                                      146,
+                                      209,
+                                      143,
+                                      102,
+                                      228,
+                                      61,
+                                      103,
+                                      79,
+                                      99,
+                                      143
                                     ]
                                   }
                                 ]
@@ -252,15 +325,15 @@ Response: {
                           ]
                         },
                         "json": {
-                          "id": "0x4bc20480a77af758a5f5f25916df8c28e094f87321e71f2bc9084a7b2a815b92",
-                          "f0": "0x4bc20480a77af758a5f5f25916df8c28e094f87321e71f2bc9084a7b2a815b92",
+                          "id": "0x9350385ec4db45ff6c0b52eab5ae202da0812866684992d18f66e43d674f638f",
+                          "f0": "0x9350385ec4db45ff6c0b52eab5ae202da0812866684992d18f66e43d674f638f",
                           "f1": true,
                           "f2": 42,
                           "f3": "43",
                           "f4": "hello",
                           "f5": "world",
                           "f6": [
-                            "0x4bc20480a77af758a5f5f25916df8c28e094f87321e71f2bc9084a7b2a815b92"
+                            "0x9350385ec4db45ff6c0b52eab5ae202da0812866684992d18f66e43d674f638f"
                           ],
                           "f7": 44,
                           "f8": {
@@ -283,79 +356,6 @@ Response: {
                       }
                     }
                   }
-                },
-                {
-                  "outputState": {
-                    "asMoveObject": {
-                      "contents": {
-                        "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
-                        },
-                        "data": {
-                          "Struct": [
-                            {
-                              "name": "id",
-                              "value": {
-                                "UID": [
-                                  187,
-                                  217,
-                                  10,
-                                  13,
-                                  76,
-                                  207,
-                                  124,
-                                  227,
-                                  222,
-                                  221,
-                                  189,
-                                  248,
-                                  162,
-                                  119,
-                                  36,
-                                  151,
-                                  97,
-                                  190,
-                                  215,
-                                  196,
-                                  239,
-                                  220,
-                                  29,
-                                  110,
-                                  62,
-                                  149,
-                                  150,
-                                  182,
-                                  96,
-                                  67,
-                                  109,
-                                  78
-                                ]
-                              }
-                            },
-                            {
-                              "name": "balance",
-                              "value": {
-                                "Struct": [
-                                  {
-                                    "name": "value",
-                                    "value": {
-                                      "Number": "299999995967600"
-                                    }
-                                  }
-                                ]
-                              }
-                            }
-                          ]
-                        },
-                        "json": {
-                          "id": "0xbbd90a0d4ccf7ce3deddbdf8a277249761bed7c4efdc1d6e3e9596b660436d4e",
-                          "balance": {
-                            "value": "299999995967600"
-                          }
-                        }
-                      }
-                    }
-                  }
                 }
               ]
             }
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp b/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp
index 5d81642f530..78f0707b26c 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/filter_by_type.exp
@@ -21,7 +21,7 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000,  storage_rebate:
 
 task 4, lines 16-18:
 //# run 0x3::iota_system::request_add_stake --args object(0x5) object(3,0) @validator_0 --sender C
-events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [145, 15, 164, 84, 142, 11, 207, 217, 113, 243, 177, 152, 98, 76, 51, 77, 95, 109, 180, 159, 85, 128, 9, 168, 91, 120, 227, 240, 142, 33, 89, 9, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
+events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [49, 170, 24, 91, 48, 51, 59, 190, 186, 64, 208, 42, 198, 226, 201, 28, 175, 76, 24, 236, 175, 216, 35, 217, 155, 5, 253, 225, 16, 3, 242, 32, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 1, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
 created: object(4,0)
 mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0)
 deleted: object(3,0)
@@ -145,7 +145,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::PoolTokenExchangeRate>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                 }
               }
             }
@@ -156,7 +156,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::PoolTokenExchangeRate>"
                 }
               }
             }
@@ -167,7 +167,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<vector<u8>,0x0000000000000000000000000000000000000000000000000000000000000002::timelock::SystemTimelockCap>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                 }
               }
             }
@@ -178,7 +178,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<vector<u8>,0x0000000000000000000000000000000000000000000000000000000000000002::timelock::SystemTimelockCap>"
                 }
               }
             }
@@ -200,7 +200,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000002::random::RandomInner>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                 }
               }
             }
@@ -211,7 +211,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000002::random::RandomInner>"
                 }
               }
             }
@@ -233,7 +233,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>"
                 }
               }
             }
@@ -244,7 +244,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                 }
               }
             }
@@ -277,7 +277,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                 }
               }
             }
@@ -310,7 +310,7 @@ Response: {
             "asMoveObject": {
               "contents": {
                 "type": {
-                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                  "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                 }
               }
             }
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp b/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp
index 3631a202d72..9408867f056 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/pagination.exp
@@ -48,19 +48,19 @@ Response: {
       "objects": {
         "edges": [
           {
-            "cursor": "IEtMi4tntPtNHNRt+TFKFSRhjlir2kBMxXfCP/qp/3fRAQAAAAAAAAA="
+            "cursor": "IAtX50fqxe9lE/0KbsFXzRXYkmqZSXFONhH8fIQOkY79AQAAAAAAAAA="
           },
           {
-            "cursor": "IFBTD0mWDzKij0QXlnOXZUh52Hks6/mOfGXkA2MUNl9SAQAAAAAAAAA="
+            "cursor": "IBRvcym3o3lAi+fkn+rKvWhxII5VBEmbPN3EvfzcjW6xAQAAAAAAAAA="
           },
           {
-            "cursor": "IJ78fny4yh0J9RkYpz6YU4eZGVnPrs8xvf2tkle0s2mUAQAAAAAAAAA="
+            "cursor": "IGlwdnMK4Q5cUYCFiQuJjb9C6sq6CBnmSM4Cv6f4JPFHAQAAAAAAAAA="
           },
           {
-            "cursor": "ILsFOC6XyAclBKv7f3GiZyFx/ybpxfYB7Qtz9r8b394EAQAAAAAAAAA="
+            "cursor": "IHjvmz1Xhf4Pu+w59JIFoXHQq7nzrlx62fyrVNQbyGUBAQAAAAAAAAA="
           },
           {
-            "cursor": "IP4kc9X8JMvd+74NpCI8f4Z7iHX+i24f+Aw4oAchY2ZeAQAAAAAAAAA="
+            "cursor": "IOziwiP8CYItF9V8oDdjwywGT6P6iY8ubkh4SRbhG5MxAQAAAAAAAAA="
           }
         ]
       }
@@ -76,10 +76,10 @@ Response: {
       "objects": {
         "edges": [
           {
-            "cursor": "IEtMi4tntPtNHNRt+TFKFSRhjlir2kBMxXfCP/qp/3fRAQAAAAAAAAA="
+            "cursor": "IAtX50fqxe9lE/0KbsFXzRXYkmqZSXFONhH8fIQOkY79AQAAAAAAAAA="
           },
           {
-            "cursor": "IFBTD0mWDzKij0QXlnOXZUh52Hks6/mOfGXkA2MUNl9SAQAAAAAAAAA="
+            "cursor": "IBRvcym3o3lAi+fkn+rKvWhxII5VBEmbPN3EvfzcjW6xAQAAAAAAAAA="
           }
         ]
       }
@@ -95,52 +95,52 @@ Response: {
       "objects": {
         "edges": [
           {
-            "cursor": "IEtMi4tntPtNHNRt+TFKFSRhjlir2kBMxXfCP/qp/3fRAQAAAAAAAAA=",
+            "cursor": "IAtX50fqxe9lE/0KbsFXzRXYkmqZSXFONhH8fIQOkY79AQAAAAAAAAA=",
             "node": {
-              "address": "0x4b4c8b8b67b4fb4d1cd46df9314a1524618e58abda404cc577c23ffaa9ff77d1"
+              "address": "0x0b57e747eac5ef6513fd0a6ec157cd15d8926a9949714e3611fc7c840e918efd"
             }
           },
           {
-            "cursor": "IFBTD0mWDzKij0QXlnOXZUh52Hks6/mOfGXkA2MUNl9SAQAAAAAAAAA=",
+            "cursor": "IBRvcym3o3lAi+fkn+rKvWhxII5VBEmbPN3EvfzcjW6xAQAAAAAAAAA=",
             "node": {
-              "address": "0x50530f49960f32a28f4417967397654879d8792cebf98e7c65e4036314365f52"
+              "address": "0x146f7329b7a379408be7e49feacabd6871208e5504499b3cddc4bdfcdc8d6eb1"
             }
           },
           {
-            "cursor": "IJ78fny4yh0J9RkYpz6YU4eZGVnPrs8xvf2tkle0s2mUAQAAAAAAAAA=",
+            "cursor": "IGlwdnMK4Q5cUYCFiQuJjb9C6sq6CBnmSM4Cv6f4JPFHAQAAAAAAAAA=",
             "node": {
-              "address": "0x9efc7e7cb8ca1d09f51918a73e985387991959cfaecf31bdfdad9257b4b36994"
+              "address": "0x697076730ae10e5c518085890b898dbf42eacaba0819e648ce02bfa7f824f147"
             }
           },
           {
-            "cursor": "ILsFOC6XyAclBKv7f3GiZyFx/ybpxfYB7Qtz9r8b394EAQAAAAAAAAA=",
+            "cursor": "IHjvmz1Xhf4Pu+w59JIFoXHQq7nzrlx62fyrVNQbyGUBAQAAAAAAAAA=",
             "node": {
-              "address": "0xbb05382e97c8072504abfb7f71a2672171ff26e9c5f601ed0b73f6bf1bdfde04"
+              "address": "0x78ef9b3d5785fe0fbbec39f49205a171d0abb9f3ae5c7ad9fcab54d41bc86501"
             }
           },
           {
-            "cursor": "IP4kc9X8JMvd+74NpCI8f4Z7iHX+i24f+Aw4oAchY2ZeAQAAAAAAAAA=",
+            "cursor": "IOziwiP8CYItF9V8oDdjwywGT6P6iY8ubkh4SRbhG5MxAQAAAAAAAAA=",
             "node": {
-              "address": "0xfe2473d5fc24cbddfbbe0da4223c7f867b8875fe8b6e1ff80c38a0072163665e"
+              "address": "0xece2c223fc09822d17d57ca03763c32c064fa3fa898f2e6e48784916e11b9331"
             }
           }
         ]
       }
     },
     "obj_3_0": {
-      "address": "0x9efc7e7cb8ca1d09f51918a73e985387991959cfaecf31bdfdad9257b4b36994"
+      "address": "0x697076730ae10e5c518085890b898dbf42eacaba0819e648ce02bfa7f824f147"
     },
     "obj_5_0": {
-      "address": "0x50530f49960f32a28f4417967397654879d8792cebf98e7c65e4036314365f52"
+      "address": "0x0b57e747eac5ef6513fd0a6ec157cd15d8926a9949714e3611fc7c840e918efd"
     },
     "obj_6_0": {
-      "address": "0xfe2473d5fc24cbddfbbe0da4223c7f867b8875fe8b6e1ff80c38a0072163665e"
+      "address": "0x146f7329b7a379408be7e49feacabd6871208e5504499b3cddc4bdfcdc8d6eb1"
     },
     "obj_4_0": {
-      "address": "0xbb05382e97c8072504abfb7f71a2672171ff26e9c5f601ed0b73f6bf1bdfde04"
+      "address": "0x78ef9b3d5785fe0fbbec39f49205a171d0abb9f3ae5c7ad9fcab54d41bc86501"
     },
     "obj_2_0": {
-      "address": "0x4b4c8b8b67b4fb4d1cd46df9314a1524618e58abda404cc577c23ffaa9ff77d1"
+      "address": "0xece2c223fc09822d17d57ca03763c32c064fa3fa898f2e6e48784916e11b9331"
     }
   }
 }
@@ -153,10 +153,10 @@ Response: {
       "objects": {
         "edges": [
           {
-            "cursor": "IJ78fny4yh0J9RkYpz6YU4eZGVnPrs8xvf2tkle0s2mUAQAAAAAAAAA="
+            "cursor": "IBRvcym3o3lAi+fkn+rKvWhxII5VBEmbPN3EvfzcjW6xAQAAAAAAAAA="
           },
           {
-            "cursor": "ILsFOC6XyAclBKv7f3GiZyFx/ybpxfYB7Qtz9r8b394EAQAAAAAAAAA="
+            "cursor": "IGlwdnMK4Q5cUYCFiQuJjb9C6sq6CBnmSM4Cv6f4JPFHAQAAAAAAAAA="
           }
         ]
       }
@@ -172,7 +172,7 @@ Response: {
       "objects": {
         "edges": [
           {
-            "cursor": "IP4kc9X8JMvd+74NpCI8f4Z7iHX+i24f+Aw4oAchY2ZeAQAAAAAAAAA="
+            "cursor": "IOziwiP8CYItF9V8oDdjwywGT6P6iY8ubkh4SRbhG5MxAQAAAAAAAAA="
           }
         ]
       }
@@ -188,10 +188,10 @@ Response: {
       "objects": {
         "edges": [
           {
-            "cursor": "IEtMi4tntPtNHNRt+TFKFSRhjlir2kBMxXfCP/qp/3fRAQAAAAAAAAA="
+            "cursor": "IAtX50fqxe9lE/0KbsFXzRXYkmqZSXFONhH8fIQOkY79AQAAAAAAAAA="
           },
           {
-            "cursor": "IFBTD0mWDzKij0QXlnOXZUh52Hks6/mOfGXkA2MUNl9SAQAAAAAAAAA="
+            "cursor": "IBRvcym3o3lAi+fkn+rKvWhxII5VBEmbPN3EvfzcjW6xAQAAAAAAAAA="
           }
         ]
       }
@@ -207,15 +207,15 @@ Response: {
       "objects": {
         "edges": [
           {
-            "cursor": "ILsFOC6XyAclBKv7f3GiZyFx/ybpxfYB7Qtz9r8b394EAQAAAAAAAAA=",
+            "cursor": "IHjvmz1Xhf4Pu+w59JIFoXHQq7nzrlx62fyrVNQbyGUBAQAAAAAAAAA=",
             "node": {
-              "address": "0xbb05382e97c8072504abfb7f71a2672171ff26e9c5f601ed0b73f6bf1bdfde04"
+              "address": "0x78ef9b3d5785fe0fbbec39f49205a171d0abb9f3ae5c7ad9fcab54d41bc86501"
             }
           },
           {
-            "cursor": "IP4kc9X8JMvd+74NpCI8f4Z7iHX+i24f+Aw4oAchY2ZeAQAAAAAAAAA=",
+            "cursor": "IOziwiP8CYItF9V8oDdjwywGT6P6iY8ubkh4SRbhG5MxAQAAAAAAAAA=",
             "node": {
-              "address": "0xfe2473d5fc24cbddfbbe0da4223c7f867b8875fe8b6e1ff80c38a0072163665e"
+              "address": "0xece2c223fc09822d17d57ca03763c32c064fa3fa898f2e6e48784916e11b9331"
             }
           }
         ]
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp b/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp
index 24598318d86..3bccffd887a 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/public_transfer.exp
@@ -37,7 +37,7 @@ Response: {
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x9675aabf28cc532b860b087a1faad53eb993a3ddffb4f1a2db4fb5d97d7bfbe2::m::Foo"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         }
                       },
                       "hasPublicTransfer": true
@@ -49,10 +49,10 @@ Response: {
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x9675aabf28cc532b860b087a1faad53eb993a3ddffb4f1a2db4fb5d97d7bfbe2::m::Bar"
+                          "repr": "0x5dcee5041fc8e936ebc590c5d365907985d08aa45f3dc1bca8037f55e99ca26f::m::Foo"
                         }
                       },
-                      "hasPublicTransfer": false
+                      "hasPublicTransfer": true
                     }
                   }
                 },
@@ -61,10 +61,10 @@ Response: {
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                          "repr": "0x5dcee5041fc8e936ebc590c5d365907985d08aa45f3dc1bca8037f55e99ca26f::m::Bar"
                         }
                       },
-                      "hasPublicTransfer": true
+                      "hasPublicTransfer": false
                     }
                   }
                 }
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/received.exp b/crates/iota-graphql-e2e-tests/tests/objects/received.exp
index bb44ca58c92..0c8a9df3c9e 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/received.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/received.exp
@@ -30,7 +30,7 @@ Response: {
       "receivedTransactionBlocks": {
         "nodes": [
           {
-            "digest": "Fb2wDmqir1tAnHNmBbfUcDSX1FBgCkCGLWD3h3t3a8xs"
+            "digest": "BAZTCk2JAbyY6xeVB9at1omTbUsCDJdNh9ssAHs3ZhRf"
           }
         ]
       }
diff --git a/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp b/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp
index 048fe7abd23..9ef24437142 100644
--- a/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp
+++ b/crates/iota-graphql-e2e-tests/tests/objects/staked_iota.exp
@@ -10,7 +10,7 @@ Response: {
     "objects": {
       "edges": [
         {
-          "cursor": "IGKt/jr0fh7rcbg4aVomqFmmaPEUDMoBUVZYdSQmBy3UAAAAAAAAAAA=",
+          "cursor": "IBLNnwcEO5XjKkP6B2QL5vf9fi98WuQ9957HYs8/UvpIAAAAAAAAAAA=",
           "node": {
             "asMoveObject": {
               "asStakedIota": {
@@ -39,7 +39,7 @@ gas summary: computation_cost: 1000000, storage_cost: 1976000,  storage_rebate:
 
 task 3, line 38:
 //# run 0x3::iota_system::request_add_stake --args object(0x5) object(2,0) @validator_0 --sender C
-events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [145, 15, 164, 84, 142, 11, 207, 217, 113, 243, 177, 152, 98, 76, 51, 77, 95, 109, 180, 159, 85, 128, 9, 168, 91, 120, 227, 240, 142, 33, 89, 9, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
+events: Event { package_id: iota_system, transaction_module: Identifier("iota_system"), sender: C, type_: StructTag { address: iota_system, module: Identifier("validator"), name: Identifier("StakingRequestEvent"), type_params: [] }, contents: [49, 170, 24, 91, 48, 51, 59, 190, 186, 64, 208, 42, 198, 226, 201, 28, 175, 76, 24, 236, 175, 216, 35, 217, 155, 5, 253, 225, 16, 3, 242, 32, 175, 163, 158, 79, 0, 218, 226, 120, 249, 119, 199, 198, 147, 10, 94, 44, 118, 232, 93, 23, 165, 38, 215, 36, 187, 206, 15, 184, 31, 176, 125, 76, 140, 202, 78, 28, 224, 186, 89, 4, 206, 166, 29, 249, 36, 45, 162, 247, 210, 158, 62, 243, 40, 251, 126, 192, 124, 8, 107, 59, 244, 124, 166, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 228, 11, 84, 2, 0, 0, 0] }
 created: object(3,0)
 mutated: object(_), 0x0000000000000000000000000000000000000000000000000000000000000005, object(0,0)
 deleted: object(2,0)
@@ -60,34 +60,34 @@ Response: {
     "objects": {
       "edges": [
         {
-          "cursor": "IGKt/jr0fh7rcbg4aVomqFmmaPEUDMoBUVZYdSQmBy3UAgAAAAAAAAA=",
+          "cursor": "IBLNnwcEO5XjKkP6B2QL5vf9fi98WuQ9957HYs8/UvpIAgAAAAAAAAA=",
           "node": {
             "asMoveObject": {
               "asStakedIota": {
                 "principal": "1500000000000000",
-                "poolId": "0x910fa4548e0bcfd971f3b198624c334d5f6db49f558009a85b78e3f08e215909"
+                "poolId": "0x31aa185b30333bbeba40d02ac6e2c91caf4c18ecafd823d99b05fde11003f220"
               }
             }
           }
         },
         {
-          "cursor": "ILVYziRMbmfeQ0alyypl2nA4gTpsnVI0/mNu+O2M0UcwAgAAAAAAAAA=",
+          "cursor": "IJrDd+d17c/WP+y988FjFenwhf7ri3M2an2ad/goKgRVAgAAAAAAAAA=",
           "node": {
             "asMoveObject": {
               "asStakedIota": {
-                "principal": "15340000000000",
-                "poolId": "0x910fa4548e0bcfd971f3b198624c334d5f6db49f558009a85b78e3f08e215909"
+                "principal": "10000000000",
+                "poolId": "0x31aa185b30333bbeba40d02ac6e2c91caf4c18ecafd823d99b05fde11003f220"
               }
             }
           }
         },
         {
-          "cursor": "IPZBsCp9CdP9iBWQhFfN6A2fcDP34decXACxmwerwQnGAgAAAAAAAAA=",
+          "cursor": "ILVYziRMbmfeQ0alyypl2nA4gTpsnVI0/mNu+O2M0UcwAgAAAAAAAAA=",
           "node": {
             "asMoveObject": {
               "asStakedIota": {
-                "principal": "10000000000",
-                "poolId": "0x910fa4548e0bcfd971f3b198624c334d5f6db49f558009a85b78e3f08e215909"
+                "principal": "15340000000000",
+                "poolId": "0x31aa185b30333bbeba40d02ac6e2c91caf4c18ecafd823d99b05fde11003f220"
               }
             }
           }
@@ -98,7 +98,7 @@ Response: {
       "stakedIotas": {
         "edges": [
           {
-            "cursor": "IPZBsCp9CdP9iBWQhFfN6A2fcDP34decXACxmwerwQnGAgAAAAAAAAA=",
+            "cursor": "IJrDd+d17c/WP+y988FjFenwhf7ri3M2an2ad/goKgRVAgAAAAAAAAA=",
             "node": {
               "principal": "10000000000"
             }
diff --git a/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp b/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp
index f950481b7a1..8915e0f2ce5 100644
--- a/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp
+++ b/crates/iota-graphql-e2e-tests/tests/owner/downcasts.exp
@@ -24,7 +24,7 @@ Response: {
     },
     "coin": {
       "asObject": {
-        "digest": "AyDrhU7FR64WMxA9fahP9vssJvwGGBXZ7H1yBEc6Gdb6"
+        "digest": "F5pMFJHFfoyuckenh5qe7yptCoBunxbsDMUVNNRsgU8m"
       }
     }
   }
diff --git a/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp b/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp
index aeac5f10dc9..7a8f597a16f 100644
--- a/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp
+++ b/crates/iota-graphql-e2e-tests/tests/owner/root_version.exp
@@ -124,10 +124,10 @@ Response: {
           "version": 11,
           "contents": {
             "json": {
-              "id": "0x98ecb1d1d13658931c7d73d5df50b180bab96b01a671a4d7b8634a2265099987",
+              "id": "0xc374926b5d391cee2278e6aefc98d755f034e23f43ae8bc811ddd837f57c0834",
               "count": "1",
               "wrapped": {
-                "id": "0x415422d960969cb63f25ca6d955c5b085af3bd02c7ff5370c699cd06ce13de49",
+                "id": "0x852263eb4f91d23603f98dba1ed525bef9900a133e6be9bf129fd3a65bc0d89f",
                 "count": "1"
               }
             }
@@ -141,10 +141,10 @@ Response: {
           "version": 10,
           "contents": {
             "json": {
-              "id": "0x98ecb1d1d13658931c7d73d5df50b180bab96b01a671a4d7b8634a2265099987",
+              "id": "0xc374926b5d391cee2278e6aefc98d755f034e23f43ae8bc811ddd837f57c0834",
               "count": "1",
               "wrapped": {
-                "id": "0x415422d960969cb63f25ca6d955c5b085af3bd02c7ff5370c699cd06ce13de49",
+                "id": "0x852263eb4f91d23603f98dba1ed525bef9900a133e6be9bf129fd3a65bc0d89f",
                 "count": "1"
               }
             }
@@ -158,10 +158,10 @@ Response: {
           "version": 8,
           "contents": {
             "json": {
-              "id": "0x98ecb1d1d13658931c7d73d5df50b180bab96b01a671a4d7b8634a2265099987",
+              "id": "0xc374926b5d391cee2278e6aefc98d755f034e23f43ae8bc811ddd837f57c0834",
               "count": "1",
               "wrapped": {
-                "id": "0x415422d960969cb63f25ca6d955c5b085af3bd02c7ff5370c699cd06ce13de49",
+                "id": "0x852263eb4f91d23603f98dba1ed525bef9900a133e6be9bf129fd3a65bc0d89f",
                 "count": "0"
               }
             }
@@ -175,10 +175,10 @@ Response: {
           "version": 7,
           "contents": {
             "json": {
-              "id": "0x98ecb1d1d13658931c7d73d5df50b180bab96b01a671a4d7b8634a2265099987",
+              "id": "0xc374926b5d391cee2278e6aefc98d755f034e23f43ae8bc811ddd837f57c0834",
               "count": "0",
               "wrapped": {
-                "id": "0x415422d960969cb63f25ca6d955c5b085af3bd02c7ff5370c699cd06ce13de49",
+                "id": "0x852263eb4f91d23603f98dba1ed525bef9900a133e6be9bf129fd3a65bc0d89f",
                 "count": "0"
               }
             }
@@ -199,7 +199,7 @@ Response: {
           "version": 7,
           "contents": {
             "json": {
-              "id": "0x7f304b07dc4a77f61d8770470a347880ad5a99e3ce959001724f8df5fc677334",
+              "id": "0x7d6ea332b2a20736990c5f5bc557678aed0657be6f097be3c7e96861480ecc87",
               "count": "0"
             }
           }
@@ -212,7 +212,7 @@ Response: {
           "version": 10,
           "contents": {
             "json": {
-              "id": "0x7f304b07dc4a77f61d8770470a347880ad5a99e3ce959001724f8df5fc677334",
+              "id": "0x7d6ea332b2a20736990c5f5bc557678aed0657be6f097be3c7e96861480ecc87",
               "count": "1"
             }
           }
@@ -225,7 +225,7 @@ Response: {
           "version": 10,
           "contents": {
             "json": {
-              "id": "0x7f304b07dc4a77f61d8770470a347880ad5a99e3ce959001724f8df5fc677334",
+              "id": "0x7d6ea332b2a20736990c5f5bc557678aed0657be6f097be3c7e96861480ecc87",
               "count": "1"
             }
           }
@@ -238,7 +238,7 @@ Response: {
           "version": 7,
           "contents": {
             "json": {
-              "id": "0x7f304b07dc4a77f61d8770470a347880ad5a99e3ce959001724f8df5fc677334",
+              "id": "0x7d6ea332b2a20736990c5f5bc557678aed0657be6f097be3c7e96861480ecc87",
               "count": "0"
             }
           }
@@ -251,7 +251,7 @@ Response: {
           "version": 7,
           "contents": {
             "json": {
-              "id": "0x7f304b07dc4a77f61d8770470a347880ad5a99e3ce959001724f8df5fc677334",
+              "id": "0x7d6ea332b2a20736990c5f5bc557678aed0657be6f097be3c7e96861480ecc87",
               "count": "0"
             }
           }
@@ -271,7 +271,7 @@ Response: {
           "version": 7,
           "contents": {
             "json": {
-              "id": "0xc9d26b088c736cf6b9a23ca96b42a9286033aff111d8a55a2f24baf8370c734d",
+              "id": "0x1dce31614e17c87100fd146b73be1922d4821428c46093aa185b1f2d0dd114ae",
               "count": "0"
             }
           }
@@ -284,7 +284,7 @@ Response: {
           "version": 11,
           "contents": {
             "json": {
-              "id": "0xc9d26b088c736cf6b9a23ca96b42a9286033aff111d8a55a2f24baf8370c734d",
+              "id": "0x1dce31614e17c87100fd146b73be1922d4821428c46093aa185b1f2d0dd114ae",
               "count": "1"
             }
           }
@@ -297,7 +297,7 @@ Response: {
           "version": 7,
           "contents": {
             "json": {
-              "id": "0xc9d26b088c736cf6b9a23ca96b42a9286033aff111d8a55a2f24baf8370c734d",
+              "id": "0x1dce31614e17c87100fd146b73be1922d4821428c46093aa185b1f2d0dd114ae",
               "count": "0"
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp b/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp
index 1bf65ad85f7..b29280f5ce9 100644
--- a/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp
+++ b/crates/iota-graphql-e2e-tests/tests/packages/datatypes.exp
@@ -155,7 +155,7 @@ task 5, lines 73-97:
 Response: {
   "data": {
     "object": {
-      "address": "0x24b8c04b40a6b2edc6e1e63bc8e542b20550d54bedd0560345623e4ae92e5e9b",
+      "address": "0x65709604481ff7591f5646fedf7f32220cfedf5f65fa4f5ec6da2381b74ccccf",
       "asMovePackage": {
         "module": {
           "datatypes": {
@@ -190,7 +190,7 @@ task 6, lines 99-144:
 Response: {
   "data": {
     "object": {
-      "address": "0x24b8c04b40a6b2edc6e1e63bc8e542b20550d54bedd0560345623e4ae92e5e9b",
+      "address": "0x65709604481ff7591f5646fedf7f32220cfedf5f65fa4f5ec6da2381b74ccccf",
       "asMovePackage": {
         "module": {
           "datatypes": {
diff --git a/crates/iota-graphql-e2e-tests/tests/packages/enums.exp b/crates/iota-graphql-e2e-tests/tests/packages/enums.exp
index e027e68e398..64b21a90c2f 100644
--- a/crates/iota-graphql-e2e-tests/tests/packages/enums.exp
+++ b/crates/iota-graphql-e2e-tests/tests/packages/enums.exp
@@ -25,13 +25,13 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
+                    "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95",
                     "asMovePackage": null
                   }
                 },
                 {
                   "outputState": {
-                    "address": "0x6fb05f39d164221521f7b18df4739573e8931216a199cd151b14da1be74aaed0",
+                    "address": "0xf510c03759c677b311142f8dd9186f96a45753a56f38ec9fd0c1f0eeb247f6f6",
                     "asMovePackage": {
                       "module": {
                         "enum": {
@@ -90,7 +90,7 @@ Response: {
                 },
                 {
                   "outputState": {
-                    "address": "0xd4ed56ea8f35cba56cf2b495b9876631989ca8547d9035971c29072d9b074f46",
+                    "address": "0xf88d487a6ff809b197de42319d922601100d08be653a910f0908c6ca17f31571",
                     "asMovePackage": null
                   }
                 }
@@ -125,19 +125,13 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
-                    "asMovePackage": null
-                  }
-                },
-                {
-                  "outputState": {
-                    "address": "0x9e9c3691ade23e01a325d6c1d2174b26361948cdeeccec93f792ed47dd25737d",
+                    "address": "0x80c62b9fc2009929e7c442831a2288f7562424367d8e9b514aa2a8622028a7b6",
                     "asMovePackage": {
                       "module": {
                         "s": {
                           "module": {
                             "package": {
-                              "address": "0x6fb05f39d164221521f7b18df4739573e8931216a199cd151b14da1be74aaed0"
+                              "address": "0xf510c03759c677b311142f8dd9186f96a45753a56f38ec9fd0c1f0eeb247f6f6"
                             }
                           },
                           "name": "S",
@@ -192,7 +186,7 @@ Response: {
                         "t": {
                           "module": {
                             "package": {
-                              "address": "0x9e9c3691ade23e01a325d6c1d2174b26361948cdeeccec93f792ed47dd25737d"
+                              "address": "0x80c62b9fc2009929e7c442831a2288f7562424367d8e9b514aa2a8622028a7b6"
                             }
                           },
                           "name": "T",
@@ -222,12 +216,12 @@ Response: {
                                 {
                                   "name": "s",
                                   "type": {
-                                    "repr": "0x6fb05f39d164221521f7b18df4739573e8931216a199cd151b14da1be74aaed0::m::S",
+                                    "repr": "0xf510c03759c677b311142f8dd9186f96a45753a56f38ec9fd0c1f0eeb247f6f6::m::S",
                                     "signature": {
                                       "ref": null,
                                       "body": {
                                         "datatype": {
-                                          "package": "0x6fb05f39d164221521f7b18df4739573e8931216a199cd151b14da1be74aaed0",
+                                          "package": "0xf510c03759c677b311142f8dd9186f96a45753a56f38ec9fd0c1f0eeb247f6f6",
                                           "module": "m",
                                           "type": "S",
                                           "typeParameters": []
@@ -261,7 +255,7 @@ Response: {
                                 {
                                   "name": "t",
                                   "type": {
-                                    "repr": "0x6fb05f39d164221521f7b18df4739573e8931216a199cd151b14da1be74aaed0::m::T<0x6fb05f39d164221521f7b18df4739573e8931216a199cd151b14da1be74aaed0::m::S>"
+                                    "repr": "0xf510c03759c677b311142f8dd9186f96a45753a56f38ec9fd0c1f0eeb247f6f6::m::T<0xf510c03759c677b311142f8dd9186f96a45753a56f38ec9fd0c1f0eeb247f6f6::m::S>"
                                   }
                                 }
                               ]
@@ -274,7 +268,13 @@ Response: {
                 },
                 {
                   "outputState": {
-                    "address": "0xd4ed56ea8f35cba56cf2b495b9876631989ca8547d9035971c29072d9b074f46",
+                    "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95",
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "outputState": {
+                    "address": "0xf88d487a6ff809b197de42319d922601100d08be653a910f0908c6ca17f31571",
                     "asMovePackage": null
                   }
                 }
@@ -297,11 +297,6 @@ Response: {
           "effects": {
             "objectChanges": {
               "nodes": [
-                {
-                  "outputState": {
-                    "asMovePackage": null
-                  }
-                },
                 {
                   "outputState": {
                     "asMovePackage": {
@@ -322,6 +317,11 @@ Response: {
                     }
                   }
                 },
+                {
+                  "outputState": {
+                    "asMovePackage": null
+                  }
+                },
                 {
                   "outputState": {
                     "asMovePackage": null
diff --git a/crates/iota-graphql-e2e-tests/tests/packages/friends.exp b/crates/iota-graphql-e2e-tests/tests/packages/friends.exp
index b19c3041ef6..cb7b52044b7 100644
--- a/crates/iota-graphql-e2e-tests/tests/packages/friends.exp
+++ b/crates/iota-graphql-e2e-tests/tests/packages/friends.exp
@@ -28,11 +28,6 @@ Response: {
                     "asMovePackage": null
                   }
                 },
-                {
-                  "outputState": {
-                    "asMovePackage": null
-                  }
-                },
                 {
                   "outputState": {
                     "asMovePackage": {
@@ -106,6 +101,11 @@ Response: {
                       }
                     }
                   }
+                },
+                {
+                  "outputState": {
+                    "asMovePackage": null
+                  }
                 }
               ]
             }
@@ -133,14 +133,14 @@ Response: {
                 },
                 {
                   "outputState": {
-                    "asMovePackage": null
+                    "asMovePackage": {
+                      "module": null
+                    }
                   }
                 },
                 {
                   "outputState": {
-                    "asMovePackage": {
-                      "module": null
-                    }
+                    "asMovePackage": null
                   }
                 }
               ]
@@ -166,7 +166,7 @@ Response: {
         "effects",
         "objectChanges",
         "nodes",
-        2,
+        1,
         "outputState",
         "asMovePackage",
         "module",
@@ -194,11 +194,6 @@ Response: {
                     "asMovePackage": null
                   }
                 },
-                {
-                  "outputState": {
-                    "asMovePackage": null
-                  }
-                },
                 {
                   "outputState": {
                     "asMovePackage": {
@@ -274,6 +269,11 @@ Response: {
                       }
                     }
                   }
+                },
+                {
+                  "outputState": {
+                    "asMovePackage": null
+                  }
                 }
               ]
             }
@@ -309,11 +309,6 @@ Response: {
                     "asMovePackage": null
                   }
                 },
-                {
-                  "outputState": {
-                    "asMovePackage": null
-                  }
-                },
                 {
                   "outputState": {
                     "asMovePackage": {
@@ -349,6 +344,11 @@ Response: {
                       }
                     }
                   }
+                },
+                {
+                  "outputState": {
+                    "asMovePackage": null
+                  }
                 }
               ]
             }
diff --git a/crates/iota-graphql-e2e-tests/tests/packages/functions.exp b/crates/iota-graphql-e2e-tests/tests/packages/functions.exp
index f9a1ca1af80..abe7fc4ce90 100644
--- a/crates/iota-graphql-e2e-tests/tests/packages/functions.exp
+++ b/crates/iota-graphql-e2e-tests/tests/packages/functions.exp
@@ -95,25 +95,25 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x462392358fee51d4653c111fe4d925f59a4371b00af01679a8a7cc228fc3382a",
+                    "address": "0x0779d943f70351d8db98bc5b471eef69dec64d8b060eff851fa92357264c81cb",
                     "asMovePackage": null
                   }
                 },
                 {
                   "outputState": {
-                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
+                    "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95",
                     "asMovePackage": null
                   }
                 },
                 {
                   "outputState": {
-                    "address": "0xfa3b856a3aa0073d07706f12a8d2556ecbd67085073e265470915a6f2d222117",
+                    "address": "0xf54e25e49a2d5dccfedaed2ebf341e48bc8141704a0b53b84ff7fd0a576d9bee",
                     "asMovePackage": {
                       "module": {
                         "function": {
                           "module": {
                             "package": {
-                              "address": "0xfa3b856a3aa0073d07706f12a8d2556ecbd67085073e265470915a6f2d222117"
+                              "address": "0xf54e25e49a2d5dccfedaed2ebf341e48bc8141704a0b53b84ff7fd0a576d9bee"
                             }
                           },
                           "name": "f",
@@ -175,13 +175,19 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x3551d97f7156dbe2f0bdc7f3f1aca8a169bce95dfbdb3410e37ac3ddb40e0c12",
+                    "address": "0x0779d943f70351d8db98bc5b471eef69dec64d8b060eff851fa92357264c81cb",
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "outputState": {
+                    "address": "0x5e5f7f19ed6029cce7c55f0b2e5e5c0d1a6908205d5cb72035de74e822917c8b",
                     "asMovePackage": {
                       "module": {
                         "f": {
                           "module": {
                             "package": {
-                              "address": "0x3551d97f7156dbe2f0bdc7f3f1aca8a169bce95dfbdb3410e37ac3ddb40e0c12"
+                              "address": "0x5e5f7f19ed6029cce7c55f0b2e5e5c0d1a6908205d5cb72035de74e822917c8b"
                             }
                           },
                           "name": "f",
@@ -211,7 +217,7 @@ Response: {
                         "g": {
                           "module": {
                             "package": {
-                              "address": "0x3551d97f7156dbe2f0bdc7f3f1aca8a169bce95dfbdb3410e37ac3ddb40e0c12"
+                              "address": "0x5e5f7f19ed6029cce7c55f0b2e5e5c0d1a6908205d5cb72035de74e822917c8b"
                             }
                           },
                           "name": "g",
@@ -231,13 +237,7 @@ Response: {
                 },
                 {
                   "outputState": {
-                    "address": "0x462392358fee51d4653c111fe4d925f59a4371b00af01679a8a7cc228fc3382a",
-                    "asMovePackage": null
-                  }
-                },
-                {
-                  "outputState": {
-                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
+                    "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95",
                     "asMovePackage": null
                   }
                 }
diff --git a/crates/iota-graphql-e2e-tests/tests/packages/modules.exp b/crates/iota-graphql-e2e-tests/tests/packages/modules.exp
index d957a5c7b44..48ed63cb785 100644
--- a/crates/iota-graphql-e2e-tests/tests/packages/modules.exp
+++ b/crates/iota-graphql-e2e-tests/tests/packages/modules.exp
@@ -22,22 +22,22 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x7824c1656ba4803fa1a8c65aa463f7c09de734f47967e0b96c5f409aef56d3e2",
+                    "address": "0x2da8747fe6350b4147ffcf8488e97671c13a3f9b1c3f9694f86f0c85c7a6353f",
                     "asMovePackage": null
                   }
                 },
                 {
                   "outputState": {
-                    "address": "0xe31179bf18d75a2dd828d387f0f9fc64e7b23f9c2ee1e6e4c077aeacfa27426e",
+                    "address": "0xdbd3bc7c79bf4076dbe2ee9e0ba66ff1dfc6e5fab8d651c9349be0bf915f4f88",
                     "asMovePackage": {
                       "module": {
                         "name": "m",
                         "package": {
-                          "address": "0xe31179bf18d75a2dd828d387f0f9fc64e7b23f9c2ee1e6e4c077aeacfa27426e"
+                          "address": "0xdbd3bc7c79bf4076dbe2ee9e0ba66ff1dfc6e5fab8d651c9349be0bf915f4f88"
                         },
                         "fileFormatVersion": 6,
-                        "bytes": "oRzrCwYAAAAIAQAGAgYKAxARBCEEBSUfB0QkCGhADKgBMAAGAQMBBQEADAEAAQIBAgAABAABAQIAAgIBAAEHBQEBAAIEAAYCAwYLAAEJAAEDAQYLAAEIAQABCQABBgsAAQkAAQgBBENvaW4ESU9UQQNiYXIEY29pbgNmb28EaW90YQFtBXZhbHVl4xF5vxjXWi3YKNOH8Pn8ZOeyP5wu4ebkwHeurPonQm4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgABAAADBQsBOAALABYCAQEAAAMIBioAAAAAAAAACgA4AQYrAAAAAAAAAAsAOAEYAgA=",
-                        "disassembly": "// Move bytecode v6\nmodule e31179bf18d75a2dd828d387f0f9fc64e7b23f9c2ee1e6e4c077aeacfa27426e.m {\nuse 0000000000000000000000000000000000000000000000000000000000000002::coin;\nuse 0000000000000000000000000000000000000000000000000000000000000002::iota;\n\n\n\n\n\n\npublic foo<Ty0: drop>(Arg0: u64, Arg1: &Coin<Ty0>): u64 {\nB0:\n\t0: MoveLoc[1](Arg1: &Coin<Ty0>)\n\t1: Call coin::value<Ty0>(&Coin<Ty0>): u64\n\t2: MoveLoc[0](Arg0: u64)\n\t3: Add\n\t4: Ret\n\n}\npublic bar(Arg0: &Coin<IOTA>): u64 {\nB0:\n\t0: LdU64(42)\n\t1: CopyLoc[0](Arg0: &Coin<IOTA>)\n\t2: Call foo<IOTA>(u64, &Coin<IOTA>): u64\n\t3: LdU64(43)\n\t4: MoveLoc[0](Arg0: &Coin<IOTA>)\n\t5: Call foo<IOTA>(u64, &Coin<IOTA>): u64\n\t6: Mul\n\t7: Ret\n\n}\n}"
+                        "bytes": "oRzrCwYAAAAIAQAGAgYKAxARBCEEBSUfB0QkCGhADKgBMAAGAQMBBQEADAEAAQIBAgAABAABAQIAAgIBAAEHBQEBAAIEAAYCAwYLAAEJAAEDAQYLAAEIAQABCQABBgsAAQkAAQgBBENvaW4ESU9UQQNiYXIEY29pbgNmb28EaW90YQFtBXZhbHVl29O8fHm/QHbb4u6eC6Zv8d/G5fq41lHJNJvgv5FfT4gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgABAAADBQsBOAALABYCAQEAAAMIBioAAAAAAAAACgA4AQYrAAAAAAAAAAsAOAEYAgA=",
+                        "disassembly": "// Move bytecode v6\nmodule dbd3bc7c79bf4076dbe2ee9e0ba66ff1dfc6e5fab8d651c9349be0bf915f4f88.m {\nuse 0000000000000000000000000000000000000000000000000000000000000002::coin;\nuse 0000000000000000000000000000000000000000000000000000000000000002::iota;\n\n\n\n\n\n\npublic foo<Ty0: drop>(Arg0: u64, Arg1: &Coin<Ty0>): u64 {\nB0:\n\t0: MoveLoc[1](Arg1: &Coin<Ty0>)\n\t1: Call coin::value<Ty0>(&Coin<Ty0>): u64\n\t2: MoveLoc[0](Arg0: u64)\n\t3: Add\n\t4: Ret\n\n}\npublic bar(Arg0: &Coin<IOTA>): u64 {\nB0:\n\t0: LdU64(42)\n\t1: CopyLoc[0](Arg0: &Coin<IOTA>)\n\t2: Call foo<IOTA>(u64, &Coin<IOTA>): u64\n\t3: LdU64(43)\n\t4: MoveLoc[0](Arg0: &Coin<IOTA>)\n\t5: Call foo<IOTA>(u64, &Coin<IOTA>): u64\n\t6: Mul\n\t7: Ret\n\n}\n}"
                       }
                     }
                   }
@@ -63,13 +63,13 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x7824c1656ba4803fa1a8c65aa463f7c09de734f47967e0b96c5f409aef56d3e2",
+                    "address": "0x2da8747fe6350b4147ffcf8488e97671c13a3f9b1c3f9694f86f0c85c7a6353f",
                     "asMovePackage": null
                   }
                 },
                 {
                   "outputState": {
-                    "address": "0xe31179bf18d75a2dd828d387f0f9fc64e7b23f9c2ee1e6e4c077aeacfa27426e",
+                    "address": "0xdbd3bc7c79bf4076dbe2ee9e0ba66ff1dfc6e5fab8d651c9349be0bf915f4f88",
                     "asMovePackage": {
                       "all": {
                         "edges": [
@@ -161,13 +161,13 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x7824c1656ba4803fa1a8c65aa463f7c09de734f47967e0b96c5f409aef56d3e2",
+                    "address": "0x2da8747fe6350b4147ffcf8488e97671c13a3f9b1c3f9694f86f0c85c7a6353f",
                     "asMovePackage": null
                   }
                 },
                 {
                   "outputState": {
-                    "address": "0xe31179bf18d75a2dd828d387f0f9fc64e7b23f9c2ee1e6e4c077aeacfa27426e",
+                    "address": "0xdbd3bc7c79bf4076dbe2ee9e0ba66ff1dfc6e5fab8d651c9349be0bf915f4f88",
                     "asMovePackage": {
                       "prefix": {
                         "edges": [
diff --git a/crates/iota-graphql-e2e-tests/tests/packages/structs.exp b/crates/iota-graphql-e2e-tests/tests/packages/structs.exp
index 71276e75a46..614699e2670 100644
--- a/crates/iota-graphql-e2e-tests/tests/packages/structs.exp
+++ b/crates/iota-graphql-e2e-tests/tests/packages/structs.exp
@@ -154,7 +154,13 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x24ec6864c2cba3b1f98b1e318b001991b368e9528ac84b824473224727e63031",
+                    "address": "0x2f70f434dedbef6ca04cdff83afde4631684ccb6846780382d45ae301630d74e",
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "outputState": {
+                    "address": "0x6e052faf337b206054b319aff9325298b3b4995c7f30100dc8311f11a0ce23ae",
                     "asMovePackage": {
                       "module": {
                         "struct": {
@@ -183,13 +189,7 @@ Response: {
                 },
                 {
                   "outputState": {
-                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
-                    "asMovePackage": null
-                  }
-                },
-                {
-                  "outputState": {
-                    "address": "0x8607c0c5eed96e3779f0946da7b802a3ceaa1c91b0f4f1ab6b2cce69c2c01a3c",
+                    "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95",
                     "asMovePackage": null
                   }
                 }
@@ -224,25 +224,19 @@ Response: {
               "nodes": [
                 {
                   "outputState": {
-                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
-                    "asMovePackage": null
-                  }
-                },
-                {
-                  "outputState": {
-                    "address": "0x8607c0c5eed96e3779f0946da7b802a3ceaa1c91b0f4f1ab6b2cce69c2c01a3c",
+                    "address": "0x2f70f434dedbef6ca04cdff83afde4631684ccb6846780382d45ae301630d74e",
                     "asMovePackage": null
                   }
                 },
                 {
                   "outputState": {
-                    "address": "0xfd3b093e8412e789e3eec6e372a7ba0a77f529970288961bfe2e8469430f656b",
+                    "address": "0xa5fc6cbb49375fc5e27a7a8cb9ddd211ec180a3693c0ab9030fa00c4f4ea2e89",
                     "asMovePackage": {
                       "module": {
                         "s": {
                           "module": {
                             "package": {
-                              "address": "0x24ec6864c2cba3b1f98b1e318b001991b368e9528ac84b824473224727e63031"
+                              "address": "0x6e052faf337b206054b319aff9325298b3b4995c7f30100dc8311f11a0ce23ae"
                             }
                           },
                           "name": "S",
@@ -267,7 +261,7 @@ Response: {
                         "t": {
                           "module": {
                             "package": {
-                              "address": "0xfd3b093e8412e789e3eec6e372a7ba0a77f529970288961bfe2e8469430f656b"
+                              "address": "0xa5fc6cbb49375fc5e27a7a8cb9ddd211ec180a3693c0ab9030fa00c4f4ea2e89"
                             }
                           },
                           "name": "T",
@@ -294,12 +288,12 @@ Response: {
                             {
                               "name": "s",
                               "type": {
-                                "repr": "0x24ec6864c2cba3b1f98b1e318b001991b368e9528ac84b824473224727e63031::m::S",
+                                "repr": "0x6e052faf337b206054b319aff9325298b3b4995c7f30100dc8311f11a0ce23ae::m::S",
                                 "signature": {
                                   "ref": null,
                                   "body": {
                                     "datatype": {
-                                      "package": "0x24ec6864c2cba3b1f98b1e318b001991b368e9528ac84b824473224727e63031",
+                                      "package": "0x6e052faf337b206054b319aff9325298b3b4995c7f30100dc8311f11a0ce23ae",
                                       "module": "m",
                                       "type": "S",
                                       "typeParameters": []
@@ -328,7 +322,7 @@ Response: {
                             {
                               "name": "t",
                               "type": {
-                                "repr": "0x24ec6864c2cba3b1f98b1e318b001991b368e9528ac84b824473224727e63031::m::T<0x24ec6864c2cba3b1f98b1e318b001991b368e9528ac84b824473224727e63031::m::S>"
+                                "repr": "0x6e052faf337b206054b319aff9325298b3b4995c7f30100dc8311f11a0ce23ae::m::T<0x6e052faf337b206054b319aff9325298b3b4995c7f30100dc8311f11a0ce23ae::m::S>"
                               }
                             }
                           ]
@@ -336,6 +330,12 @@ Response: {
                       }
                     }
                   }
+                },
+                {
+                  "outputState": {
+                    "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95",
+                    "asMovePackage": null
+                  }
                 }
               ]
             }
@@ -361,11 +361,6 @@ Response: {
                     "asMovePackage": null
                   }
                 },
-                {
-                  "outputState": {
-                    "asMovePackage": null
-                  }
-                },
                 {
                   "outputState": {
                     "asMovePackage": {
@@ -385,6 +380,11 @@ Response: {
                       }
                     }
                   }
+                },
+                {
+                  "outputState": {
+                    "asMovePackage": null
+                  }
                 }
               ]
             }
diff --git a/crates/iota-graphql-e2e-tests/tests/packages/types.exp b/crates/iota-graphql-e2e-tests/tests/packages/types.exp
index 00b98646d8f..163bafc6a4d 100644
--- a/crates/iota-graphql-e2e-tests/tests/packages/types.exp
+++ b/crates/iota-graphql-e2e-tests/tests/packages/types.exp
@@ -275,7 +275,7 @@ Response: {
   "data": null,
   "errors": [
     {
-      "message": "Internal error occurred while processing request: Error calculating layout for 0x86b00ba6b96afd850ab1f922fbbb2f2cfb13af2768146e4d4300e7595a3f1650::m::S1<u32>: Type layout nesting exceeded limit of 128",
+      "message": "Internal error occurred while processing request: Error calculating layout for 0xbbed0b3b563a8e309c5ab0a82b184846001ab32d2bf4a1c91c4f3090986a72c9::m::S1<u32>: Type layout nesting exceeded limit of 128",
       "locations": [
         {
           "line": 4,
diff --git a/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp b/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp
index 7c5d3e69cf5..ffa4a445d2f 100644
--- a/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp
+++ b/crates/iota-graphql-e2e-tests/tests/packages/versioning.exp
@@ -31,14 +31,14 @@ Response: {
       "packageVersions": {
         "nodes": [
           {
-            "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
+            "address": "0x6eb579ded8e567baec3f9da4b60fc0aa5772c986cf987f0008b468cfffb61f0d",
             "version": 1
           }
         ]
       }
     },
     "firstPackage": {
-      "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
+      "address": "0x6eb579ded8e567baec3f9da4b60fc0aa5772c986cf987f0008b468cfffb61f0d",
       "version": 1,
       "module": {
         "functions": {
@@ -52,7 +52,7 @@ Response: {
       "packageVersions": {
         "nodes": [
           {
-            "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
+            "address": "0x6eb579ded8e567baec3f9da4b60fc0aa5772c986cf987f0008b468cfffb61f0d",
             "version": 1
           }
         ]
@@ -81,7 +81,7 @@ Response: {
           "version": 1
         },
         {
-          "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
+          "address": "0x6eb579ded8e567baec3f9da4b60fc0aa5772c986cf987f0008b468cfffb61f0d",
           "version": 1
         }
       ]
@@ -120,18 +120,18 @@ Response: {
       "packageVersions": {
         "nodes": [
           {
-            "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
+            "address": "0x6eb579ded8e567baec3f9da4b60fc0aa5772c986cf987f0008b468cfffb61f0d",
             "version": 1
           },
           {
-            "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
+            "address": "0x637516b0223c3af228bcb46fce1710a1280fa9e98e3811d75f1d77acc0eb8be1",
             "version": 2
           }
         ]
       }
     },
     "firstPackage": {
-      "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
+      "address": "0x6eb579ded8e567baec3f9da4b60fc0aa5772c986cf987f0008b468cfffb61f0d",
       "version": 1,
       "module": {
         "functions": {
@@ -145,11 +145,11 @@ Response: {
       "packageVersions": {
         "nodes": [
           {
-            "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
+            "address": "0x6eb579ded8e567baec3f9da4b60fc0aa5772c986cf987f0008b468cfffb61f0d",
             "version": 1
           },
           {
-            "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
+            "address": "0x637516b0223c3af228bcb46fce1710a1280fa9e98e3811d75f1d77acc0eb8be1",
             "version": 2
           }
         ]
@@ -178,11 +178,11 @@ Response: {
           "version": 1
         },
         {
-          "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
+          "address": "0x6eb579ded8e567baec3f9da4b60fc0aa5772c986cf987f0008b468cfffb61f0d",
           "version": 1
         },
         {
-          "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
+          "address": "0x637516b0223c3af228bcb46fce1710a1280fa9e98e3811d75f1d77acc0eb8be1",
           "version": 2
         }
       ]
@@ -224,22 +224,22 @@ Response: {
       "packageVersions": {
         "nodes": [
           {
-            "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
+            "address": "0x6eb579ded8e567baec3f9da4b60fc0aa5772c986cf987f0008b468cfffb61f0d",
             "version": 1
           },
           {
-            "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
+            "address": "0x637516b0223c3af228bcb46fce1710a1280fa9e98e3811d75f1d77acc0eb8be1",
             "version": 2
           },
           {
-            "address": "0x6a9edaed4e9bc435b2edd2618cba5067bd7d8a42a074aeda9911fe129cca2fe0",
+            "address": "0xc3f4b6e52e370b72878bd7ffbfb4960273e513fff720296dee0edd37bccb93df",
             "version": 3
           }
         ]
       }
     },
     "firstPackage": {
-      "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
+      "address": "0x6eb579ded8e567baec3f9da4b60fc0aa5772c986cf987f0008b468cfffb61f0d",
       "version": 1,
       "module": {
         "functions": {
@@ -253,15 +253,15 @@ Response: {
       "packageVersions": {
         "nodes": [
           {
-            "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
+            "address": "0x6eb579ded8e567baec3f9da4b60fc0aa5772c986cf987f0008b468cfffb61f0d",
             "version": 1
           },
           {
-            "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
+            "address": "0x637516b0223c3af228bcb46fce1710a1280fa9e98e3811d75f1d77acc0eb8be1",
             "version": 2
           },
           {
-            "address": "0x6a9edaed4e9bc435b2edd2618cba5067bd7d8a42a074aeda9911fe129cca2fe0",
+            "address": "0xc3f4b6e52e370b72878bd7ffbfb4960273e513fff720296dee0edd37bccb93df",
             "version": 3
           }
         ]
@@ -290,15 +290,15 @@ Response: {
           "version": 1
         },
         {
-          "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
+          "address": "0x6eb579ded8e567baec3f9da4b60fc0aa5772c986cf987f0008b468cfffb61f0d",
           "version": 1
         },
         {
-          "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
+          "address": "0x637516b0223c3af228bcb46fce1710a1280fa9e98e3811d75f1d77acc0eb8be1",
           "version": 2
         },
         {
-          "address": "0x6a9edaed4e9bc435b2edd2618cba5067bd7d8a42a074aeda9911fe129cca2fe0",
+          "address": "0xc3f4b6e52e370b72878bd7ffbfb4960273e513fff720296dee0edd37bccb93df",
           "version": 3
         }
       ]
@@ -715,7 +715,7 @@ Response: {
     "after": {
       "nodes": [
         {
-          "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
+          "address": "0x637516b0223c3af228bcb46fce1710a1280fa9e98e3811d75f1d77acc0eb8be1",
           "version": 2,
           "previousTransactionBlock": {
             "effects": {
@@ -726,7 +726,7 @@ Response: {
           }
         },
         {
-          "address": "0x6a9edaed4e9bc435b2edd2618cba5067bd7d8a42a074aeda9911fe129cca2fe0",
+          "address": "0xc3f4b6e52e370b72878bd7ffbfb4960273e513fff720296dee0edd37bccb93df",
           "version": 3,
           "previousTransactionBlock": {
             "effects": {
@@ -741,7 +741,7 @@ Response: {
     "between": {
       "nodes": [
         {
-          "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
+          "address": "0x637516b0223c3af228bcb46fce1710a1280fa9e98e3811d75f1d77acc0eb8be1",
           "version": 2,
           "previousTransactionBlock": {
             "effects": {
@@ -763,15 +763,15 @@ Response: {
     "packageVersions": {
       "nodes": [
         {
-          "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
+          "address": "0x6eb579ded8e567baec3f9da4b60fc0aa5772c986cf987f0008b468cfffb61f0d",
           "version": 1
         },
         {
-          "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
+          "address": "0x637516b0223c3af228bcb46fce1710a1280fa9e98e3811d75f1d77acc0eb8be1",
           "version": 2
         },
         {
-          "address": "0x6a9edaed4e9bc435b2edd2618cba5067bd7d8a42a074aeda9911fe129cca2fe0",
+          "address": "0xc3f4b6e52e370b72878bd7ffbfb4960273e513fff720296dee0edd37bccb93df",
           "version": 3
         }
       ]
@@ -779,11 +779,11 @@ Response: {
     "after": {
       "nodes": [
         {
-          "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
+          "address": "0x637516b0223c3af228bcb46fce1710a1280fa9e98e3811d75f1d77acc0eb8be1",
           "version": 2
         },
         {
-          "address": "0x6a9edaed4e9bc435b2edd2618cba5067bd7d8a42a074aeda9911fe129cca2fe0",
+          "address": "0xc3f4b6e52e370b72878bd7ffbfb4960273e513fff720296dee0edd37bccb93df",
           "version": 3
         }
       ]
@@ -791,11 +791,11 @@ Response: {
     "before": {
       "nodes": [
         {
-          "address": "0x76829761be48d7af33b9121549528c4f8b42d45306a6ed717409c9906c7d54ea",
+          "address": "0x6eb579ded8e567baec3f9da4b60fc0aa5772c986cf987f0008b468cfffb61f0d",
           "version": 1
         },
         {
-          "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
+          "address": "0x637516b0223c3af228bcb46fce1710a1280fa9e98e3811d75f1d77acc0eb8be1",
           "version": 2
         }
       ]
@@ -803,7 +803,7 @@ Response: {
     "between": {
       "nodes": [
         {
-          "address": "0xc28257e4d1c04d2a76f0e1d798a5d264f1375794e1d4d26d46f6d5c2278bc48c",
+          "address": "0x637516b0223c3af228bcb46fce1710a1280fa9e98e3811d75f1d77acc0eb8be1",
           "version": 2
         }
       ]
diff --git a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp
index bdf5150c3c1..58869ad01d0 100644
--- a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/balance_changes.exp
@@ -48,13 +48,13 @@ Response: {
                 "edges": [
                   {
                     "node": {
-                      "amount": "3000"
+                      "amount": "4000"
                     },
                     "cursor": "eyJpIjowLCJjIjoyfQ"
                   },
                   {
                     "node": {
-                      "amount": "5000"
+                      "amount": "1000"
                     },
                     "cursor": "eyJpIjoxLCJjIjoyfQ"
                   },
@@ -66,19 +66,19 @@ Response: {
                   },
                   {
                     "node": {
-                      "amount": "1000"
+                      "amount": "2000"
                     },
                     "cursor": "eyJpIjozLCJjIjoyfQ"
                   },
                   {
                     "node": {
-                      "amount": "4000"
+                      "amount": "5000"
                     },
                     "cursor": "eyJpIjo0LCJjIjoyfQ"
                   },
                   {
                     "node": {
-                      "amount": "2000"
+                      "amount": "3000"
                     },
                     "cursor": "eyJpIjo1LCJjIjoyfQ"
                   }
@@ -111,13 +111,13 @@ Response: {
                 "edges": [
                   {
                     "node": {
-                      "amount": "1000"
+                      "amount": "2000"
                     },
                     "cursor": "eyJpIjozLCJjIjoxfQ"
                   },
                   {
                     "node": {
-                      "amount": "4000"
+                      "amount": "5000"
                     },
                     "cursor": "eyJpIjo0LCJjIjoxfQ"
                   }
@@ -150,13 +150,13 @@ Response: {
                 "edges": [
                   {
                     "node": {
-                      "amount": "3000"
+                      "amount": "4000"
                     },
                     "cursor": "eyJpIjowLCJjIjoxfQ"
                   },
                   {
                     "node": {
-                      "amount": "5000"
+                      "amount": "1000"
                     },
                     "cursor": "eyJpIjoxLCJjIjoxfQ"
                   },
diff --git a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp
index 845e5172804..7a72fca289e 100644
--- a/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transaction_block_effects/dependencies.exp
@@ -65,7 +65,7 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "6xEQFCm27zfeWp5oqLAkeZxrUeMTVY3SLqcVdTYvBR2f",
+          "digest": "6Y2wDveP2zgYVNVSyS9DYdCBDE6cmMAtbxp3PKw2rqS4",
           "effects": {
             "dependencies": {
               "pageInfo": {
@@ -78,7 +78,7 @@ Response: {
                 {
                   "cursor": "eyJpIjowLCJjIjoxfQ",
                   "node": {
-                    "digest": "3kQVhcCx8LdZKbsgAHdGfGZtAJzTcWe7gktakzXweCAW",
+                    "digest": "A6KhBiRjSwHvSbgfdLZqzUtZisB7PynYdzf9Z6YLPtaJ",
                     "kind": {
                       "__typename": "ProgrammableTransactionBlock",
                       "transactions": {
@@ -107,7 +107,7 @@ Response: {
                 {
                   "cursor": "eyJpIjoxLCJjIjoxfQ",
                   "node": {
-                    "digest": "9u2qUK8xcpUd5Xy59cDTRZugjwETWrVvKFgBpPDrpnDy",
+                    "digest": "J3PtkEZg631SNT6FEzoZxcEcD1teVaukTh78Mzh93ycU",
                     "kind": {
                       "__typename": "ProgrammableTransactionBlock",
                       "transactions": {
@@ -138,7 +138,7 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "6xEQFCm27zfeWp5oqLAkeZxrUeMTVY3SLqcVdTYvBR2f",
+          "digest": "6Y2wDveP2zgYVNVSyS9DYdCBDE6cmMAtbxp3PKw2rqS4",
           "effects": {
             "dependencies": {
               "pageInfo": {
@@ -151,7 +151,7 @@ Response: {
                 {
                   "cursor": "eyJpIjoxLCJjIjoxfQ",
                   "node": {
-                    "digest": "9u2qUK8xcpUd5Xy59cDTRZugjwETWrVvKFgBpPDrpnDy",
+                    "digest": "J3PtkEZg631SNT6FEzoZxcEcD1teVaukTh78Mzh93ycU",
                     "kind": {
                       "__typename": "ProgrammableTransactionBlock",
                       "transactions": {
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp b/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp
index 9e307aa9214..b9e758983df 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/at_checkpoint.exp
@@ -30,7 +30,7 @@ Response: {
     "c0": {
       "nodes": [
         {
-          "digest": "D5VAJeCVRW78atc55Tf2BUctJkBJ7EkzdFS4QfQo1fND",
+          "digest": "8SvtZ4FXTfB7R2Yf7P5nMxH7ELVmRiaYhf5JHjAhKLM",
           "kind": {
             "__typename": "GenesisTransaction"
           }
@@ -46,7 +46,7 @@ Response: {
           }
         },
         {
-          "digest": "8T9Mk4z2HuVb8bFtgVEXhqCemFRGxG1Fh6qhHe4j4cZ4",
+          "digest": "21XaXWNhGpoMoZR9FTCVQCQxT8B3mLD3vJ2yeuLvXpCs",
           "kind": {
             "__typename": "ProgrammableTransactionBlock"
           }
@@ -87,7 +87,7 @@ Response: {
       "transactionBlocks": {
         "nodes": [
           {
-            "digest": "D5VAJeCVRW78atc55Tf2BUctJkBJ7EkzdFS4QfQo1fND",
+            "digest": "8SvtZ4FXTfB7R2Yf7P5nMxH7ELVmRiaYhf5JHjAhKLM",
             "kind": {
               "__typename": "GenesisTransaction"
             }
@@ -105,7 +105,7 @@ Response: {
             }
           },
           {
-            "digest": "8T9Mk4z2HuVb8bFtgVEXhqCemFRGxG1Fh6qhHe4j4cZ4",
+            "digest": "21XaXWNhGpoMoZR9FTCVQCQxT8B3mLD3vJ2yeuLvXpCs",
             "kind": {
               "__typename": "ProgrammableTransactionBlock"
             }
@@ -154,7 +154,7 @@ Response: {
           "transactionBlocks": {
             "nodes": [
               {
-                "digest": "D5VAJeCVRW78atc55Tf2BUctJkBJ7EkzdFS4QfQo1fND",
+                "digest": "8SvtZ4FXTfB7R2Yf7P5nMxH7ELVmRiaYhf5JHjAhKLM",
                 "kind": {
                   "__typename": "GenesisTransaction"
                 }
@@ -172,7 +172,7 @@ Response: {
                 }
               },
               {
-                "digest": "8T9Mk4z2HuVb8bFtgVEXhqCemFRGxG1Fh6qhHe4j4cZ4",
+                "digest": "21XaXWNhGpoMoZR9FTCVQCQxT8B3mLD3vJ2yeuLvXpCs",
                 "kind": {
                   "__typename": "ProgrammableTransactionBlock"
                 }
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp b/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp
index 0da5cd18e7e..c6801fc93aa 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/errors.exp
@@ -25,7 +25,7 @@ Response: {
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 1st command, from '0xf06caa78e7bd429d6a61227617f2ee14062dfdfac7e493dddffdf03bbd9f33e5::m::boom' (instruction 1), abort code: 42"
+            "errors": "Error in 1st command, from '0x75b88d24bad02784e123bdb2f308a999d9bcb9e7aaefb8bc8f4c148e72ba8c5a::m::boom' (instruction 1), abort code: 42"
           }
         }
       ]
@@ -54,7 +54,7 @@ Response: {
         {
           "effects": {
             "status": "FAILURE",
-            "errors": "Error in 3rd command, from '0xf06caa78e7bd429d6a61227617f2ee14062dfdfac7e493dddffdf03bbd9f33e5::m::boom' (instruction 1), abort code: 42"
+            "errors": "Error in 3rd command, from '0x75b88d24bad02784e123bdb2f308a999d9bcb9e7aaefb8bc8f4c148e72ba8c5a::m::boom' (instruction 1), abort code: 42"
           }
         }
       ]
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp b/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp
index 5b2368faee8..bbacead8450 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/filters/kind.exp
@@ -60,7 +60,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "5quwPQw3bKJhepq8SRWrsBjHB5YUMdzDg66tqzHxoLrS",
+          "digest": "5S473Dja67e1DM9C2YqHAUCBTwrRdtHZ8PK6DuzAsVKB",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -68,7 +68,7 @@ Response: {
           }
         },
         {
-          "digest": "C5Dy4KHYBJLfCA9BHt6JjtAQMTR2dtfueJX4QQk1Utjk",
+          "digest": "39KR3MJpLgFePQudkSdpar7CxFf2uyKDF3Rurou1ea7K",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -76,7 +76,7 @@ Response: {
           }
         },
         {
-          "digest": "72NoXbuc6fNyU1bavVaBgnQXQmXEXErAaRRQ26R5nj8M",
+          "digest": "5qX9uo15phsaNyuSAMnxA2YiKPkUECDXgZ7jMn8f1ih1",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -84,7 +84,7 @@ Response: {
           }
         },
         {
-          "digest": "2jdSf9oiVKpnXnBHStYRGN9MPV9RwjSuBCCuwKQpxmm1",
+          "digest": "DiGeNbCDy5KzeviEaa5SiXMsBYVFrrYFwyT2KhZDm8Hf",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -92,7 +92,7 @@ Response: {
           }
         },
         {
-          "digest": "5pT9hzbvWygWkrK39tEQxzEMqrAxi7ev3H5TQHSt4R5n",
+          "digest": "AFbCaigSs5uttbRAjqzP8ve1oKN4XdDz5yFkBnL4ayw7",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -117,7 +117,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "5quwPQw3bKJhepq8SRWrsBjHB5YUMdzDg66tqzHxoLrS",
+          "digest": "5S473Dja67e1DM9C2YqHAUCBTwrRdtHZ8PK6DuzAsVKB",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -142,7 +142,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "C5Dy4KHYBJLfCA9BHt6JjtAQMTR2dtfueJX4QQk1Utjk",
+          "digest": "39KR3MJpLgFePQudkSdpar7CxFf2uyKDF3Rurou1ea7K",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -167,7 +167,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "72NoXbuc6fNyU1bavVaBgnQXQmXEXErAaRRQ26R5nj8M",
+          "digest": "5qX9uo15phsaNyuSAMnxA2YiKPkUECDXgZ7jMn8f1ih1",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -192,7 +192,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "2jdSf9oiVKpnXnBHStYRGN9MPV9RwjSuBCCuwKQpxmm1",
+          "digest": "DiGeNbCDy5KzeviEaa5SiXMsBYVFrrYFwyT2KhZDm8Hf",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -217,7 +217,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "5pT9hzbvWygWkrK39tEQxzEMqrAxi7ev3H5TQHSt4R5n",
+          "digest": "AFbCaigSs5uttbRAjqzP8ve1oKN4XdDz5yFkBnL4ayw7",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp b/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp
index 1607085f928..2d21f130c56 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/programmable.exp
@@ -20,12 +20,12 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "xoNEJra4pzubo6ZshKbmatUNdtQw5yodm3MiVwrdreL",
+          "digest": "CFGHjxjyqyfpi1RJwqGCrVUPstjmXP1mdTJMyRZgMtXn",
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
           },
           "signatures": [
-            "ABtRRE4LuNY/vOLaj9XJcjv8vV8aucqvALmYFf60tNVL20nikRfk30gr9gsSx8ivFmqhekz/Wz5r5wJtILY39gp/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA=="
+            "APGWMqiH97blUVEaT6iITb60bKs4DxoXfCTrZjEa3bVckvyBDycPjLmJlCFq88wL1CYdElkrzd8SnmDKL7Ie8gl/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA=="
           ],
           "gasInput": {
             "gasSponsor": {
@@ -34,7 +34,7 @@ Response: {
             "gasPayment": {
               "nodes": [
                 {
-                  "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb"
+                  "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95"
                 }
               ]
             },
@@ -96,7 +96,7 @@ Response: {
             "dependencies": {
               "nodes": [
                 {
-                  "digest": "D5VAJeCVRW78atc55Tf2BUctJkBJ7EkzdFS4QfQo1fND"
+                  "digest": "8SvtZ4FXTfB7R2Yf7P5nMxH7ELVmRiaYhf5JHjAhKLM"
                 }
               ]
             },
@@ -116,37 +116,37 @@ Response: {
             "objectChanges": {
               "nodes": [
                 {
-                  "address": "0x1d8f1cff1b7547b266e35e47be48c0efa301ff077d544bed5622fd9c68056ef1",
+                  "address": "0x8308af3c11c0db92d7e83a9360f337987a70d44d2ec88b63a40a4f892b50e1cf",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x1d8f1cff1b7547b266e35e47be48c0efa301ff077d544bed5622fd9c68056ef1",
-                    "digest": "3A77Cb2xTX17JubEAtjvWnAZkgKjEZexvEWtic7yh1nM"
+                    "address": "0x8308af3c11c0db92d7e83a9360f337987a70d44d2ec88b63a40a4f892b50e1cf",
+                    "digest": "4vMFTn9ZskPfhw1AdARbW73ME2PZig6ws4DXyMdKHEsm"
                   }
                 },
                 {
-                  "address": "0x4693b5b4dbc97a3ce7f7a7d80d1cb65895eb82128432e36afac8c5c03f8ac047",
-                  "idCreated": true,
+                  "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95",
+                  "idCreated": false,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x4693b5b4dbc97a3ce7f7a7d80d1cb65895eb82128432e36afac8c5c03f8ac047",
-                    "digest": "ABaZCf831Gr3LoXf7QNrYvNN5wsTvXqsu9BLpfgUsXu4"
+                    "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95",
+                    "digest": "HTTwPRLhNsRBEmu8YPcGyQqKQq2rdsuQVHjhX81aEhno"
                   }
                 },
                 {
-                  "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
-                  "idCreated": false,
+                  "address": "0xce1db1b45693e4e440c0f8f5ebc785e1aed8a61358864bc6575c38b461889124",
+                  "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
-                    "digest": "5fGzTnViPxa9jSN8P1Hzn3Xbno2tSDY4K15anXeNCDxb"
+                    "address": "0xce1db1b45693e4e440c0f8f5ebc785e1aed8a61358864bc6575c38b461889124",
+                    "digest": "6ufUA8wa6QMPGpSyxcEkFiwemMLRpDdR35oQtrMqxQ3U"
                   }
                 }
               ]
             },
             "gasEffects": {
               "gasObject": {
-                "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb"
+                "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95"
               },
               "gasSummary": {
                 "computationCost": "1000000",
@@ -163,7 +163,7 @@ Response: {
               "sequenceNumber": 1
             },
             "transactionBlock": {
-              "digest": "xoNEJra4pzubo6ZshKbmatUNdtQw5yodm3MiVwrdreL"
+              "digest": "CFGHjxjyqyfpi1RJwqGCrVUPstjmXP1mdTJMyRZgMtXn"
             }
           },
           "expiration": null
@@ -190,12 +190,12 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "AgH8BgGusBWwE1jYfd1btoSW2PU6w45x39F9xHZo3GJt",
+          "digest": "GxWcY9nHejR9UsnwdRsSiJngGfNvjr3FZP6bsdhnsa4W",
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
           },
           "signatures": [
-            "AJN75/ODnrUhvaFqCM1wJLZ1z0veccwmyF4ocgAFhw6wCDv3iBIHVq4p6NZp3unUhZHc+6B10iTEJfHA1lzCQg9/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA=="
+            "AMxzxguiQVu0C9lW3wINTvVmJ86F23zHOXg3hLBQm1wpcMvdSNmadpVuOtS5u01PUUiJTjrXdGn6d3A/8Ms7qAB/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA=="
           ],
           "gasInput": {
             "gasSponsor": {
@@ -204,7 +204,7 @@ Response: {
             "gasPayment": {
               "nodes": [
                 {
-                  "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb"
+                  "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95"
                 }
               ]
             },
@@ -219,21 +219,21 @@ Response: {
                   "cursor": "eyJpIjowLCJjIjoyfQ",
                   "node": {
                     "__typename": "OwnedOrImmutable",
-                    "address": "0x4693b5b4dbc97a3ce7f7a7d80d1cb65895eb82128432e36afac8c5c03f8ac047",
+                    "address": "0x8308af3c11c0db92d7e83a9360f337987a70d44d2ec88b63a40a4f892b50e1cf",
                     "version": 2,
-                    "digest": "ABaZCf831Gr3LoXf7QNrYvNN5wsTvXqsu9BLpfgUsXu4",
+                    "digest": "4vMFTn9ZskPfhw1AdARbW73ME2PZig6ws4DXyMdKHEsm",
                     "object": {
-                      "address": "0x4693b5b4dbc97a3ce7f7a7d80d1cb65895eb82128432e36afac8c5c03f8ac047",
+                      "address": "0x8308af3c11c0db92d7e83a9360f337987a70d44d2ec88b63a40a4f892b50e1cf",
                       "version": 2,
-                      "digest": "ABaZCf831Gr3LoXf7QNrYvNN5wsTvXqsu9BLpfgUsXu4",
+                      "digest": "4vMFTn9ZskPfhw1AdARbW73ME2PZig6ws4DXyMdKHEsm",
                       "asMoveObject": {
                         "contents": {
                           "type": {
                             "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::package::UpgradeCap"
                           },
                           "json": {
-                            "id": "0x4693b5b4dbc97a3ce7f7a7d80d1cb65895eb82128432e36afac8c5c03f8ac047",
-                            "package": "0x1d8f1cff1b7547b266e35e47be48c0efa301ff077d544bed5622fd9c68056ef1",
+                            "id": "0x8308af3c11c0db92d7e83a9360f337987a70d44d2ec88b63a40a4f892b50e1cf",
+                            "package": "0xce1db1b45693e4e440c0f8f5ebc785e1aed8a61358864bc6575c38b461889124",
                             "version": "1",
                             "policy": 0
                           }
@@ -315,7 +315,7 @@ Response: {
                       "0x0000000000000000000000000000000000000000000000000000000000000001",
                       "0x0000000000000000000000000000000000000000000000000000000000000002"
                     ],
-                    "currentPackage": "0x1d8f1cff1b7547b266e35e47be48c0efa301ff077d544bed5622fd9c68056ef1",
+                    "currentPackage": "0xce1db1b45693e4e440c0f8f5ebc785e1aed8a61358864bc6575c38b461889124",
                     "upgradeTicket": {
                       "__typename": "Result",
                       "cmd": 0,
@@ -367,10 +367,10 @@ Response: {
             "dependencies": {
               "nodes": [
                 {
-                  "digest": "xoNEJra4pzubo6ZshKbmatUNdtQw5yodm3MiVwrdreL"
+                  "digest": "8SvtZ4FXTfB7R2Yf7P5nMxH7ELVmRiaYhf5JHjAhKLM"
                 },
                 {
-                  "digest": "D5VAJeCVRW78atc55Tf2BUctJkBJ7EkzdFS4QfQo1fND"
+                  "digest": "CFGHjxjyqyfpi1RJwqGCrVUPstjmXP1mdTJMyRZgMtXn"
                 }
               ]
             },
@@ -390,37 +390,37 @@ Response: {
             "objectChanges": {
               "nodes": [
                 {
-                  "address": "0x4693b5b4dbc97a3ce7f7a7d80d1cb65895eb82128432e36afac8c5c03f8ac047",
-                  "idCreated": false,
+                  "address": "0x37bec35b91b29641a80a029561b1b0c0125aca8fbacae1fafb6aecdbad322ec7",
+                  "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x4693b5b4dbc97a3ce7f7a7d80d1cb65895eb82128432e36afac8c5c03f8ac047",
-                    "digest": "8rbnRGi5fYy4s7VfnxcqzyMCu3vF55zxZNn5Y3h4Csn4"
+                    "address": "0x37bec35b91b29641a80a029561b1b0c0125aca8fbacae1fafb6aecdbad322ec7",
+                    "digest": "Ebjo3QCg9zeM3tHd5p7RJQ5Tqk4569zH6bv4sTG9CLyN"
                   }
                 },
                 {
-                  "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
+                  "address": "0x8308af3c11c0db92d7e83a9360f337987a70d44d2ec88b63a40a4f892b50e1cf",
                   "idCreated": false,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
-                    "digest": "2uCSchvi68T8Hw3xdwCeFZYtfeMyxjnhtbdioRzpiRv8"
+                    "address": "0x8308af3c11c0db92d7e83a9360f337987a70d44d2ec88b63a40a4f892b50e1cf",
+                    "digest": "4h9S3cfJh6d3RAXJy4BbpQ9LHNwDz3P8v7uwgoHsgU1A"
                   }
                 },
                 {
-                  "address": "0xbb50c94228d7b4799b3c20401ef4fc7a1abdabf8ae940240300ec2a63d2e90fb",
-                  "idCreated": true,
+                  "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95",
+                  "idCreated": false,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0xbb50c94228d7b4799b3c20401ef4fc7a1abdabf8ae940240300ec2a63d2e90fb",
-                    "digest": "9qsKsqZojAuvxNn9xZEeMsCgWQou8hERMoUxhSkG9uCR"
+                    "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95",
+                    "digest": "3ADeRg8mzD8t1wnKMzt3d6GFDTvR3yxfFW9epe1vvDT3"
                   }
                 }
               ]
             },
             "gasEffects": {
               "gasObject": {
-                "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb"
+                "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95"
               },
               "gasSummary": {
                 "computationCost": "1000000",
@@ -437,7 +437,7 @@ Response: {
               "sequenceNumber": 2
             },
             "transactionBlock": {
-              "digest": "AgH8BgGusBWwE1jYfd1btoSW2PU6w45x39F9xHZo3GJt"
+              "digest": "GxWcY9nHejR9UsnwdRsSiJngGfNvjr3FZP6bsdhnsa4W"
             }
           },
           "expiration": null
@@ -482,12 +482,12 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "2WYXjpnUP16xACgtrwK93dQUb1f3aLkXAKHmwcnzKhi4",
+          "digest": "6FHUHJ4fcJseo8a96JdX2DFB4EvRGjh3qQan1J7MpCuQ",
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
           },
           "signatures": [
-            "ADkuCJnIE99Yo9aIJMUSzk8CYbu4wL/4vnbx6au/xbLcbcPzaC0TbXdSnkK4eucH1DH2Kn8J8eCy+41j0n2fQwJ/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA=="
+            "ABEsPsr55btwH5ppdG06I7Qsxc1Gjjn9fnjvXICzjYpwBxaTDNUlEdoaxXH4HE5vRt/84xQIauPltQd/tf5BBgV/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA=="
           ],
           "gasInput": {
             "gasSponsor": {
@@ -496,7 +496,7 @@ Response: {
             "gasPayment": {
               "nodes": [
                 {
-                  "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb"
+                  "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95"
                 }
               ]
             },
@@ -591,7 +591,7 @@ Response: {
                   "cursor": "eyJpIjozLCJjIjozfQ",
                   "node": {
                     "__typename": "MoveCallTransaction",
-                    "package": "0xbb50c94228d7b4799b3c20401ef4fc7a1abdabf8ae940240300ec2a63d2e90fb",
+                    "package": "0x37bec35b91b29641a80a029561b1b0c0125aca8fbacae1fafb6aecdbad322ec7",
                     "module": "m",
                     "functionName": "new",
                     "typeArguments": [],
@@ -615,7 +615,7 @@ Response: {
                       ],
                       "return": [
                         {
-                          "repr": "0x1d8f1cff1b7547b266e35e47be48c0efa301ff077d544bed5622fd9c68056ef1::m::Foo"
+                          "repr": "0xce1db1b45693e4e440c0f8f5ebc785e1aed8a61358864bc6575c38b461889124::m::Foo"
                         }
                       ]
                     }
@@ -642,7 +642,7 @@ Response: {
                   "cursor": "eyJpIjo1LCJjIjozfQ",
                   "node": {
                     "__typename": "MoveCallTransaction",
-                    "package": "0xbb50c94228d7b4799b3c20401ef4fc7a1abdabf8ae940240300ec2a63d2e90fb",
+                    "package": "0x37bec35b91b29641a80a029561b1b0c0125aca8fbacae1fafb6aecdbad322ec7",
                     "module": "m",
                     "functionName": "new",
                     "typeArguments": [],
@@ -666,7 +666,7 @@ Response: {
                       ],
                       "return": [
                         {
-                          "repr": "0x1d8f1cff1b7547b266e35e47be48c0efa301ff077d544bed5622fd9c68056ef1::m::Foo"
+                          "repr": "0xce1db1b45693e4e440c0f8f5ebc785e1aed8a61358864bc6575c38b461889124::m::Foo"
                         }
                       ]
                     }
@@ -676,7 +676,7 @@ Response: {
                   "cursor": "eyJpIjo2LCJjIjozfQ",
                   "node": {
                     "__typename": "MoveCallTransaction",
-                    "package": "0xbb50c94228d7b4799b3c20401ef4fc7a1abdabf8ae940240300ec2a63d2e90fb",
+                    "package": "0x37bec35b91b29641a80a029561b1b0c0125aca8fbacae1fafb6aecdbad322ec7",
                     "module": "m",
                     "functionName": "burn",
                     "typeArguments": [],
@@ -692,7 +692,7 @@ Response: {
                       "typeParameters": [],
                       "parameters": [
                         {
-                          "repr": "0x1d8f1cff1b7547b266e35e47be48c0efa301ff077d544bed5622fd9c68056ef1::m::Foo"
+                          "repr": "0xce1db1b45693e4e440c0f8f5ebc785e1aed8a61358864bc6575c38b461889124::m::Foo"
                         }
                       ],
                       "return": []
@@ -744,10 +744,10 @@ Response: {
             "dependencies": {
               "nodes": [
                 {
-                  "digest": "AgH8BgGusBWwE1jYfd1btoSW2PU6w45x39F9xHZo3GJt"
+                  "digest": "Ao8yAFqTMxdyNkqqxLFbLpEGytXrsCNZDoQExUw5cs5h"
                 },
                 {
-                  "digest": "Ca4s1y2HfEqRZx1BQjxXFJGcWPunaq2yNHH7G7fKk4Hs"
+                  "digest": "GxWcY9nHejR9UsnwdRsSiJngGfNvjr3FZP6bsdhnsa4W"
                 }
               ]
             },
@@ -767,19 +767,19 @@ Response: {
             "objectChanges": {
               "nodes": [
                 {
-                  "address": "0x1090fa87714553c0f9854ef242a19aa66369c8a8dbae99e5c6dfb5095094386f",
+                  "address": "0x0f7eee83affe92a4234d1ed1fa5fd7eec7f3a5a9dc76052afa4888b0f2b7b644",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x1090fa87714553c0f9854ef242a19aa66369c8a8dbae99e5c6dfb5095094386f",
-                    "digest": "6r8rQxWAASxqD2zK8aqH9EfiHQ3NgDBVbYxMSnG8nSDj",
+                    "address": "0x0f7eee83affe92a4234d1ed1fa5fd7eec7f3a5a9dc76052afa4888b0f2b7b644",
+                    "digest": "BdCiAy7whTM9k4ngPo9ZutQuYSiNgj6NbNyE6YzWHVh3",
                     "asMoveObject": {
                       "contents": {
                         "type": {
                           "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         },
                         "json": {
-                          "id": "0x1090fa87714553c0f9854ef242a19aa66369c8a8dbae99e5c6dfb5095094386f",
+                          "id": "0x0f7eee83affe92a4234d1ed1fa5fd7eec7f3a5a9dc76052afa4888b0f2b7b644",
                           "balance": {
                             "value": "2000"
                           }
@@ -789,45 +789,45 @@ Response: {
                   }
                 },
                 {
-                  "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
-                  "idCreated": false,
+                  "address": "0x5bf8f088633fe9b7c59be86f8d6505ab9cb351f64e2ed517279660f6c40b2d85",
+                  "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
-                    "digest": "AwMT3FfsuMbK9MrC8j1C6hkNgpMHPcLcL5ohft7xG9cC",
+                    "address": "0x5bf8f088633fe9b7c59be86f8d6505ab9cb351f64e2ed517279660f6c40b2d85",
+                    "digest": "D9pieNPNw7knmDrG5f1DT6wuvF8sujRaL2SAZPtPhuvP",
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                          "repr": "0xce1db1b45693e4e440c0f8f5ebc785e1aed8a61358864bc6575c38b461889124::m::Foo"
                         },
                         "json": {
-                          "id": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
-                          "balance": {
-                            "value": "299999982082400"
-                          }
+                          "id": "0x5bf8f088633fe9b7c59be86f8d6505ab9cb351f64e2ed517279660f6c40b2d85",
+                          "xs": [
+                            "42",
+                            "43"
+                          ]
                         }
                       }
                     }
                   }
                 },
                 {
-                  "address": "0xab4d6ae2184cbeb7110e0ece9e0124e1376d165325e83c16bb7452f5e8bded22",
-                  "idCreated": true,
+                  "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95",
+                  "idCreated": false,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0xab4d6ae2184cbeb7110e0ece9e0124e1376d165325e83c16bb7452f5e8bded22",
-                    "digest": "7MMd2gCVXjGwXoT1nGjrAo6bxGtc3HYwBVFAMRZE3eMo",
+                    "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95",
+                    "digest": "2JUzZtk9NrMDx11EHJz49Uvo5xXZSpPrsYB6kZk3ZrJb",
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x1d8f1cff1b7547b266e35e47be48c0efa301ff077d544bed5622fd9c68056ef1::m::Foo"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         },
                         "json": {
-                          "id": "0xab4d6ae2184cbeb7110e0ece9e0124e1376d165325e83c16bb7452f5e8bded22",
-                          "xs": [
-                            "42",
-                            "43"
-                          ]
+                          "id": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95",
+                          "balance": {
+                            "value": "299999982082400"
+                          }
                         }
                       }
                     }
@@ -837,7 +837,7 @@ Response: {
             },
             "gasEffects": {
               "gasObject": {
-                "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb"
+                "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95"
               },
               "gasSummary": {
                 "computationCost": "1000000",
@@ -854,7 +854,7 @@ Response: {
               "sequenceNumber": 3
             },
             "transactionBlock": {
-              "digest": "2WYXjpnUP16xACgtrwK93dQUb1f3aLkXAKHmwcnzKhi4"
+              "digest": "6FHUHJ4fcJseo8a96JdX2DFB4EvRGjh3qQan1J7MpCuQ"
             }
           },
           "expiration": null
@@ -881,12 +881,12 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "EJbEqDkN7RC4r4L1pLgDaRtQson6iLErFyhzPiqeLjp9",
+          "digest": "7AcMmayJWhnyfRvobbc15ZSHsBWW8FUGS4DGwtRZaEnt",
           "sender": {
             "address": "0x8cca4e1ce0ba5904cea61df9242da2f7d29e3ef328fb7ec07c086b3bf47ca61a"
           },
           "signatures": [
-            "ANoL0Is/qSCuhtKASy5T+CuiJHI7C7SvGbEDyJXJHQjFGHRigrkf3L05lzQZdupY8rgF6gcs8T0Naa28fI2Uigl/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA=="
+            "AECFoXv44azsG0HePTy1tNAs4ckzPmchqX/YDWyz+43+w04ERJVz3H5X/YlMlQ/GD9QP+62mWw/j5ghQkm7pewB/UUY663bYjcm3XmNyULIgxJz1t5Z9vxfB+fp8WUoJKA=="
           ],
           "gasInput": {
             "gasSponsor": {
@@ -895,7 +895,7 @@ Response: {
             "gasPayment": {
               "nodes": [
                 {
-                  "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb"
+                  "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95"
                 }
               ]
             },
@@ -942,7 +942,7 @@ Response: {
             "dependencies": {
               "nodes": [
                 {
-                  "digest": "2WYXjpnUP16xACgtrwK93dQUb1f3aLkXAKHmwcnzKhi4"
+                  "digest": "6FHUHJ4fcJseo8a96JdX2DFB4EvRGjh3qQan1J7MpCuQ"
                 }
               ]
             },
@@ -962,19 +962,19 @@ Response: {
             "objectChanges": {
               "nodes": [
                 {
-                  "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
+                  "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95",
                   "idCreated": false,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb",
-                    "digest": "HUSswFqFi6NnnmWmBK8c7x4Cbps4Gq9GetTszchYqqjt"
+                    "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95",
+                    "digest": "5HwjzJLKQe9rU4SkaxGbQLXZVdvXYoVafexq2tpM2Ynr"
                   }
                 }
               ]
             },
             "gasEffects": {
               "gasObject": {
-                "address": "0x5588b330d8a2eab25791479a48c72fc568996bf8cdf4fd3de352c6901c0a31fb"
+                "address": "0xbf4fd0801cda9bdd4713316aeb2067f40dca9301714ab9ebc1c5f4a77e1baa95"
               },
               "gasSummary": {
                 "computationCost": "1000000",
@@ -991,7 +991,7 @@ Response: {
               "sequenceNumber": 4
             },
             "transactionBlock": {
-              "digest": "EJbEqDkN7RC4r4L1pLgDaRtQson6iLErFyhzPiqeLjp9"
+              "digest": "7AcMmayJWhnyfRvobbc15ZSHsBWW8FUGS4DGwtRZaEnt"
             }
           },
           "expiration": null
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/random.exp b/crates/iota-graphql-e2e-tests/tests/transactions/random.exp
index 275bd73f6cf..1294e4d520e 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/random.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/random.exp
@@ -19,7 +19,7 @@ Response: {
           "json": {
             "id": "0x0000000000000000000000000000000000000000000000000000000000000008",
             "inner": {
-              "id": "0xeff71a60350f0dfb07d6197495db2804e7fee007f96fbeb2843c9b153fe7443c",
+              "id": "0xef42157fdeb89d4438fe673bdb790ae751f1132b60341c6413895e75313f9621",
               "version": "1"
             }
           }
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp
index 0c7ece3e80a..97247f87727 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp
@@ -96,7 +96,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
+            "digest": "GWwdz5zBA1yPYJf6h1yxtZ9QGLQaUcrr4jWK1ZUG2VM6",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -124,7 +124,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "iHSF6gKzVc3Zzj8UTFHo7fXvF6D5j5BqKaJ2w9xixsN",
+            "digest": "Dnzdyd3vDun537bAMz7DvxKG8ybVFRmvJyeRBBDqVvMy",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -135,7 +135,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "2bivHL99KmEH5bnM644vM1kJAALCgm4qTeRm6AaegLY2",
+            "digest": "7q8XWECsrjrYfBLVirtM1TbbYGbwuN7vYZt5Zq55DZ6c",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -163,7 +163,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "iHSF6gKzVc3Zzj8UTFHo7fXvF6D5j5BqKaJ2w9xixsN",
+            "digest": "Dnzdyd3vDun537bAMz7DvxKG8ybVFRmvJyeRBBDqVvMy",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -191,7 +191,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "7uq1QwFuZfFibdaABeeoRVHtGSSkjVcDhtFkapr3EVjp",
+            "digest": "29eV4ttEPsEKaMV5w2CQQNy7CYfPJ3htyJJsdPxbn8zE",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -219,7 +219,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "2bivHL99KmEH5bnM644vM1kJAALCgm4qTeRm6AaegLY2",
+            "digest": "7q8XWECsrjrYfBLVirtM1TbbYGbwuN7vYZt5Zq55DZ6c",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -230,7 +230,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "7uq1QwFuZfFibdaABeeoRVHtGSSkjVcDhtFkapr3EVjp",
+            "digest": "29eV4ttEPsEKaMV5w2CQQNy7CYfPJ3htyJJsdPxbn8zE",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -258,7 +258,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "DhPLAJFUkVgDj7VzHnR6xKPdNNW6pdByRejVkhjiFkxe",
+            "digest": "EP6Gr5u8msQHfb7RxBPoQTi3d6DTmwsZ2GRY6GfAj3YA",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -286,7 +286,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "DhPLAJFUkVgDj7VzHnR6xKPdNNW6pdByRejVkhjiFkxe",
+            "digest": "EP6Gr5u8msQHfb7RxBPoQTi3d6DTmwsZ2GRY6GfAj3YA",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp
index c9e0a9a0332..49d4be9517a 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp
@@ -96,7 +96,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "Gk2mn6MiSwKWaRE66dW97XVto1tzxLFDQ3enrv9Ybzqv",
+            "digest": "g9de2wXfyXL43YAH9P4JZtNTmoNSL3MG6o5BCLGELBx",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -124,7 +124,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "Gk2mn6MiSwKWaRE66dW97XVto1tzxLFDQ3enrv9Ybzqv",
+            "digest": "g9de2wXfyXL43YAH9P4JZtNTmoNSL3MG6o5BCLGELBx",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -135,7 +135,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "6awQiVBXfkr37BbH5qJj6nioXbKeeNKYLp71UYfrPNbp",
+            "digest": "8nFaUn821BQeHEYJB48D2ditaP7eNnZasV2BcpdP1NkS",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -163,7 +163,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo1LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "AsNZ5f3WM33YGoERq1UiHKT4JdDxsjhHFzgbUXfu1Fjp",
+            "digest": "E4pnRiWGDKRBiiTePyhQwTz46jvtrBSAChKCLSdgyAQb",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp
index c3ea27dcc1b..052d7189640 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp
@@ -96,7 +96,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
+            "digest": "DnEG8FVjCxcuvDeaqRbGDepf4dAFHEUPUfuKXoBgNVPq",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -107,7 +107,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "Gk2mn6MiSwKWaRE66dW97XVto1tzxLFDQ3enrv9Ybzqv",
+            "digest": "g9de2wXfyXL43YAH9P4JZtNTmoNSL3MG6o5BCLGELBx",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -118,7 +118,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "6awQiVBXfkr37BbH5qJj6nioXbKeeNKYLp71UYfrPNbp",
+            "digest": "8nFaUn821BQeHEYJB48D2ditaP7eNnZasV2BcpdP1NkS",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -129,7 +129,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "9V6jsMK9XLyNRZP2FibbzyRKWEcY4Tt65h8agoWzHRZP",
+            "digest": "G9rZB2AS1UvbTy7kUXX17vX2JNRXvnBP37EcC1cBbyJx",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -140,7 +140,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "H8KAyZZPYaCek4Re3qMhEEnU3y4B9zY7Lp37wvLEWEGb",
+            "digest": "HKr6Um13cPQE2cna5xDD7cYdtpxKZFPSC9NTuKefMdj",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -168,7 +168,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
+            "digest": "DnEG8FVjCxcuvDeaqRbGDepf4dAFHEUPUfuKXoBgNVPq",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -196,7 +196,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "Gk2mn6MiSwKWaRE66dW97XVto1tzxLFDQ3enrv9Ybzqv",
+            "digest": "g9de2wXfyXL43YAH9P4JZtNTmoNSL3MG6o5BCLGELBx",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -224,7 +224,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "6awQiVBXfkr37BbH5qJj6nioXbKeeNKYLp71UYfrPNbp",
+            "digest": "8nFaUn821BQeHEYJB48D2ditaP7eNnZasV2BcpdP1NkS",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -268,7 +268,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "9V6jsMK9XLyNRZP2FibbzyRKWEcY4Tt65h8agoWzHRZP",
+            "digest": "G9rZB2AS1UvbTy7kUXX17vX2JNRXvnBP37EcC1cBbyJx",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -279,7 +279,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjoxMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "H8KAyZZPYaCek4Re3qMhEEnU3y4B9zY7Lp37wvLEWEGb",
+            "digest": "HKr6Um13cPQE2cna5xDD7cYdtpxKZFPSC9NTuKefMdj",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -333,7 +333,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "9V6jsMK9XLyNRZP2FibbzyRKWEcY4Tt65h8agoWzHRZP",
+            "digest": "G9rZB2AS1UvbTy7kUXX17vX2JNRXvnBP37EcC1cBbyJx",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -344,7 +344,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjoxMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "H8KAyZZPYaCek4Re3qMhEEnU3y4B9zY7Lp37wvLEWEGb",
+            "digest": "HKr6Um13cPQE2cna5xDD7cYdtpxKZFPSC9NTuKefMdj",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp
index 3917861451d..df0fb13d8de 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp
@@ -96,7 +96,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
+            "digest": "DnEG8FVjCxcuvDeaqRbGDepf4dAFHEUPUfuKXoBgNVPq",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -107,7 +107,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "AEdxQbygydX7DkuXCwpL2A7mSk7MvDhAvB3qnXePcsDA",
+            "digest": "65DSnzKiePBU187otXJCRQxvfdiF7zow5o9CgKZJEM2p",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -118,7 +118,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "Fz84MVS4TX8jF6Wi77gnsBPwTMtKyzAKYkgaeY1MKGiu",
+            "digest": "258doz3t7Tbucgg72w5BYsxAXedyofTmfmoxshZ58DLE",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -129,7 +129,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "3gLQv5PABHiHhejxdMS7Them5adUNu4mXN4eGr8XMCEt",
+            "digest": "7oM8nZHDkLHWBaKiadaqr7dSfBJ3ktECNcN3LHDsPbjR",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -140,7 +140,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "23jNXYb2S5zUPRBnyCVij3g8N63QKfjPZKAk9tYvg9Js",
+            "digest": "CaNuSnU88qrQ34FDQEaFigBg7mUKqBUazbyn7iS6eWZp",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -168,7 +168,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "23jNXYb2S5zUPRBnyCVij3g8N63QKfjPZKAk9tYvg9Js",
+            "digest": "CaNuSnU88qrQ34FDQEaFigBg7mUKqBUazbyn7iS6eWZp",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -196,7 +196,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo5LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "3gLQv5PABHiHhejxdMS7Them5adUNu4mXN4eGr8XMCEt",
+            "digest": "7oM8nZHDkLHWBaKiadaqr7dSfBJ3ktECNcN3LHDsPbjR",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -224,7 +224,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo3LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "Fz84MVS4TX8jF6Wi77gnsBPwTMtKyzAKYkgaeY1MKGiu",
+            "digest": "258doz3t7Tbucgg72w5BYsxAXedyofTmfmoxshZ58DLE",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -268,7 +268,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
+            "digest": "DnEG8FVjCxcuvDeaqRbGDepf4dAFHEUPUfuKXoBgNVPq",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -279,7 +279,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "AEdxQbygydX7DkuXCwpL2A7mSk7MvDhAvB3qnXePcsDA",
+            "digest": "65DSnzKiePBU187otXJCRQxvfdiF7zow5o9CgKZJEM2p",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp
index e7048205795..32785936978 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp
@@ -164,7 +164,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
+            "digest": "GWwdz5zBA1yPYJf6h1yxtZ9QGLQaUcrr4jWK1ZUG2VM6",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -175,7 +175,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "5emM1KVTcfuVTqbdsPAixpo5iYy5Mmw7rTAPwJHK3hfP",
+            "digest": "9hfQDYYeDimv2iBCHLz2CoW1PsnmFs2Z3xQ2RnSneB5k",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -186,7 +186,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoxNywiaSI6ZmFsc2V9",
           "node": {
-            "digest": "4KZdypaLVFszpbFKsSh5iXoEQ1mV5TttqKAhaCx2XViA",
+            "digest": "EYnndyd9P4KDjsKpXKDmL8UDT63BLTk4QRY57bViNKoy",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -197,7 +197,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoxOCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "5TFPabtfYgxhCT7d254rxdEg3XpUMaKGZ16W5r1yf3t2",
+            "digest": "8wupkDnWvMVQj952oeFesB9TkvsT29dnqd6v99rgDYUZ",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -208,7 +208,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "9P3GrKJpBJPXALT9QtxpsF4WrMjSru2QX1scXTboTG6H",
+            "digest": "9G4fVeLrRuKqtRq2XKULBNGuXbBAq81VVi7pLVV8WSjH",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -236,7 +236,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
+            "digest": "GWwdz5zBA1yPYJf6h1yxtZ9QGLQaUcrr4jWK1ZUG2VM6",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -264,7 +264,7 @@ Response: {
         {
           "cursor": "eyJjIjo3LCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "5emM1KVTcfuVTqbdsPAixpo5iYy5Mmw7rTAPwJHK3hfP",
+            "digest": "9hfQDYYeDimv2iBCHLz2CoW1PsnmFs2Z3xQ2RnSneB5k",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -308,7 +308,7 @@ Response: {
         {
           "cursor": "eyJjIjo3LCJ0IjoxNywiaSI6ZmFsc2V9",
           "node": {
-            "digest": "4KZdypaLVFszpbFKsSh5iXoEQ1mV5TttqKAhaCx2XViA",
+            "digest": "EYnndyd9P4KDjsKpXKDmL8UDT63BLTk4QRY57bViNKoy",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -336,7 +336,7 @@ Response: {
         {
           "cursor": "eyJjIjo3LCJ0IjoxOCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "5TFPabtfYgxhCT7d254rxdEg3XpUMaKGZ16W5r1yf3t2",
+            "digest": "8wupkDnWvMVQj952oeFesB9TkvsT29dnqd6v99rgDYUZ",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -364,7 +364,7 @@ Response: {
         {
           "cursor": "eyJjIjo3LCJ0IjoyMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "9P3GrKJpBJPXALT9QtxpsF4WrMjSru2QX1scXTboTG6H",
+            "digest": "9G4fVeLrRuKqtRq2XKULBNGuXbBAq81VVi7pLVV8WSjH",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp
index 33063e79c4b..6b34c9b9c3d 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp
@@ -164,7 +164,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
+            "digest": "GWwdz5zBA1yPYJf6h1yxtZ9QGLQaUcrr4jWK1ZUG2VM6",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -175,7 +175,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "5emM1KVTcfuVTqbdsPAixpo5iYy5Mmw7rTAPwJHK3hfP",
+            "digest": "9hfQDYYeDimv2iBCHLz2CoW1PsnmFs2Z3xQ2RnSneB5k",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -186,7 +186,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoxNywiaSI6ZmFsc2V9",
           "node": {
-            "digest": "4KZdypaLVFszpbFKsSh5iXoEQ1mV5TttqKAhaCx2XViA",
+            "digest": "EYnndyd9P4KDjsKpXKDmL8UDT63BLTk4QRY57bViNKoy",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -197,7 +197,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "4v2Kr8JpC1gapTNqCWzb8xMLgttat7TYkUeqU2SH7uFF",
+            "digest": "FqCdNkJe4WuFVYK6NQYUU2A5N3z5noD2gSRxSNNxSEqy",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -225,7 +225,7 @@ Response: {
         {
           "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "4v2Kr8JpC1gapTNqCWzb8xMLgttat7TYkUeqU2SH7uFF",
+            "digest": "FqCdNkJe4WuFVYK6NQYUU2A5N3z5noD2gSRxSNNxSEqy",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -253,7 +253,7 @@ Response: {
         {
           "cursor": "eyJjIjo3LCJ0IjoxNywiaSI6ZmFsc2V9",
           "node": {
-            "digest": "4KZdypaLVFszpbFKsSh5iXoEQ1mV5TttqKAhaCx2XViA",
+            "digest": "EYnndyd9P4KDjsKpXKDmL8UDT63BLTk4QRY57bViNKoy",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 5
@@ -313,7 +313,7 @@ Response: {
         {
           "cursor": "eyJjIjo3LCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "5emM1KVTcfuVTqbdsPAixpo5iYy5Mmw7rTAPwJHK3hfP",
+            "digest": "9hfQDYYeDimv2iBCHLz2CoW1PsnmFs2Z3xQ2RnSneB5k",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -341,7 +341,7 @@ Response: {
         {
           "cursor": "eyJjIjo3LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
+            "digest": "GWwdz5zBA1yPYJf6h1yxtZ9QGLQaUcrr4jWK1ZUG2VM6",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp
index b3ba63e8df5..f7e044ed728 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp
@@ -96,7 +96,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
+            "digest": "GWwdz5zBA1yPYJf6h1yxtZ9QGLQaUcrr4jWK1ZUG2VM6",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -107,7 +107,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "4X34W4QU7n7JCUEqdfwziv5Qq5djmR3jcGZfjhSkXwj2",
+            "digest": "CGPw5KrYiJiDyZa24BzvHMyJvUBhHWP6F1sbWCjwozLS",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -118,7 +118,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "iHSF6gKzVc3Zzj8UTFHo7fXvF6D5j5BqKaJ2w9xixsN",
+            "digest": "Dnzdyd3vDun537bAMz7DvxKG8ybVFRmvJyeRBBDqVvMy",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -129,7 +129,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "8Jw58Jdr5uZTjhxmGPz9osQ6vZDY9dCZpqtUHSrJvvhj",
+            "digest": "GvfWZNUzEew3a5RhE7rGKjH3L4gHoa4k6m1Nva96E6bp",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -140,7 +140,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "2bivHL99KmEH5bnM644vM1kJAALCgm4qTeRm6AaegLY2",
+            "digest": "7q8XWECsrjrYfBLVirtM1TbbYGbwuN7vYZt5Zq55DZ6c",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -151,7 +151,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "AwWpjWNvy45DgiXspMC23gN729QDnukv2DV3gy1wauT4",
+            "digest": "EUTZPzJudTHwpPwDeDmB2y9HCuhatB8ZjWLQUFiUuhQE",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -162,7 +162,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "7uq1QwFuZfFibdaABeeoRVHtGSSkjVcDhtFkapr3EVjp",
+            "digest": "29eV4ttEPsEKaMV5w2CQQNy7CYfPJ3htyJJsdPxbn8zE",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -173,7 +173,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "3w7HnpjLC7JpPiBJRKfxW54Sc6Kbm8NgZJg9zxtHW99x",
+            "digest": "3NWg9dFnkdCymgzztThS3BvSa4HRJ3NEUyab8WcuYYJV",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -184,7 +184,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "DhPLAJFUkVgDj7VzHnR6xKPdNNW6pdByRejVkhjiFkxe",
+            "digest": "EP6Gr5u8msQHfb7RxBPoQTi3d6DTmwsZ2GRY6GfAj3YA",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -195,7 +195,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "FQwNLf2bx29xVeShDyueB7QVyQz1hnMxtLNG51pbFix5",
+            "digest": "AiHnbX3T3nUETNFEZKiFnuukuh8v8XzBfjqNfqTMbcWK",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -223,7 +223,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
+            "digest": "GWwdz5zBA1yPYJf6h1yxtZ9QGLQaUcrr4jWK1ZUG2VM6",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -251,7 +251,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "iHSF6gKzVc3Zzj8UTFHo7fXvF6D5j5BqKaJ2w9xixsN",
+            "digest": "Dnzdyd3vDun537bAMz7DvxKG8ybVFRmvJyeRBBDqVvMy",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -279,7 +279,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "2bivHL99KmEH5bnM644vM1kJAALCgm4qTeRm6AaegLY2",
+            "digest": "7q8XWECsrjrYfBLVirtM1TbbYGbwuN7vYZt5Zq55DZ6c",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -290,7 +290,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo4LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "7uq1QwFuZfFibdaABeeoRVHtGSSkjVcDhtFkapr3EVjp",
+            "digest": "29eV4ttEPsEKaMV5w2CQQNy7CYfPJ3htyJJsdPxbn8zE",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -318,7 +318,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "DhPLAJFUkVgDj7VzHnR6xKPdNNW6pdByRejVkhjiFkxe",
+            "digest": "EP6Gr5u8msQHfb7RxBPoQTi3d6DTmwsZ2GRY6GfAj3YA",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp
index 50f3c894caa..76b54b87d5a 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp
@@ -96,7 +96,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
+            "digest": "GWwdz5zBA1yPYJf6h1yxtZ9QGLQaUcrr4jWK1ZUG2VM6",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -107,7 +107,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "4X34W4QU7n7JCUEqdfwziv5Qq5djmR3jcGZfjhSkXwj2",
+            "digest": "CGPw5KrYiJiDyZa24BzvHMyJvUBhHWP6F1sbWCjwozLS",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -118,7 +118,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "iHSF6gKzVc3Zzj8UTFHo7fXvF6D5j5BqKaJ2w9xixsN",
+            "digest": "Dnzdyd3vDun537bAMz7DvxKG8ybVFRmvJyeRBBDqVvMy",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -129,7 +129,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "8Jw58Jdr5uZTjhxmGPz9osQ6vZDY9dCZpqtUHSrJvvhj",
+            "digest": "GvfWZNUzEew3a5RhE7rGKjH3L4gHoa4k6m1Nva96E6bp",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -140,7 +140,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "2bivHL99KmEH5bnM644vM1kJAALCgm4qTeRm6AaegLY2",
+            "digest": "7q8XWECsrjrYfBLVirtM1TbbYGbwuN7vYZt5Zq55DZ6c",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -151,7 +151,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "AwWpjWNvy45DgiXspMC23gN729QDnukv2DV3gy1wauT4",
+            "digest": "EUTZPzJudTHwpPwDeDmB2y9HCuhatB8ZjWLQUFiUuhQE",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -162,7 +162,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "7uq1QwFuZfFibdaABeeoRVHtGSSkjVcDhtFkapr3EVjp",
+            "digest": "29eV4ttEPsEKaMV5w2CQQNy7CYfPJ3htyJJsdPxbn8zE",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -173,7 +173,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "3w7HnpjLC7JpPiBJRKfxW54Sc6Kbm8NgZJg9zxtHW99x",
+            "digest": "3NWg9dFnkdCymgzztThS3BvSa4HRJ3NEUyab8WcuYYJV",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -184,7 +184,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "DhPLAJFUkVgDj7VzHnR6xKPdNNW6pdByRejVkhjiFkxe",
+            "digest": "EP6Gr5u8msQHfb7RxBPoQTi3d6DTmwsZ2GRY6GfAj3YA",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -195,7 +195,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "FQwNLf2bx29xVeShDyueB7QVyQz1hnMxtLNG51pbFix5",
+            "digest": "AiHnbX3T3nUETNFEZKiFnuukuh8v8XzBfjqNfqTMbcWK",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -223,7 +223,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
           "node": {
-            "digest": "DhPLAJFUkVgDj7VzHnR6xKPdNNW6pdByRejVkhjiFkxe",
+            "digest": "EP6Gr5u8msQHfb7RxBPoQTi3d6DTmwsZ2GRY6GfAj3YA",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -251,7 +251,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo4LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "7uq1QwFuZfFibdaABeeoRVHtGSSkjVcDhtFkapr3EVjp",
+            "digest": "29eV4ttEPsEKaMV5w2CQQNy7CYfPJ3htyJJsdPxbn8zE",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 3
@@ -279,7 +279,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "2bivHL99KmEH5bnM644vM1kJAALCgm4qTeRm6AaegLY2",
+            "digest": "7q8XWECsrjrYfBLVirtM1TbbYGbwuN7vYZt5Zq55DZ6c",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -307,7 +307,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
-            "digest": "iHSF6gKzVc3Zzj8UTFHo7fXvF6D5j5BqKaJ2w9xixsN",
+            "digest": "Dnzdyd3vDun537bAMz7DvxKG8ybVFRmvJyeRBBDqVvMy",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
@@ -335,7 +335,7 @@ Response: {
         {
           "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "ByxtJgvDELx1HXpRVU9PM9jzDHSe4Ffyh1sDF7emKNkH",
+            "digest": "GWwdz5zBA1yPYJf6h1yxtZ9QGLQaUcrr4jWK1ZUG2VM6",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp
index 41a716db47f..d83fd0b488f 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/scan_limit/require.exp
@@ -94,7 +94,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
+          "digest": "DnEG8FVjCxcuvDeaqRbGDepf4dAFHEUPUfuKXoBgNVPq",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -102,7 +102,7 @@ Response: {
           }
         },
         {
-          "digest": "AEdxQbygydX7DkuXCwpL2A7mSk7MvDhAvB3qnXePcsDA",
+          "digest": "65DSnzKiePBU187otXJCRQxvfdiF7zow5o9CgKZJEM2p",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -110,7 +110,7 @@ Response: {
           }
         },
         {
-          "digest": "J5TzJqBopvv8AEmUxf6bk54RYBkse1dRXffiw77BSWUP",
+          "digest": "2KwcwgpuDJzFRN3d6tsACZk8rxpELMkkdraoA1C9HtX8",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -118,7 +118,7 @@ Response: {
           }
         },
         {
-          "digest": "CEfMtnw1KxwGv3RCJWL2X38p9PaPyHHEdGBvXLJQa5gx",
+          "digest": "J6n5bKEKVG2fTQnPfwYEx519PVm6cVRaJ555EL2n4VFH",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -126,7 +126,7 @@ Response: {
           }
         },
         {
-          "digest": "HkWA3sZ33dVTGdjG8sRbuoYceqC8GY2HhL2i5d4yrD6U",
+          "digest": "5k29tRfQ68Fg87G7vjq4nR7cuXjguUTZDvaQZ4Yriv6d",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -134,7 +134,7 @@ Response: {
           }
         },
         {
-          "digest": "28YNVNZsP2edJ6PvbuAPJ4dbCBg8oAgNea3Nf23BjudJ",
+          "digest": "H5ksb5gvCnf6CgJfwymnrMkGGfDfTcCUtUdb4B5NWCAn",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -142,7 +142,7 @@ Response: {
           }
         },
         {
-          "digest": "GuqxX5BWTTVxYKf89NmjSMP92fZR85eMcmcx3ru8Tfm3",
+          "digest": "5akTvsZxyaD8qPy4USdysxAH4SKoDjGJmshRpDyQip98",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -150,7 +150,7 @@ Response: {
           }
         },
         {
-          "digest": "BnEDqYveFTrSUCM5FFBwo3m27QDsW1mDsNkEjc2cN9NH",
+          "digest": "6Eg258qqgGs9AUKnJFUFJQSu4Uk2XCJZZu8gVga3XM3T",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -158,7 +158,7 @@ Response: {
           }
         },
         {
-          "digest": "CwXj6FRoCyGEuJmm2SdSTJU1TWpcoDns1nsSGAWaMJke",
+          "digest": "426m3vv35dULKjnid7roTUQjYs3PZ4hrs14f1AW1Rrkg",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -166,7 +166,7 @@ Response: {
           }
         },
         {
-          "digest": "8k6GFRmxfkFeS12mwhZyoo5G3oAcQqVLLYzxM6sJHGRT",
+          "digest": "8BwgFuaepUNC7fQbsGds9zrSFKRiRUAVn3ws5vuha5hf",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -191,7 +191,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
+          "digest": "DnEG8FVjCxcuvDeaqRbGDepf4dAFHEUPUfuKXoBgNVPq",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -199,7 +199,7 @@ Response: {
           }
         },
         {
-          "digest": "AEdxQbygydX7DkuXCwpL2A7mSk7MvDhAvB3qnXePcsDA",
+          "digest": "65DSnzKiePBU187otXJCRQxvfdiF7zow5o9CgKZJEM2p",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -207,7 +207,7 @@ Response: {
           }
         },
         {
-          "digest": "J5TzJqBopvv8AEmUxf6bk54RYBkse1dRXffiw77BSWUP",
+          "digest": "2KwcwgpuDJzFRN3d6tsACZk8rxpELMkkdraoA1C9HtX8",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -215,7 +215,7 @@ Response: {
           }
         },
         {
-          "digest": "CEfMtnw1KxwGv3RCJWL2X38p9PaPyHHEdGBvXLJQa5gx",
+          "digest": "J6n5bKEKVG2fTQnPfwYEx519PVm6cVRaJ555EL2n4VFH",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -223,7 +223,7 @@ Response: {
           }
         },
         {
-          "digest": "HkWA3sZ33dVTGdjG8sRbuoYceqC8GY2HhL2i5d4yrD6U",
+          "digest": "5k29tRfQ68Fg87G7vjq4nR7cuXjguUTZDvaQZ4Yriv6d",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -231,7 +231,7 @@ Response: {
           }
         },
         {
-          "digest": "28YNVNZsP2edJ6PvbuAPJ4dbCBg8oAgNea3Nf23BjudJ",
+          "digest": "H5ksb5gvCnf6CgJfwymnrMkGGfDfTcCUtUdb4B5NWCAn",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -239,7 +239,7 @@ Response: {
           }
         },
         {
-          "digest": "GuqxX5BWTTVxYKf89NmjSMP92fZR85eMcmcx3ru8Tfm3",
+          "digest": "5akTvsZxyaD8qPy4USdysxAH4SKoDjGJmshRpDyQip98",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -247,7 +247,7 @@ Response: {
           }
         },
         {
-          "digest": "BnEDqYveFTrSUCM5FFBwo3m27QDsW1mDsNkEjc2cN9NH",
+          "digest": "6Eg258qqgGs9AUKnJFUFJQSu4Uk2XCJZZu8gVga3XM3T",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -255,7 +255,7 @@ Response: {
           }
         },
         {
-          "digest": "CwXj6FRoCyGEuJmm2SdSTJU1TWpcoDns1nsSGAWaMJke",
+          "digest": "426m3vv35dULKjnid7roTUQjYs3PZ4hrs14f1AW1Rrkg",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -263,7 +263,7 @@ Response: {
           }
         },
         {
-          "digest": "8k6GFRmxfkFeS12mwhZyoo5G3oAcQqVLLYzxM6sJHGRT",
+          "digest": "8BwgFuaepUNC7fQbsGds9zrSFKRiRUAVn3ws5vuha5hf",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -311,7 +311,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
+          "digest": "DnEG8FVjCxcuvDeaqRbGDepf4dAFHEUPUfuKXoBgNVPq",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -319,7 +319,7 @@ Response: {
           }
         },
         {
-          "digest": "AEdxQbygydX7DkuXCwpL2A7mSk7MvDhAvB3qnXePcsDA",
+          "digest": "65DSnzKiePBU187otXJCRQxvfdiF7zow5o9CgKZJEM2p",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -327,7 +327,7 @@ Response: {
           }
         },
         {
-          "digest": "J5TzJqBopvv8AEmUxf6bk54RYBkse1dRXffiw77BSWUP",
+          "digest": "2KwcwgpuDJzFRN3d6tsACZk8rxpELMkkdraoA1C9HtX8",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -335,7 +335,7 @@ Response: {
           }
         },
         {
-          "digest": "CEfMtnw1KxwGv3RCJWL2X38p9PaPyHHEdGBvXLJQa5gx",
+          "digest": "J6n5bKEKVG2fTQnPfwYEx519PVm6cVRaJ555EL2n4VFH",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -343,7 +343,7 @@ Response: {
           }
         },
         {
-          "digest": "HkWA3sZ33dVTGdjG8sRbuoYceqC8GY2HhL2i5d4yrD6U",
+          "digest": "5k29tRfQ68Fg87G7vjq4nR7cuXjguUTZDvaQZ4Yriv6d",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -351,7 +351,7 @@ Response: {
           }
         },
         {
-          "digest": "28YNVNZsP2edJ6PvbuAPJ4dbCBg8oAgNea3Nf23BjudJ",
+          "digest": "H5ksb5gvCnf6CgJfwymnrMkGGfDfTcCUtUdb4B5NWCAn",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -359,7 +359,7 @@ Response: {
           }
         },
         {
-          "digest": "GuqxX5BWTTVxYKf89NmjSMP92fZR85eMcmcx3ru8Tfm3",
+          "digest": "5akTvsZxyaD8qPy4USdysxAH4SKoDjGJmshRpDyQip98",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -367,7 +367,7 @@ Response: {
           }
         },
         {
-          "digest": "BnEDqYveFTrSUCM5FFBwo3m27QDsW1mDsNkEjc2cN9NH",
+          "digest": "6Eg258qqgGs9AUKnJFUFJQSu4Uk2XCJZZu8gVga3XM3T",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -375,7 +375,7 @@ Response: {
           }
         },
         {
-          "digest": "CwXj6FRoCyGEuJmm2SdSTJU1TWpcoDns1nsSGAWaMJke",
+          "digest": "426m3vv35dULKjnid7roTUQjYs3PZ4hrs14f1AW1Rrkg",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -383,7 +383,7 @@ Response: {
           }
         },
         {
-          "digest": "8k6GFRmxfkFeS12mwhZyoo5G3oAcQqVLLYzxM6sJHGRT",
+          "digest": "8BwgFuaepUNC7fQbsGds9zrSFKRiRUAVn3ws5vuha5hf",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -431,7 +431,7 @@ Response: {
       },
       "nodes": [
         {
-          "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
+          "digest": "DnEG8FVjCxcuvDeaqRbGDepf4dAFHEUPUfuKXoBgNVPq",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -439,7 +439,7 @@ Response: {
           }
         },
         {
-          "digest": "AEdxQbygydX7DkuXCwpL2A7mSk7MvDhAvB3qnXePcsDA",
+          "digest": "65DSnzKiePBU187otXJCRQxvfdiF7zow5o9CgKZJEM2p",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -447,7 +447,7 @@ Response: {
           }
         },
         {
-          "digest": "J5TzJqBopvv8AEmUxf6bk54RYBkse1dRXffiw77BSWUP",
+          "digest": "2KwcwgpuDJzFRN3d6tsACZk8rxpELMkkdraoA1C9HtX8",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -455,7 +455,7 @@ Response: {
           }
         },
         {
-          "digest": "CEfMtnw1KxwGv3RCJWL2X38p9PaPyHHEdGBvXLJQa5gx",
+          "digest": "J6n5bKEKVG2fTQnPfwYEx519PVm6cVRaJ555EL2n4VFH",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -463,7 +463,7 @@ Response: {
           }
         },
         {
-          "digest": "HkWA3sZ33dVTGdjG8sRbuoYceqC8GY2HhL2i5d4yrD6U",
+          "digest": "5k29tRfQ68Fg87G7vjq4nR7cuXjguUTZDvaQZ4Yriv6d",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 2
@@ -471,7 +471,7 @@ Response: {
           }
         },
         {
-          "digest": "28YNVNZsP2edJ6PvbuAPJ4dbCBg8oAgNea3Nf23BjudJ",
+          "digest": "H5ksb5gvCnf6CgJfwymnrMkGGfDfTcCUtUdb4B5NWCAn",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -479,7 +479,7 @@ Response: {
           }
         },
         {
-          "digest": "GuqxX5BWTTVxYKf89NmjSMP92fZR85eMcmcx3ru8Tfm3",
+          "digest": "5akTvsZxyaD8qPy4USdysxAH4SKoDjGJmshRpDyQip98",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -487,7 +487,7 @@ Response: {
           }
         },
         {
-          "digest": "BnEDqYveFTrSUCM5FFBwo3m27QDsW1mDsNkEjc2cN9NH",
+          "digest": "6Eg258qqgGs9AUKnJFUFJQSu4Uk2XCJZZu8gVga3XM3T",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -495,7 +495,7 @@ Response: {
           }
         },
         {
-          "digest": "CwXj6FRoCyGEuJmm2SdSTJU1TWpcoDns1nsSGAWaMJke",
+          "digest": "426m3vv35dULKjnid7roTUQjYs3PZ4hrs14f1AW1Rrkg",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -503,7 +503,7 @@ Response: {
           }
         },
         {
-          "digest": "8k6GFRmxfkFeS12mwhZyoo5G3oAcQqVLLYzxM6sJHGRT",
+          "digest": "8BwgFuaepUNC7fQbsGds9zrSFKRiRUAVn3ws5vuha5hf",
           "effects": {
             "checkpoint": {
               "sequenceNumber": 3
@@ -592,7 +592,7 @@ Response: {
         {
           "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
-            "digest": "AQZYsKKQU62BRJzDv4KnKqV31uFtGJfUhWcZKpYJoaZJ",
+            "digest": "DnEG8FVjCxcuvDeaqRbGDepf4dAFHEUPUfuKXoBgNVPq",
             "effects": {
               "checkpoint": {
                 "sequenceNumber": 2
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp b/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp
index 71b1a673a30..204726d760a 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/shared.exp
@@ -42,7 +42,7 @@ Response: {
             "transactions": {
               "nodes": [
                 {
-                  "package": "0xaada297702741254a16048a46191b6d73e697ece387343fa7d57e93ccbe3a6fe",
+                  "package": "0x6e0ed5e54da9e05503efb61038f2319207cefeffe96761bfe60c2c7c22b6d4a1",
                   "module": "m",
                   "functionName": "get"
                 }
@@ -55,17 +55,17 @@ Response: {
               "nodes": [
                 {
                   "__typename": "SharedObjectRead",
-                  "address": "0x003e9261fcd0f64b951a21ae77f470803b0e801a350e7a8934165b2201052f1c",
+                  "address": "0x6234c7f86f2b7a54b6eba66e47d1a143ee6af79278e49cc3f16af445d83cface",
                   "version": 2,
-                  "digest": "GfMkk6R7jooB9pyD6kUGHEpK66By21gpKrTAPZxkFSMS",
+                  "digest": "8aQDNrFKDnyR8kpHpvkgrTPVG2jp3zrhjCfnbdkjUZPh",
                   "object": {
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0xaada297702741254a16048a46191b6d73e697ece387343fa7d57e93ccbe3a6fe::m::Foo"
+                          "repr": "0x6e0ed5e54da9e05503efb61038f2319207cefeffe96761bfe60c2c7c22b6d4a1::m::Foo"
                         },
                         "json": {
-                          "id": "0x003e9261fcd0f64b951a21ae77f470803b0e801a350e7a8934165b2201052f1c",
+                          "id": "0x6234c7f86f2b7a54b6eba66e47d1a143ee6af79278e49cc3f16af445d83cface",
                           "x": "0"
                         }
                       }
@@ -82,7 +82,7 @@ Response: {
             "transactions": {
               "nodes": [
                 {
-                  "package": "0xaada297702741254a16048a46191b6d73e697ece387343fa7d57e93ccbe3a6fe",
+                  "package": "0x6e0ed5e54da9e05503efb61038f2319207cefeffe96761bfe60c2c7c22b6d4a1",
                   "module": "m",
                   "functionName": "inc"
                 }
@@ -102,12 +102,12 @@ Response: {
             "transactions": {
               "nodes": [
                 {
-                  "package": "0xaada297702741254a16048a46191b6d73e697ece387343fa7d57e93ccbe3a6fe",
+                  "package": "0x6e0ed5e54da9e05503efb61038f2319207cefeffe96761bfe60c2c7c22b6d4a1",
                   "module": "m",
                   "functionName": "get"
                 },
                 {
-                  "package": "0xaada297702741254a16048a46191b6d73e697ece387343fa7d57e93ccbe3a6fe",
+                  "package": "0x6e0ed5e54da9e05503efb61038f2319207cefeffe96761bfe60c2c7c22b6d4a1",
                   "module": "m",
                   "functionName": "inc"
                 }
diff --git a/crates/iota-graphql-e2e-tests/tests/transactions/system.exp b/crates/iota-graphql-e2e-tests/tests/transactions/system.exp
index afe2c45bad0..84f4b210b98 100644
--- a/crates/iota-graphql-e2e-tests/tests/transactions/system.exp
+++ b/crates/iota-graphql-e2e-tests/tests/transactions/system.exp
@@ -7,7 +7,7 @@ Response: {
     "transactionBlocks": {
       "nodes": [
         {
-          "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV",
+          "digest": "A47B3FAttYy3F2YU1xp9uiMPHw7D8VAaf46hNRuDBEKj",
           "sender": null,
           "signatures": [
             "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="
@@ -407,7 +407,7 @@ Response: {
                         "json": {
                           "id": "0x0000000000000000000000000000000000000000000000000000000000000008",
                           "inner": {
-                            "id": "0xeff71a60350f0dfb07d6197495db2804e7fee007f96fbeb2843c9b153fe7443c",
+                            "id": "0xef42157fdeb89d4438fe673bdb790ae751f1132b60341c6413895e75313f9621",
                             "version": "1"
                           }
                         }
@@ -489,7 +489,7 @@ Response: {
                         "json": {
                           "id": "0x0000000000000000000000000000000000000000000000000000000000000403",
                           "lists": {
-                            "id": "0xe2c5af93c4d2edbd6e26ef598a34ea99b26a8c158db803486334b172ec18b135",
+                            "id": "0x5182a7b37339bcad67655ec3d22fb3c013d9e68765daafa4bb57c27a8f968afa",
                             "size": "0"
                           }
                         }
@@ -586,19 +586,15 @@ Response: {
                 {
                   "cursor": "eyJpIjo5LCJjIjowfQ",
                   "node": {
-                    "address": "0x0ca370d53d314d37a60c552eaa74bad5de28b2b04788a65f9baf5db044f25c49",
+                    "address": "0x1d374b2388178241deedb7e6fc1727e27f25c10d394329b614486faf0bf9cf14",
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::PoolTokenExchangeRate>"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::validator_cap::UnverifiedValidatorOperationCap"
                         },
                         "json": {
-                          "id": "0x0ca370d53d314d37a60c552eaa74bad5de28b2b04788a65f9baf5db044f25c49",
-                          "name": "0",
-                          "value": {
-                            "iota_amount": "0",
-                            "pool_token_amount": "0"
-                          }
+                          "id": "0x1d374b2388178241deedb7e6fc1727e27f25c10d394329b614486faf0bf9cf14",
+                          "authorizer_validator_address": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80"
                         }
                       }
                     },
@@ -608,16 +604,16 @@ Response: {
                 {
                   "cursor": "eyJpIjoxMCwiYyI6MH0",
                   "node": {
-                    "address": "0x19ab66c40622ca2999a2308fb9111c1bb547716a10680dcaabaced9c11573641",
+                    "address": "0x2da8747fe6350b4147ffcf8488e97671c13a3f9b1c3f9694f86f0c85c7a6353f",
                     "asMoveObject": {
                       "contents": {
                         "type": {
                           "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         },
                         "json": {
-                          "id": "0x19ab66c40622ca2999a2308fb9111c1bb547716a10680dcaabaced9c11573641",
+                          "id": "0x2da8747fe6350b4147ffcf8488e97671c13a3f9b1c3f9694f86f0c85c7a6353f",
                           "balance": {
-                            "value": "30000000000000000"
+                            "value": "300000000000000"
                           }
                         }
                       }
@@ -627,6 +623,52 @@ Response: {
                 },
                 {
                   "cursor": "eyJpIjoxMSwiYyI6MH0",
+                  "node": {
+                    "address": "0x35ac025460b42e6d85fee7a6e37b0200affce71d8b0c35cbc43a03aa8b6c774c",
+                    "asMoveObject": {
+                      "contents": {
+                        "type": {
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                        },
+                        "json": {
+                          "id": "0x35ac025460b42e6d85fee7a6e37b0200affce71d8b0c35cbc43a03aa8b6c774c",
+                          "decimals": 9,
+                          "name": "IOTA",
+                          "symbol": "IOTA",
+                          "description": "The main (gas)token of the IOTA Network.",
+                          "icon_url": {
+                            "url": "https://iota.org/logo.png"
+                          }
+                        }
+                      }
+                    },
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "cursor": "eyJpIjoxMiwiYyI6MH0",
+                  "node": {
+                    "address": "0x52ca6f77a3f1f997e48af6428033ab7bbd0e5db62b3caf940c28f535d8cedd51",
+                    "asMoveObject": {
+                      "contents": {
+                        "type": {
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::StakedIota"
+                        },
+                        "json": {
+                          "id": "0x52ca6f77a3f1f997e48af6428033ab7bbd0e5db62b3caf940c28f535d8cedd51",
+                          "pool_id": "0x5ab6a4146174e25a85e8b04f08064d23589cb2ab36584882ac869d14cee2fd72",
+                          "stake_activation_epoch": "0",
+                          "principal": {
+                            "value": "1500000000000000"
+                          }
+                        }
+                      }
+                    },
+                    "asMovePackage": null
+                  }
+                },
+                {
+                  "cursor": "eyJpIjoxMywiYyI6MH0",
                   "node": {
                     "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f",
                     "asMoveObject": {
@@ -664,7 +706,7 @@ Response: {
                   }
                 },
                 {
-                  "cursor": "eyJpIjoxMiwiYyI6MH0",
+                  "cursor": "eyJpIjoxNCwiYyI6MH0",
                   "node": {
                     "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2",
                     "asMoveObject": {
@@ -681,7 +723,7 @@ Response: {
                             "system_state_version": "1",
                             "iota_treasury_cap": {
                               "inner": {
-                                "id": "0xd87d1c70d3f36d3912eeafb2b89de980c025f8ac27304970d40d967a8f644c51",
+                                "id": "0x81ea4dfdaddc4ededde997f93a1a7e3e7f98695f1c5b7c7cdaeb5a38fb9fb30d",
                                 "total_supply": {
                                   "value": "31800000000000000"
                                 }
@@ -919,7 +961,7 @@ Response: {
                                     },
                                     "net_address": "/ip4/127.0.0.1/tcp/8000/http",
                                     "p2p_address": "/ip4/127.0.0.1/udp/8001/http",
-                                    "primary_address": "/ip4/127.0.0.1/udp/8004/http",
+                                    "primary_address": "/ip4/127.0.0.1/udp/8003/http",
                                     "next_epoch_authority_pubkey_bytes": null,
                                     "next_epoch_proof_of_possession": null,
                                     "next_epoch_network_pubkey_bytes": null,
@@ -928,15 +970,15 @@ Response: {
                                     "next_epoch_p2p_address": null,
                                     "next_epoch_primary_address": null,
                                     "extra_fields": {
-                                      "id": "0x7f2747bc0e903a3ab338e9d23700c47a23bfc548a2c7dffe73174920651b1570",
+                                      "id": "0x06ddfd7b8ab4a0891ebc62c0b771bdec2b59af258f3b2a12de0d84f7d8a37699",
                                       "size": "0"
                                     }
                                   },
                                   "voting_power": "10000",
-                                  "operation_cap_id": "0xc9544753fce6181d2193fad8c4d64919a70dc7dde57446ee716fb24c414594f0",
+                                  "operation_cap_id": "0x1d374b2388178241deedb7e6fc1727e27f25c10d394329b614486faf0bf9cf14",
                                   "gas_price": "1000",
                                   "staking_pool": {
-                                    "id": "0x16b972ce1279bef7cacd98dfcf1fd772372691c3cb6e76223110427ced478bb1",
+                                    "id": "0x5ab6a4146174e25a85e8b04f08064d23589cb2ab36584882ac869d14cee2fd72",
                                     "activation_epoch": "0",
                                     "deactivation_epoch": null,
                                     "iota_balance": "1500000000000000",
@@ -945,14 +987,14 @@ Response: {
                                     },
                                     "pool_token_balance": "1500000000000000",
                                     "exchange_rates": {
-                                      "id": "0x9a6e4b74d4ed125463ed75ec0b57d06294db02ca3c1dd1d6eb237d50cc04203f",
+                                      "id": "0xca03c453f01fbd87ec2c63fb95aeca4faa3c4ff8483baba6fb78ab9fc1c69faf",
                                       "size": "1"
                                     },
                                     "pending_stake": "0",
                                     "pending_total_iota_withdraw": "0",
                                     "pending_pool_token_withdraw": "0",
                                     "extra_fields": {
-                                      "id": "0xdb91a1ca84cb97608d2039ec37d9c285c222bf088a5ba67944854df85552b4f4",
+                                      "id": "0x44bd0c23568c02944afed13eda779d56eec115bd99ba7bbb96255e1cb1c4178a",
                                       "size": "0"
                                     }
                                   },
@@ -961,35 +1003,35 @@ Response: {
                                   "next_epoch_gas_price": "1000",
                                   "next_epoch_commission_rate": "200",
                                   "extra_fields": {
-                                    "id": "0xaf820673e6cf9a525396c41b4d08b74f0eb1fa72f293a1eddbf5af9ab789352a",
+                                    "id": "0x6129e687b20a8f484d15b93b327ddb26de5dcbe992ac83f3561b68b65a8b2617",
                                     "size": "0"
                                   }
                                 }
                               ],
                               "pending_active_validators": {
                                 "contents": {
-                                  "id": "0x4e0f38d679fe3b1a282f518dd46894ef8d39888c1134f08270617049720e2c4a",
+                                  "id": "0x1c918f720eb4a65f37367e78da108374c50083e4485ba07e7dad7859d049b8f8",
                                   "size": "0"
                                 }
                               },
                               "pending_removals": [],
                               "staking_pool_mappings": {
-                                "id": "0x1f972b0e26bc450e0dd88c8e98eec553fe754c85ae8be5e5e04b63b79ee9ea42",
+                                "id": "0x0f72bbffc7fd877cf2f57ac6e1e78353be0d0bd6a38d1a184061ef0861bdc4ff",
                                 "size": "1"
                               },
                               "inactive_validators": {
-                                "id": "0xe5a457d193b836a33cc1270724d4e557b05bc0dca26461fac76d0ef72cec306d",
+                                "id": "0xe8955a2930d4793cf5e68afffd5c9f27a68ff151c01feb49c77e67ce8a31593e",
                                 "size": "0"
                               },
                               "validator_candidates": {
-                                "id": "0x2e35182d0661c6dc3d609229621a1dee7db613dd593cc2f692320b4cfa67bc77",
+                                "id": "0xe840df5cacaed83166baeecadacf2316c3979d7155ecbcf0299ab9e1c0b0d532",
                                 "size": "0"
                               },
                               "at_risk_validators": {
                                 "contents": []
                               },
                               "extra_fields": {
-                                "id": "0xde53e411b6ee688b1ee9d3ce9bff0afc82361ecf78294025b3ff6da25f9b8cbe",
+                                "id": "0x5f98212b9cdb9cba1d9ba97f4f52bfe1997198e4b6539c4fa2e3f5fafd84ad4b",
                                 "size": "0"
                               }
                             },
@@ -1010,7 +1052,7 @@ Response: {
                               "validator_very_low_stake_threshold": "1000000000000000",
                               "validator_low_stake_grace_period": "7",
                               "extra_fields": {
-                                "id": "0xb07aa05e7324b4d49ba5e245c07c8103bd4d11aef35eb02b8533c1bc86617885",
+                                "id": "0xb8b3e8baec894e61f739d0f15b9fd88b1af0d00a90c93bfdec900fd1391dde11",
                                 "size": "0"
                               }
                             },
@@ -1029,7 +1071,7 @@ Response: {
                             "safe_mode_non_refundable_storage_fee": "0",
                             "epoch_start_timestamp_ms": "0",
                             "extra_fields": {
-                              "id": "0x9dd139455d75b077cd130a346bc30de90710fa9b24ec892d07f56215c1ac27b3",
+                              "id": "0xef00817bc6382ce2415ad92e42b2f84feea5a99ea5c531f47f8ff2a7b615a6ec",
                               "size": "0"
                             }
                           }
@@ -1039,62 +1081,23 @@ Response: {
                     "asMovePackage": null
                   }
                 },
-                {
-                  "cursor": "eyJpIjoxMywiYyI6MH0",
-                  "node": {
-                    "address": "0x7824c1656ba4803fa1a8c65aa463f7c09de734f47967e0b96c5f409aef56d3e2",
-                    "asMoveObject": {
-                      "contents": {
-                        "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
-                        },
-                        "json": {
-                          "id": "0x7824c1656ba4803fa1a8c65aa463f7c09de734f47967e0b96c5f409aef56d3e2",
-                          "balance": {
-                            "value": "300000000000000"
-                          }
-                        }
-                      }
-                    },
-                    "asMovePackage": null
-                  }
-                },
-                {
-                  "cursor": "eyJpIjoxNCwiYyI6MH0",
-                  "node": {
-                    "address": "0x84c9a12296be175e98b5364aa5b7a41b47787def054ff96d9ad6138815ffd31c",
-                    "asMoveObject": {
-                      "contents": {
-                        "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<0x0000000000000000000000000000000000000000000000000000000000000002::object::ID,address>"
-                        },
-                        "json": {
-                          "id": "0x84c9a12296be175e98b5364aa5b7a41b47787def054ff96d9ad6138815ffd31c",
-                          "name": "0x16b972ce1279bef7cacd98dfcf1fd772372691c3cb6e76223110427ced478bb1",
-                          "value": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80"
-                        }
-                      }
-                    },
-                    "asMovePackage": null
-                  }
-                },
                 {
                   "cursor": "eyJpIjoxNSwiYyI6MH0",
                   "node": {
-                    "address": "0x92e176f0a5af3b6158b54b3c86a024490f609b4bb469c4f453b2c3d81682f400",
+                    "address": "0x7a96da86a0ce7795c9e036e93db26dc4c6a3d87d2bb59396c25e261cf8c985ae",
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::CoinMetadata<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000002::random::RandomInner>"
                         },
                         "json": {
-                          "id": "0x92e176f0a5af3b6158b54b3c86a024490f609b4bb469c4f453b2c3d81682f400",
-                          "decimals": 9,
-                          "name": "IOTA",
-                          "symbol": "IOTA",
-                          "description": "The main (gas)token of the IOTA Network.",
-                          "icon_url": {
-                            "url": "https://iota.org/logo.png"
+                          "id": "0x7a96da86a0ce7795c9e036e93db26dc4c6a3d87d2bb59396c25e261cf8c985ae",
+                          "name": "1",
+                          "value": {
+                            "version": "1",
+                            "epoch": "0",
+                            "randomness_round": "0",
+                            "random_bytes": []
                           }
                         }
                       }
@@ -1105,21 +1108,16 @@ Response: {
                 {
                   "cursor": "eyJpIjoxNiwiYyI6MH0",
                   "node": {
-                    "address": "0xbd145529aeb51f47417e9e41eaa1a05bab36796cf9a98454485a656cecf2bc82",
+                    "address": "0x9c4468be862acb4b396c6a96c41a5d44168e92bad427d23ade2b365c4d0342fa",
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000002::random::RandomInner>"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<0x0000000000000000000000000000000000000000000000000000000000000002::object::ID,address>"
                         },
                         "json": {
-                          "id": "0xbd145529aeb51f47417e9e41eaa1a05bab36796cf9a98454485a656cecf2bc82",
-                          "name": "1",
-                          "value": {
-                            "version": "1",
-                            "epoch": "0",
-                            "randomness_round": "0",
-                            "random_bytes": []
-                          }
+                          "id": "0x9c4468be862acb4b396c6a96c41a5d44168e92bad427d23ade2b365c4d0342fa",
+                          "name": "0x5ab6a4146174e25a85e8b04f08064d23589cb2ab36584882ac869d14cee2fd72",
+                          "value": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80"
                         }
                       }
                     },
@@ -1129,15 +1127,17 @@ Response: {
                 {
                   "cursor": "eyJpIjoxNywiYyI6MH0",
                   "node": {
-                    "address": "0xc9544753fce6181d2193fad8c4d64919a70dc7dde57446ee716fb24c414594f0",
+                    "address": "0xa63010b93d31c3ae2c27903c7f4d9718bf917aaf6f2520925aa4a5da0cf0dcb0",
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::validator_cap::UnverifiedValidatorOperationCap"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::coin::Coin<0x0000000000000000000000000000000000000000000000000000000000000002::iota::IOTA>"
                         },
                         "json": {
-                          "id": "0xc9544753fce6181d2193fad8c4d64919a70dc7dde57446ee716fb24c414594f0",
-                          "authorizer_validator_address": "0x28f02a953f3553f51a9365593c7d4bd0643d2085f004b18c6ca9de51682b2c80"
+                          "id": "0xa63010b93d31c3ae2c27903c7f4d9718bf917aaf6f2520925aa4a5da0cf0dcb0",
+                          "balance": {
+                            "value": "30000000000000000"
+                          }
                         }
                       }
                     },
@@ -1147,14 +1147,14 @@ Response: {
                 {
                   "cursor": "eyJpIjoxOCwiYyI6MH0",
                   "node": {
-                    "address": "0xcf3a6620131a625ddf3ba1446ad827508b809bd210aca8d8351d134339622c5d",
+                    "address": "0xe385e8c7898861f3a60d3f9806e89b204757cee320e02faf0aa341622ecf9c07",
                     "asMoveObject": {
                       "contents": {
                         "type": {
                           "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::display::Display<0x000000000000000000000000000000000000000000000000000000000000107a::nft::Nft>"
                         },
                         "json": {
-                          "id": "0xcf3a6620131a625ddf3ba1446ad827508b809bd210aca8d8351d134339622c5d",
+                          "id": "0xe385e8c7898861f3a60d3f9806e89b204757cee320e02faf0aa341622ecf9c07",
                           "fields": {
                             "contents": [
                               {
@@ -1201,18 +1201,18 @@ Response: {
                 {
                   "cursor": "eyJpIjoxOSwiYyI6MH0",
                   "node": {
-                    "address": "0xfb80af4784e2346ff2b17c1ab41c34accf15da72bcaa0202347e96e9614692ac",
+                    "address": "0xe7597ac5ed82f4205bfdb093ad2c7c77d28eda56ef23ac930b4938283f26beb0",
                     "asMoveObject": {
                       "contents": {
                         "type": {
-                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::StakedIota"
+                          "repr": "0x0000000000000000000000000000000000000000000000000000000000000002::dynamic_field::Field<u64,0x0000000000000000000000000000000000000000000000000000000000000003::staking_pool::PoolTokenExchangeRate>"
                         },
                         "json": {
-                          "id": "0xfb80af4784e2346ff2b17c1ab41c34accf15da72bcaa0202347e96e9614692ac",
-                          "pool_id": "0x16b972ce1279bef7cacd98dfcf1fd772372691c3cb6e76223110427ced478bb1",
-                          "stake_activation_epoch": "0",
-                          "principal": {
-                            "value": "1500000000000000"
+                          "id": "0xe7597ac5ed82f4205bfdb093ad2c7c77d28eda56ef23ac930b4938283f26beb0",
+                          "name": "0",
+                          "value": {
+                            "iota_amount": "0",
+                            "pool_token_amount": "0"
                           }
                         }
                       }
@@ -1260,7 +1260,7 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x0000000000000000000000000000000000000000000000000000000000000001",
-                    "digest": "BHXUvAh7hYCQzY9pXTDzJU4jT4PCaLuKbzutM1a6NQ7G"
+                    "digest": "7i1FMsDo6mv9yjdpnWED9QQEL12F1Dx3cubJ9CxTifJN"
                   }
                 },
                 {
@@ -1269,7 +1269,7 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x0000000000000000000000000000000000000000000000000000000000000002",
-                    "digest": "G4CV5cYWz5MXjXepwJuE81izouheg4hwxDJGGLTAtyRL"
+                    "digest": "AaLjcUiSh4jt3rx49wCBhyXQAVhPGyChLWbfFavRRsZH"
                   }
                 },
                 {
@@ -1278,7 +1278,7 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x0000000000000000000000000000000000000000000000000000000000000003",
-                    "digest": "5aBdUWwW1kBBvxLLE7iGn96DnytxWCXtvxNy3NrhkrL1"
+                    "digest": "Ahy5BuNfqeg4NoLLpawgBz2B6zyYzbzVrfXL9wJnYGys"
                   }
                 },
                 {
@@ -1287,7 +1287,7 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x0000000000000000000000000000000000000000000000000000000000000005",
-                    "digest": "7FDKFZKceck6AxmF5xeMK4EckmhHfrH3uHadHmoXHiti"
+                    "digest": "6rnrYMn8qAXCD3Abcapm2EgtjZ89hZpwXVQJr8WHT9t5"
                   }
                 },
                 {
@@ -1296,7 +1296,7 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x0000000000000000000000000000000000000000000000000000000000000006",
-                    "digest": "HnEMRhnAJTBKY5Bs9Ttf7TfwQsYpx74Msxm4RfUsGf9j"
+                    "digest": "Gp5z7nY13u5RZtDuFQKtHuqpLAio2UdFkhdrXcPDiDrX"
                   }
                 },
                 {
@@ -1305,7 +1305,7 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x0000000000000000000000000000000000000000000000000000000000000008",
-                    "digest": "GsUwMPdSsvukXKNtgsCXX5eX6PQUHDcRBs8cfAzE42u9"
+                    "digest": "HWJ8Zmc31gssueLEKhoE4Ygv6x1GvEXTKdxsdZxdyDnP"
                   }
                 },
                 {
@@ -1314,7 +1314,7 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x000000000000000000000000000000000000000000000000000000000000000b",
-                    "digest": "8Dup19gmKiRuUc53Eh9sniHMjbCkboj4XKSkQ1GzbLWa"
+                    "digest": "6BzaTtZsW3NDk1H28As9eaoLEJAtUU2wHNtV4Rb6ecBB"
                   }
                 },
                 {
@@ -1323,7 +1323,7 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x0000000000000000000000000000000000000000000000000000000000000403",
-                    "digest": "siUHSwsqoELCtazBk1VaLMgPcRsTJ982s5vjSFKKhSm"
+                    "digest": "H8pFmNzsvczqqXYXp1sEWvnWWuDjSPw8nHMzxYkguXs1"
                   }
                 },
                 {
@@ -1332,106 +1332,106 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x000000000000000000000000000000000000000000000000000000000000107a",
-                    "digest": "CKJxYaDyWRK7Va9waEu6B595S23GhRrxuPhchvR1Lkmc"
+                    "digest": "Eaqbi9s7j9UyRsnSnaJsXFmjZRJsKCDvsKyeUXu4ve6r"
                   }
                 },
                 {
-                  "address": "0x0ca370d53d314d37a60c552eaa74bad5de28b2b04788a65f9baf5db044f25c49",
+                  "address": "0x1d374b2388178241deedb7e6fc1727e27f25c10d394329b614486faf0bf9cf14",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x0ca370d53d314d37a60c552eaa74bad5de28b2b04788a65f9baf5db044f25c49",
-                    "digest": "ELrW4C23Ud266o1ZUxPZVh9ajxrAtvsburCxP4GcJgcz"
+                    "address": "0x1d374b2388178241deedb7e6fc1727e27f25c10d394329b614486faf0bf9cf14",
+                    "digest": "GZ8xzBNn7Qxzr64sANdqENqcvyBvsXwSWrhNRBCvYPkF"
                   }
                 },
                 {
-                  "address": "0x19ab66c40622ca2999a2308fb9111c1bb547716a10680dcaabaced9c11573641",
+                  "address": "0x2da8747fe6350b4147ffcf8488e97671c13a3f9b1c3f9694f86f0c85c7a6353f",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x19ab66c40622ca2999a2308fb9111c1bb547716a10680dcaabaced9c11573641",
-                    "digest": "4bWifTnxhYCDpE65oEAAfsuHAc17Q8enG8VD7VfczQXv"
+                    "address": "0x2da8747fe6350b4147ffcf8488e97671c13a3f9b1c3f9694f86f0c85c7a6353f",
+                    "digest": "A4XgGGNvymUQcesse4tmB6WCvqAcYKUNKGQpDBqj82Sn"
                   }
                 },
                 {
-                  "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f",
+                  "address": "0x35ac025460b42e6d85fee7a6e37b0200affce71d8b0c35cbc43a03aa8b6c774c",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f",
-                    "digest": "JBDd6Gjr51BN8SLo3LDVPhLAR8ncpHFrbnH8oAy2Uxd3"
+                    "address": "0x35ac025460b42e6d85fee7a6e37b0200affce71d8b0c35cbc43a03aa8b6c774c",
+                    "digest": "CqtUtJZu9cxdXSqfHhBPQvyigA4BhVrhV91S1hM5siYG"
                   }
                 },
                 {
-                  "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2",
+                  "address": "0x52ca6f77a3f1f997e48af6428033ab7bbd0e5db62b3caf940c28f535d8cedd51",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2",
-                    "digest": "7enzmuzCQ3ithH7SaLcGQvAuuTHf8UihGn9yi45cYSTw"
+                    "address": "0x52ca6f77a3f1f997e48af6428033ab7bbd0e5db62b3caf940c28f535d8cedd51",
+                    "digest": "5yuofcVQJP6rzVu9i9Zv8tbuZMF3HZ6ubsb4VQNbxdZa"
                   }
                 },
                 {
-                  "address": "0x7824c1656ba4803fa1a8c65aa463f7c09de734f47967e0b96c5f409aef56d3e2",
+                  "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x7824c1656ba4803fa1a8c65aa463f7c09de734f47967e0b96c5f409aef56d3e2",
-                    "digest": "8rsaeQm5puatrV9hRkxjcao6YM7Vr4UC25fdFSqAR9K6"
+                    "address": "0x5a6383eb592bab4ff7c037a2118c514149ba9a86cf5a3b019c7034686365183f",
+                    "digest": "EpKiYNrMK5G3nYvmzQ9e5Q94zCLbGHi3zUJgVRXRfYn9"
                   }
                 },
                 {
-                  "address": "0x84c9a12296be175e98b5364aa5b7a41b47787def054ff96d9ad6138815ffd31c",
+                  "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x84c9a12296be175e98b5364aa5b7a41b47787def054ff96d9ad6138815ffd31c",
-                    "digest": "6tsDB9sYSnpXce4QqKjHvgp7kigAqztaAjoJiw2C9Aqq"
+                    "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2",
+                    "digest": "D4QStVhLnUvKjbRc8d3NVFULK7Rc1wezTLj2LGju8zhs"
                   }
                 },
                 {
-                  "address": "0x92e176f0a5af3b6158b54b3c86a024490f609b4bb469c4f453b2c3d81682f400",
+                  "address": "0x7a96da86a0ce7795c9e036e93db26dc4c6a3d87d2bb59396c25e261cf8c985ae",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0x92e176f0a5af3b6158b54b3c86a024490f609b4bb469c4f453b2c3d81682f400",
-                    "digest": "5s5huBUuDJ7KAthLvCXowws61uJhnv8hp9TYSz1SF3Ds"
+                    "address": "0x7a96da86a0ce7795c9e036e93db26dc4c6a3d87d2bb59396c25e261cf8c985ae",
+                    "digest": "58UyLyJEaEnw8Mxik5BfcgLDVCXV76yM6fR2rC3asMsT"
                   }
                 },
                 {
-                  "address": "0xbd145529aeb51f47417e9e41eaa1a05bab36796cf9a98454485a656cecf2bc82",
+                  "address": "0x9c4468be862acb4b396c6a96c41a5d44168e92bad427d23ade2b365c4d0342fa",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0xbd145529aeb51f47417e9e41eaa1a05bab36796cf9a98454485a656cecf2bc82",
-                    "digest": "J4Lt8oHPX1Uuw4YN4eW96fU6SG4qGH9DUDxxkQ6Rody2"
+                    "address": "0x9c4468be862acb4b396c6a96c41a5d44168e92bad427d23ade2b365c4d0342fa",
+                    "digest": "HqJCkhWuVWJrKDH91kCjpjk2zG2K91SAyAkdYoUxTVys"
                   }
                 },
                 {
-                  "address": "0xc9544753fce6181d2193fad8c4d64919a70dc7dde57446ee716fb24c414594f0",
+                  "address": "0xa63010b93d31c3ae2c27903c7f4d9718bf917aaf6f2520925aa4a5da0cf0dcb0",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0xc9544753fce6181d2193fad8c4d64919a70dc7dde57446ee716fb24c414594f0",
-                    "digest": "AuUEqY6mbzRuUxmVZAnmpovu7uAcV9r4y6c12wbyAdYL"
+                    "address": "0xa63010b93d31c3ae2c27903c7f4d9718bf917aaf6f2520925aa4a5da0cf0dcb0",
+                    "digest": "BqgrY1VVv7rheFGwUgixcdtM2vbMaPxsuKZfaQWuZTVh"
                   }
                 },
                 {
-                  "address": "0xcf3a6620131a625ddf3ba1446ad827508b809bd210aca8d8351d134339622c5d",
+                  "address": "0xe385e8c7898861f3a60d3f9806e89b204757cee320e02faf0aa341622ecf9c07",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0xcf3a6620131a625ddf3ba1446ad827508b809bd210aca8d8351d134339622c5d",
-                    "digest": "5PztXDWAHp7XSBFEVr3vWftqvrkhFzcVnJX8QSf11vZN"
+                    "address": "0xe385e8c7898861f3a60d3f9806e89b204757cee320e02faf0aa341622ecf9c07",
+                    "digest": "DYAuGuAgqSZ7srmpcuFLWbHdzc613fjjBKXThma4MTwi"
                   }
                 },
                 {
-                  "address": "0xfb80af4784e2346ff2b17c1ab41c34accf15da72bcaa0202347e96e9614692ac",
+                  "address": "0xe7597ac5ed82f4205bfdb093ad2c7c77d28eda56ef23ac930b4938283f26beb0",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
-                    "address": "0xfb80af4784e2346ff2b17c1ab41c34accf15da72bcaa0202347e96e9614692ac",
-                    "digest": "Hk4SpKWiMaDHphMphU15n3wHJUdZbBGGU9QjAcy3iEgs"
+                    "address": "0xe7597ac5ed82f4205bfdb093ad2c7c77d28eda56ef23ac930b4938283f26beb0",
+                    "digest": "35SRHoyvsjDZcG7rjEkYtofmd9wjv48b9KwJYrux31H5"
                   }
                 }
               ]
@@ -1453,7 +1453,7 @@ Response: {
               "sequenceNumber": 0
             },
             "transactionBlock": {
-              "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
+              "digest": "A47B3FAttYy3F2YU1xp9uiMPHw7D8VAaf46hNRuDBEKj"
             }
           },
           "expiration": null
@@ -1505,7 +1505,7 @@ Response: {
             "dependencies": {
               "nodes": [
                 {
-                  "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
+                  "digest": "A47B3FAttYy3F2YU1xp9uiMPHw7D8VAaf46hNRuDBEKj"
                 }
               ]
             },
@@ -1605,7 +1605,7 @@ Response: {
             "dependencies": {
               "nodes": [
                 {
-                  "digest": "DgrEGWShZE7oN3nbcAQGrGo9JKzQt8fbsYcUGg6vJvKV"
+                  "digest": "A47B3FAttYy3F2YU1xp9uiMPHw7D8VAaf46hNRuDBEKj"
                 }
               ]
             },
@@ -1623,22 +1623,13 @@ Response: {
                     "digest": "Do9BxST2vAmc7ZRsxohXXg5S3QLzmgUYYQnP2ejXtP93"
                   }
                 },
-                {
-                  "address": "0x3a69e1bb454153b51392ff79244336e7ae899a1d2dad79f0b42c4fac2a101136",
-                  "idCreated": true,
-                  "idDeleted": false,
-                  "outputState": {
-                    "address": "0x3a69e1bb454153b51392ff79244336e7ae899a1d2dad79f0b42c4fac2a101136",
-                    "digest": "D1Y1Jn2RRL237YSrVGT5xhP2bM8SuQobSahg85jwNtee"
-                  }
-                },
                 {
                   "address": "0x4509fa198370254af0418248c9718bb206e810e1bce9fc8ffd0c500aef972f4d",
                   "idCreated": true,
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x4509fa198370254af0418248c9718bb206e810e1bce9fc8ffd0c500aef972f4d",
-                    "digest": "4bQjJGGLQX2bufG22m3hFYeiM7Y5RuMgF1CTeLdxvQES"
+                    "digest": "HrsNiAMHZR19VR1QZiA6TFUykuvkJNnDbRBbwT84YpLp"
                   }
                 },
                 {
@@ -1647,7 +1638,16 @@ Response: {
                   "idDeleted": false,
                   "outputState": {
                     "address": "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2",
-                    "digest": "FTLRpX3Lki5326Y265NpgZbTGiSu75bCMHoxPhwDHavd"
+                    "digest": "4djXwCeBNeRBWfjoRd1aAY4sJ7ozbDfyQVyvwxC5TD1m"
+                  }
+                },
+                {
+                  "address": "0xebf30a2e1b16f55fffb5ee6bac392da81d6dd66242d03d7465fd6eb0b6fa8664",
+                  "idCreated": true,
+                  "idDeleted": false,
+                  "outputState": {
+                    "address": "0xebf30a2e1b16f55fffb5ee6bac392da81d6dd66242d03d7465fd6eb0b6fa8664",
+                    "digest": "3aANSDLVrDZApaoswGbTrTuhGvspix26DgExPqkZHysT"
                   }
                 }
               ]
diff --git a/crates/iota-graphql-rpc-client/Cargo.toml b/crates/iota-graphql-rpc-client/Cargo.toml
index 0e2c3c4fdae..9e255bcb29c 100644
--- a/crates/iota-graphql-rpc-client/Cargo.toml
+++ b/crates/iota-graphql-rpc-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-graphql-rpc-client"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-graphql-rpc-headers/Cargo.toml b/crates/iota-graphql-rpc-headers/Cargo.toml
index b868c1c6ccd..5e534bb0975 100644
--- a/crates/iota-graphql-rpc-headers/Cargo.toml
+++ b/crates/iota-graphql-rpc-headers/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-graphql-rpc-headers"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-graphql-rpc/Cargo.toml b/crates/iota-graphql-rpc/Cargo.toml
index 5cdddb177de..4e8b5b27650 100644
--- a/crates/iota-graphql-rpc/Cargo.toml
+++ b/crates/iota-graphql-rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-graphql-rpc"
-version = "2024.7.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-indexer-builder/Cargo.toml b/crates/iota-indexer-builder/Cargo.toml
index 095bbce7bae..1b12d82425f 100644
--- a/crates/iota-indexer-builder/Cargo.toml
+++ b/crates/iota-indexer-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-indexer-builder"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-indexer/README.md b/crates/iota-indexer/README.md
index 9be0c5185bc..d59cb3e2183 100644
--- a/crates/iota-indexer/README.md
+++ b/crates/iota-indexer/README.md
@@ -6,7 +6,7 @@ IOTA Indexer is an off-fullnode service to serve data from the IOTA protocol, in
 
 > [!NOTE]
 >
-> - Indexer sync workers require the `NodeConfig::enable_experimental_rest_api` flag set to `true` in the node
+> - Indexer sync workers require the `NodeConfig::enable_rest_api` flag set to `true` in the node
 > - Fullnodes expose read and transaction execution JSON-RPC APIs. Hence, transactions can be executed through fullnodes.
 > - Validators expose only read-only JSON-RPC APIs.
 > - Indexer instances expose read, write and extended JSON-RPC APIs.
diff --git a/crates/iota-indexer/src/main.rs b/crates/iota-indexer/src/main.rs
index 6336bc67602..791b16a5469 100644
--- a/crates/iota-indexer/src/main.rs
+++ b/crates/iota-indexer/src/main.rs
@@ -19,7 +19,7 @@ async fn main() -> Result<(), IndexerError> {
     let mut indexer_config = IndexerConfig::parse();
     // TODO: Explore other options as in upstream.
     // For the moment we only use the fullnode for fetching checkpoints
-    indexer_config.remote_store_url = Some(format!("{}/rest", indexer_config.rpc_client_url));
+    indexer_config.remote_store_url = Some(format!("{}/api/v1", indexer_config.rpc_client_url));
     info!("Parsed indexer config: {:#?}", indexer_config);
     let (_registry_service, registry) = start_prometheus_server(
         // NOTE: this parses the input host addr and port number for socket addr,
diff --git a/crates/iota-json-rpc-api/Cargo.toml b/crates/iota-json-rpc-api/Cargo.toml
index 1075408aff0..7bec4ba6e6c 100644
--- a/crates/iota-json-rpc-api/Cargo.toml
+++ b/crates/iota-json-rpc-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-json-rpc-api"
-version = "0.0.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-json-rpc-tests/Cargo.toml b/crates/iota-json-rpc-tests/Cargo.toml
index 58eff438d68..27426da9f8f 100644
--- a/crates/iota-json-rpc-tests/Cargo.toml
+++ b/crates/iota-json-rpc-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-json-rpc-tests"
-version = "0.0.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -33,6 +33,7 @@ iota-json-rpc-api.workspace = true
 iota-json-rpc-types.workspace = true
 iota-keys.workspace = true
 iota-macros.workspace = true
+iota-metrics.workspace = true
 iota-move-build.workspace = true
 iota-open-rpc.workspace = true
 iota-open-rpc-macros.workspace = true
diff --git a/crates/iota-json-rpc-tests/tests/move_utils.rs b/crates/iota-json-rpc-tests/tests/move_utils.rs
index 76717adcd88..aa5a3f947a3 100644
--- a/crates/iota-json-rpc-tests/tests/move_utils.rs
+++ b/crates/iota-json-rpc-tests/tests/move_utils.rs
@@ -54,7 +54,6 @@ async fn get_normalized_move_modules_by_package() -> Result<(), anyhow::Error> {
             "kiosk_extension",
             "labeler",
             "linked_table",
-            "math",
             "object",
             "object_bag",
             "object_table",
@@ -132,7 +131,6 @@ async fn get_normalized_move_module() -> Result<(), anyhow::Error> {
         [
             "Coin",
             "CoinMetadata",
-            "CurrencyCreated",
             "DenyCapV1",
             "RegulatedCoinMetadata",
             "TreasuryCap",
@@ -176,7 +174,6 @@ async fn get_normalized_move_module() -> Result<(), anyhow::Error> {
             "mint_balance",
             "put",
             "split",
-            "supply",
             "supply_immut",
             "supply_mut",
             "take",
diff --git a/crates/iota-json-rpc-types/Cargo.toml b/crates/iota-json-rpc-types/Cargo.toml
index 364acf02a42..0ed71ce6863 100644
--- a/crates/iota-json-rpc-types/Cargo.toml
+++ b/crates/iota-json-rpc-types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-json-rpc-types"
-version = "0.0.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-json-rpc-types/src/iota_transaction.rs b/crates/iota-json-rpc-types/src/iota_transaction.rs
index af0cdca061b..23e4cdfc8c0 100644
--- a/crates/iota-json-rpc-types/src/iota_transaction.rs
+++ b/crates/iota-json-rpc-types/src/iota_transaction.rs
@@ -184,14 +184,6 @@ impl IotaTransactionBlockResponseOptions {
         }
     }
 
-    #[deprecated(
-        since = "1.33.0",
-        note = "Balance and object changes no longer require local execution"
-    )]
-    pub fn require_local_execution(&self) -> bool {
-        self.show_balance_changes || self.show_object_changes
-    }
-
     pub fn require_input(&self) -> bool {
         self.show_input || self.show_raw_input || self.show_object_changes
     }
diff --git a/crates/iota-json-rpc/Cargo.toml b/crates/iota-json-rpc/Cargo.toml
index 538552407eb..59f00a802b4 100644
--- a/crates/iota-json-rpc/Cargo.toml
+++ b/crates/iota-json-rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-json-rpc"
-version = "0.0.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-json/Cargo.toml b/crates/iota-json/Cargo.toml
index dbb3d323f8f..b1c4d4cda25 100644
--- a/crates/iota-json/Cargo.toml
+++ b/crates/iota-json/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-json"
-version = "0.0.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-keys/Cargo.toml b/crates/iota-keys/Cargo.toml
index d8aa7d381a5..d7a76664418 100644
--- a/crates/iota-keys/Cargo.toml
+++ b/crates/iota-keys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-keys"
-version = "0.0.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-light-client/Cargo.toml b/crates/iota-light-client/Cargo.toml
index 0def8e35755..9d318e928ca 100644
--- a/crates/iota-light-client/Cargo.toml
+++ b/crates/iota-light-client/Cargo.toml
@@ -11,7 +11,7 @@ path = "src/lib.rs"
 
 [[bin]]
 name = "iota-light-client"
-path = "src/main.rs"
+path = "src/bin/light_client.rs"
 
 [dependencies]
 # external dependencies
diff --git a/crates/iota-light-client/example_config/528.chk b/crates/iota-light-client/example_config/528.chk
deleted file mode 100644
index 80f0fc681b2..00000000000
Binary files a/crates/iota-light-client/example_config/528.chk and /dev/null differ
diff --git a/crates/iota-light-client/example_config/532.chk b/crates/iota-light-client/example_config/532.chk
new file mode 100644
index 00000000000..be1c182f162
Binary files /dev/null and b/crates/iota-light-client/example_config/532.chk differ
diff --git a/crates/iota-light-client/example_config/794.json b/crates/iota-light-client/example_config/532.json
similarity index 61%
rename from crates/iota-light-client/example_config/794.json
rename to crates/iota-light-client/example_config/532.json
index b679df4679b..ce2a2fb8831 100644
--- a/crates/iota-light-client/example_config/794.json
+++ b/crates/iota-light-client/example_config/532.json
@@ -1,50 +1,46 @@
 {
   "data": {
-    "epoch": 2,
-    "sequence_number": 794,
-    "network_total_transactions": 3462,
-    "content_digest": "AkKefNxm11SDHcgh8CvwhwaopKZkoYuXdx2C8mAPQPg3",
-    "previous_digest": "9a5ay9zMmg1bkyjV4HDcsgvj1Qi5hdnoyb7qzDdsE9rN",
+    "epoch": 1,
+    "sequence_number": 532,
+    "network_total_transactions": 2332,
+    "content_digest": "2tKPsa73Wd5LTzLKUE13GCsM9dekswsGtq4hFdsG1WGb",
+    "previous_digest": "6yZrXpcw5B5zwEoZK5TRHoJBDJu6GjYKzqpbaVdpc8j5",
     "epoch_rolling_gas_cost_summary": {
-      "computationCost": "2000000",
-      "storageCost": "48092800",
-      "storageRebate": "50198000",
+      "computationCost": "0",
+      "storageCost": "0",
+      "storageRebate": "0",
       "nonRefundableStorageFee": "0"
     },
-    "timestamp_ms": 1729529187939,
+    "timestamp_ms": 1730201217234,
     "checkpoint_commitments": [],
     "end_of_epoch_data": {
       "nextEpochCommittee": [
         [
           "jc/20VUECmVvSBmxMRG1LFdGqGunLzlfuv4uw4R9HoFA5iSnUf32tfIFC8cgXPnTAATJCwx0Cv/TJs5nPMKyOi0k1T4q/rKG38Zo/UBgCJ1tKxe3md02+Q0zLlSnozjU",
-          "2000"
+          "2500"
         ],
         [
           "mfJe9h+AMrkUY2RgmCxcxvE07x3a52ZX8sv+wev8jQlzdAgN9vzw3Li8Sw2OCvXYDrv/K0xZn1T0LWMS38MUJ2B4wcw0fru+xRmL4lhRPzhrkw0CwnSagD4jMJVevRoQ",
-          "2000"
-        ],
-        [
-          "pT5rnJ7YVGCXSDx/GLJ4hC4IadI0ZIl1MPIncR5dXA/nRmoYxt91nufZW0HTMyNZC/g69Ol2pAYAEoqXWOXzJmzB/pVRnLYxtUpuW/M0PKpiErWwf4WkzmhsNU1ezdzS",
-          "2000"
+          "2500"
         ],
         [
           "rd7vlNiYyI5A297/kcXxBfnPLHR/tvK8N+wD1ske2y4aV4z1RL6LCTHiXyQ9WbDDDZihbOO6HWzx1/UEJpkusK2zE0sFW+gUDS218l+wDYP45CIr8B/WrJOh/0152ljy",
-          "2000"
+          "2500"
         ],
         [
           "s/1e+1yHJAOkrRPxGZUTYG0jNUqEUkmuoVdWTCP/PBXGyeZSty10DoysuTy8wGhrDsDMDBx2C/tCtDZRn8WoBUt2UzqXqfI5h9CX75ax8lJrsgc/oQp3GZQXcjR+8nT0",
-          "2000"
+          "2500"
         ]
       ],
       "nextEpochProtocolVersion": "1",
       "epochCommitments": [
         {
           "ECMHLiveObjectSetDigest": {
-            "digest": "5w6pMAo5Wn3d2xJ3FFWdQK4nxJ1NX5v3LWCeyYNDZ257"
+            "digest": "Cx7QDKwottqp4bs2eP5pL4XApGvopmXB1KmpYAZY1Gf5"
           }
         }
       ],
-      "epochSupplyChange": 766999998000000
+      "epochSupplyChange": 767000000000000
     },
     "version_specific_data": [
       0,
@@ -52,8 +48,8 @@
     ]
   },
   "auth_signature": {
-    "epoch": 2,
-    "signature": "l/H0Y90spi0zenoiKKreyirHy/xVVogwTmwqeOvQBj7/CgSC0NTAzgPYHdvdwFJC",
+    "epoch": 1,
+    "signature": "tx6eEhYvWH0wOk2yiuZmpzelWbIRLpVz4D8IN5iz1HVeQXClzEqVSlgQpnAkDMil",
     "signers_map": [
       58,
       48,
@@ -71,7 +67,7 @@
       0,
       0,
       0,
-      0,
+      1,
       0,
       2,
       0,
diff --git a/crates/iota-light-client/example_config/794_full.json b/crates/iota-light-client/example_config/532_full.json
similarity index 72%
rename from crates/iota-light-client/example_config/794_full.json
rename to crates/iota-light-client/example_config/532_full.json
index d2cf9e0afe9..e5cc2b4a22a 100644
--- a/crates/iota-light-client/example_config/794_full.json
+++ b/crates/iota-light-client/example_config/532_full.json
@@ -1,51 +1,47 @@
 {
   "checkpoint_summary": {
     "data": {
-      "epoch": 2,
-      "sequence_number": 794,
-      "network_total_transactions": 3462,
-      "content_digest": "AkKefNxm11SDHcgh8CvwhwaopKZkoYuXdx2C8mAPQPg3",
-      "previous_digest": "9a5ay9zMmg1bkyjV4HDcsgvj1Qi5hdnoyb7qzDdsE9rN",
+      "epoch": 1,
+      "sequence_number": 532,
+      "network_total_transactions": 2332,
+      "content_digest": "2tKPsa73Wd5LTzLKUE13GCsM9dekswsGtq4hFdsG1WGb",
+      "previous_digest": "6yZrXpcw5B5zwEoZK5TRHoJBDJu6GjYKzqpbaVdpc8j5",
       "epoch_rolling_gas_cost_summary": {
-        "computationCost": "2000000",
-        "storageCost": "48092800",
-        "storageRebate": "50198000",
+        "computationCost": "0",
+        "storageCost": "0",
+        "storageRebate": "0",
         "nonRefundableStorageFee": "0"
       },
-      "timestamp_ms": 1729529187939,
+      "timestamp_ms": 1730201217234,
       "checkpoint_commitments": [],
       "end_of_epoch_data": {
         "nextEpochCommittee": [
           [
             "jc/20VUECmVvSBmxMRG1LFdGqGunLzlfuv4uw4R9HoFA5iSnUf32tfIFC8cgXPnTAATJCwx0Cv/TJs5nPMKyOi0k1T4q/rKG38Zo/UBgCJ1tKxe3md02+Q0zLlSnozjU",
-            "2000"
+            "2500"
           ],
           [
             "mfJe9h+AMrkUY2RgmCxcxvE07x3a52ZX8sv+wev8jQlzdAgN9vzw3Li8Sw2OCvXYDrv/K0xZn1T0LWMS38MUJ2B4wcw0fru+xRmL4lhRPzhrkw0CwnSagD4jMJVevRoQ",
-            "2000"
-          ],
-          [
-            "pT5rnJ7YVGCXSDx/GLJ4hC4IadI0ZIl1MPIncR5dXA/nRmoYxt91nufZW0HTMyNZC/g69Ol2pAYAEoqXWOXzJmzB/pVRnLYxtUpuW/M0PKpiErWwf4WkzmhsNU1ezdzS",
-            "2000"
+            "2500"
           ],
           [
             "rd7vlNiYyI5A297/kcXxBfnPLHR/tvK8N+wD1ske2y4aV4z1RL6LCTHiXyQ9WbDDDZihbOO6HWzx1/UEJpkusK2zE0sFW+gUDS218l+wDYP45CIr8B/WrJOh/0152ljy",
-            "2000"
+            "2500"
           ],
           [
             "s/1e+1yHJAOkrRPxGZUTYG0jNUqEUkmuoVdWTCP/PBXGyeZSty10DoysuTy8wGhrDsDMDBx2C/tCtDZRn8WoBUt2UzqXqfI5h9CX75ax8lJrsgc/oQp3GZQXcjR+8nT0",
-            "2000"
+            "2500"
           ]
         ],
         "nextEpochProtocolVersion": "1",
         "epochCommitments": [
           {
             "ECMHLiveObjectSetDigest": {
-              "digest": "5w6pMAo5Wn3d2xJ3FFWdQK4nxJ1NX5v3LWCeyYNDZ257"
+              "digest": "Cx7QDKwottqp4bs2eP5pL4XApGvopmXB1KmpYAZY1Gf5"
             }
           }
         ],
-        "epochSupplyChange": 766999998000000
+        "epochSupplyChange": 767000000000000
       },
       "version_specific_data": [
         0,
@@ -53,8 +49,8 @@
       ]
     },
     "auth_signature": {
-      "epoch": 2,
-      "signature": "l/H0Y90spi0zenoiKKreyirHy/xVVogwTmwqeOvQBj7/CgSC0NTAzgPYHdvdwFJC",
+      "epoch": 1,
+      "signature": "tx6eEhYvWH0wOk2yiuZmpzelWbIRLpVz4D8IN5iz1HVeQXClzEqVSlgQpnAkDMil",
       "signers_map": [
         58,
         48,
@@ -72,7 +68,7 @@
         0,
         0,
         0,
-        0,
+        1,
         0,
         2,
         0,
@@ -85,12 +81,12 @@
     "V1": {
       "transactions": [
         {
-          "transaction": "9AoR24Tcmss7K3DgBZYiUZNxHFuk8kdAbZEMcFe9mcAi",
-          "effects": "FKwupJzjb3Fivepci1CQ6P3woNhNM1X1hTTJbC4FVwH7"
+          "transaction": "23TybmpYcTxZ76cHK3WnyVZhcmjjH7PnpZfMLvEeaG2U",
+          "effects": "77cTGQ5A97R1kNCqxBXJEyviz6eJJV6GKMtXRh6ZEXfu"
         },
         {
-          "transaction": "93PPEMeHQJUoVDVpEyTAEsyByUjrQTs4SPhSgM2wyfy6",
-          "effects": "FSBWiogP3yZEvMWDwqFpnL6wBo8jgVrcx5TLJ8Wc2iE4"
+          "transaction": "326n9ZcQDrJVxyFL8aWkknSmFahVxwpqZQ5q5ySmWrUy",
+          "effects": "3heGnAzfkz3DcoBMVUh5T6RhNtoUJ6MM5nCuk45u6vfw"
         }
       ],
       "user_signatures": [
@@ -116,11 +112,11 @@
                 "V1": {
                   "kind": {
                     "ConsensusCommitPrologueV1": {
-                      "epoch": 2,
-                      "round": 1055,
+                      "epoch": 1,
+                      "round": 1058,
                       "sub_dag_index": null,
-                      "commit_timestamp_ms": 1729529187939,
-                      "consensus_commit_digest": "Ctg6sCr2iUJ2xCM5UvnMqUHcoX47AYrpJ1Bz6tcYHkRd",
+                      "commit_timestamp_ms": 1730201217234,
+                      "consensus_commit_digest": "4gKnNQLRsxwGyXvXtT4UvufbV6TRhfqWm5HpLn4ayQ3V",
                       "consensus_determined_version_assignments": {
                         "CancelledTransactions": []
                       }
@@ -151,22 +147,22 @@
         "auth_signature": {}
       },
       "effects": {
-        "V2": {
+        "V1": {
           "status": "Success",
-          "executed_epoch": 2,
+          "executed_epoch": 1,
           "gas_used": {
             "computationCost": "0",
             "storageCost": "0",
             "storageRebate": "0",
             "nonRefundableStorageFee": "0"
           },
-          "transaction_digest": "9AoR24Tcmss7K3DgBZYiUZNxHFuk8kdAbZEMcFe9mcAi",
+          "transaction_digest": "23TybmpYcTxZ76cHK3WnyVZhcmjjH7PnpZfMLvEeaG2U",
           "gas_object_index": null,
           "events_digest": null,
           "dependencies": [
-            "D5DhLqEFyptecwzoQ9nYjxyz5eE4TgYAMaBAYZRu9vYL"
+            "HViuzxiXGNhxBy9yrWoTSS1d7YNJcZBkGi7UhBoYN8CK"
           ],
-          "lamport_version": 3126,
+          "lamport_version": 2112,
           "changed_objects": [
             [
               "0x0000000000000000000000000000000000000000000000000000000000000006",
@@ -174,8 +170,8 @@
                 "input_state": {
                   "Exist": [
                     [
-                      3125,
-                      "HsHd4Lg7UPUuQ8Fn82bu7U6zc6WXmYEG1gQSnpVc6egP"
+                      2111,
+                      "3bfq3QcfkrPWos8abZYhtp4unj2e5H8RWiSFae6RWb7S"
                     ],
                     {
                       "Shared": {
@@ -186,7 +182,7 @@
                 },
                 "output_state": {
                   "ObjectWrite": [
-                    "CkH6FUhb1zNsLqwoSRTcoK6R6aCkzUBZuVBpCK7ju8zY",
+                    "BdMXkcFA1K7j3aGkNq5sop1sGfHhLjjsBYXEAhsU9AHi",
                     {
                       "Shared": {
                         "initial_shared_version": 1
@@ -216,7 +212,7 @@
                 }
               },
               "has_public_transfer": false,
-              "version": 3125,
+              "version": 2111,
               "contents": [
                 0,
                 0,
@@ -250,10 +246,10 @@
                 0,
                 0,
                 6,
-                45,
-                14,
-                249,
-                175,
+                152,
+                104,
+                7,
+                216,
                 146,
                 1,
                 0,
@@ -266,7 +262,7 @@
               "initial_shared_version": 1
             }
           },
-          "previous_transaction": "D5DhLqEFyptecwzoQ9nYjxyz5eE4TgYAMaBAYZRu9vYL",
+          "previous_transaction": "HViuzxiXGNhxBy9yrWoTSS1d7YNJcZBkGi7UhBoYN8CK",
           "storage_rebate": 0
         }
       ],
@@ -283,7 +279,7 @@
                 }
               },
               "has_public_transfer": false,
-              "version": 3126,
+              "version": 2112,
               "contents": [
                 0,
                 0,
@@ -317,10 +313,10 @@
                 0,
                 0,
                 6,
-                99,
-                14,
-                249,
-                175,
+                210,
+                104,
+                7,
+                216,
                 146,
                 1,
                 0,
@@ -333,7 +329,7 @@
               "initial_shared_version": 1
             }
           },
-          "previous_transaction": "9AoR24Tcmss7K3DgBZYiUZNxHFuk8kdAbZEMcFe9mcAi",
+          "previous_transaction": "23TybmpYcTxZ76cHK3WnyVZhcmjjH7PnpZfMLvEeaG2U",
           "storage_rebate": 0
         }
       ]
@@ -354,13 +350,13 @@
                     "EndOfEpochTransaction": [
                       {
                         "ChangeEpoch": {
-                          "epoch": 3,
+                          "epoch": 2,
                           "protocol_version": 1,
-                          "storage_charge": 48092800,
-                          "computation_charge": 2000000,
-                          "storage_rebate": 50198000,
+                          "storage_charge": 0,
+                          "computation_charge": 0,
+                          "storage_rebate": 0,
                           "non_refundable_storage_fee": 0,
-                          "epoch_start_timestamp_ms": 1729529187939,
+                          "epoch_start_timestamp_ms": 1730201217234,
                           "system_packages": []
                         }
                       }
@@ -391,22 +387,22 @@
         "auth_signature": {}
       },
       "effects": {
-        "V2": {
+        "V1": {
           "status": "Success",
-          "executed_epoch": 2,
+          "executed_epoch": 1,
           "gas_used": {
             "computationCost": "0",
             "storageCost": "0",
             "storageRebate": "0",
             "nonRefundableStorageFee": "0"
           },
-          "transaction_digest": "93PPEMeHQJUoVDVpEyTAEsyByUjrQTs4SPhSgM2wyfy6",
+          "transaction_digest": "326n9ZcQDrJVxyFL8aWkknSmFahVxwpqZQ5q5ySmWrUy",
           "gas_object_index": null,
-          "events_digest": "Bpcus8FBAfcoZZY23WtBaS6ZgDzQMV9hHgNo727qZdZZ",
+          "events_digest": "62T8x8JxJ1wmGNoNKnmboPNFPN19vfqZeupbQ5NQpCDH",
           "dependencies": [
-            "7D8EoGyF5bEHXCwfBJUZ6cJBbkFs7Fvzy9UY2jL6WXGm"
+            "8eZxmVup35tyyVdZ31sKB9av3iNMKuJrxZ8ouJ4SRWtu"
           ],
-          "lamport_version": 7,
+          "lamport_version": 3,
           "changed_objects": [
             [
               "0x0000000000000000000000000000000000000000000000000000000000000005",
@@ -414,8 +410,8 @@
                 "input_state": {
                   "Exist": [
                     [
-                      6,
-                      "H2wKv6r33AVUm6KPfqMpabz6S5QVKcyMFNXfBN6btEcM"
+                      2,
+                      "EYoEn9QcWfA3rxFQdSGSaouNXj2D21tGvWM7ctmBhqyo"
                     ],
                     {
                       "Shared": {
@@ -426,7 +422,7 @@
                 },
                 "output_state": {
                   "ObjectWrite": [
-                    "AikaXNgdX4Ypvzoq1yXzfBGTwXsdwf3VDmWVTRuEod5",
+                    "5KJjRy2WknTpWbU9Nr5Z9AVRyFErsJMi228npzNXksGN",
                     {
                       "Shared": {
                         "initial_shared_version": 1
@@ -438,14 +434,14 @@
               }
             ],
             [
-              "0x1c7f007323d0e7f799c61af86124f0463dd0367770538d6b272054c2fd5ecd85",
+              "0x0ff024c8e20d71bc9762bd852772536512584460b920ec9235a6651a4305faeb",
               {
                 "input_state": "NotExist",
                 "output_state": {
                   "ObjectWrite": [
-                    "2rmhsb9iB9WAn8YpvPcV4d2rhmDNYxDEn7mi5bYkuMwr",
+                    "7Xz4Bp4cqfdYB2zBM7XZyJBHfWMdexT4e4eAacrZYa1D",
                     {
-                      "ObjectOwner": "0x7b94ac5bbd010c6a775455e3df1b6c9a8d24a9f6c2a9c20255b872b812fdbf87"
+                      "AddressOwner": "0x2db19ce7b296633e49f48e863c2b08d5ea0a885273bfa574e2db0a85ece225e5"
                     }
                   ]
                 },
@@ -453,14 +449,14 @@
               }
             ],
             [
-              "0x33f9942f1cc7744ab6e291685e570ce2f93666984211836cb3c1ffab69f29a16",
+              "0x28ca70d96d6d9ccd8719332ebbde3fb0485d1559920d852609cba643bd113c35",
               {
                 "input_state": "NotExist",
                 "output_state": {
                   "ObjectWrite": [
-                    "8FKgB1nNtbGvYUJ6YpveA5TpLubfQwKAf1xw1XG4frE2",
+                    "5ZzaULPNAAfMrR8rA9Vv34dp2wkQ6VqNBjcCx55hfwSA",
                     {
-                      "ObjectOwner": "0x3f6b931f79fd0b2a14ed76a5b23714344c421f99a2ccd1978ef2270e167614cc"
+                      "AddressOwner": "0x3bfb34ad6f452c61add36979ce9308a507f4ca7749817ba5a19a57d4ff2cd53f"
                     }
                   ]
                 },
@@ -468,14 +464,14 @@
               }
             ],
             [
-              "0x44525ac88ee91773ee91aefaa51407ae62b2b97fbb2ec198881f6d125b564467",
+              "0x37b6a35be5fd952c828961ceb90d1c8c5aa6c78c2803540773ea898af97c0edd",
               {
                 "input_state": "NotExist",
                 "output_state": {
                   "ObjectWrite": [
-                    "CYqtEAVGmTs9TWo5UjAuwiV982TLJ6QF3Asv19Lsyvv6",
+                    "5zQUpRzN7FhVaNdBcBziTHh9tdiQQGYiYhpfCDfgLZbS",
                     {
-                      "AddressOwner": "0x98346c29a0a99b9d0a80c9ede37a77c7fd93ead295fdb01b895ef1392c5087b5"
+                      "ObjectOwner": "0x3c32b42be3a2db1d7ddd51c85375127ff6aefb276834193e469e01e25d48f555"
                     }
                   ]
                 },
@@ -483,31 +479,13 @@
               }
             ],
             [
-              "0x4acf88b2d557b8333e02206bfce6d03b8268ade48cdd0236a6d0d0cbf495d74b",
-              {
-                "input_state": {
-                  "Exist": [
-                    [
-                      6,
-                      "8beTs5mn1WLkSKzqEoGMdzVDL5Jf8nkxoxp3LSzDnejz"
-                    ],
-                    {
-                      "ObjectOwner": "0x5900861dc05e16e4230f67df667da400b6f1ad94734c0c86ffc87315c9d81dd5"
-                    }
-                  ]
-                },
-                "output_state": "NotExist",
-                "id_operation": "Deleted"
-              }
-            ],
-            [
-              "0x5b890eaf2abcfa2ab90b77b8e6f3d5d8609586c3e583baf3dccd5af17edf48d1",
+              "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2",
               {
                 "input_state": {
                   "Exist": [
                     [
-                      6,
-                      "4NGemPTVSByE4Lxp8f8ovmciyF5Cxv9GrPHMNVUWS45q"
+                      2,
+                      "BiBPtr9KpWGrxjeWSFdLWbMCEHjT5TJxocYs6bzkW8dn"
                     ],
                     {
                       "ObjectOwner": "0x0000000000000000000000000000000000000000000000000000000000000005"
@@ -516,7 +494,7 @@
                 },
                 "output_state": {
                   "ObjectWrite": [
-                    "Bu4nkNJDRiizsx4Y7TkKa3m4rnZ6UEsVayDgyY6SfRr8",
+                    "GxfNuA2vW1Zdrj5G289Tdh6HsWdACP89oFniTQuuZfEM",
                     {
                       "ObjectOwner": "0x0000000000000000000000000000000000000000000000000000000000000005"
                     }
@@ -526,14 +504,14 @@
               }
             ],
             [
-              "0x69296bc880090a08cafa6af5a97b9df0ed1f02cb12a811fb51008ebfa4f44b21",
+              "0x8ee75273d26a842889b6af6298184c70aa954955e0a8e4d85fe3eb35fef8eea2",
               {
                 "input_state": "NotExist",
                 "output_state": {
                   "ObjectWrite": [
-                    "ACdmPpGSnRPmLrncELtQh5vhn8FEGPVwuG1vKwCQCqYX",
+                    "BLdGrapxU3yDKCuaNfMnhfUFvE5q9JLFYUrRsvzqeaJT",
                     {
-                      "AddressOwner": "0x48d90f650bf4d87ad129ec47392ec38a8c6c0bb5ea4b6dab610e3a841431ab99"
+                      "ObjectOwner": "0x131c437cac81c9875e4840c5265f232c2b4be1b28becda2d90e308fb722d2889"
                     }
                   ]
                 },
@@ -541,14 +519,14 @@
               }
             ],
             [
-              "0x8bc3e2849d46d85efa5498f38213bc9de90a21e48ec2ffed3e1149daa9cfaee6",
+              "0xba3c6b79e9185ef9be04d56695397a9020301c2978ad56afc9baab620fda1989",
               {
                 "input_state": "NotExist",
                 "output_state": {
                   "ObjectWrite": [
-                    "HDNjbi4wu19gRrgamZnd8fRiymRmCaSSGzR8DsewSn87",
+                    "CczgkG3YpZXaX94wSTqovyhiKxqP1paMrHsezHYBRyv3",
                     {
-                      "ObjectOwner": "0xa4c38f903d9744ca22430baeded1bc37c0ed3d75ce55683e69bd3d1fc40b6730"
+                      "AddressOwner": "0x32482a229f83bace2da4c90b4dd99c8a73063a6a8ddc5bd6cc99ded87064912a"
                     }
                   ]
                 },
@@ -556,14 +534,14 @@
               }
             ],
             [
-              "0xad1fa8864288ead331137a2d74a0cd37454b28ef8f7724ef933bf6da36a74fad",
+              "0xbfe048dd2f0450df5e8647ec18e648a3aea1246992701bc9a851037dc7279298",
               {
                 "input_state": "NotExist",
                 "output_state": {
                   "ObjectWrite": [
-                    "5cSjKfC2Juxm7WJmkygh6HBy2pqV7Q59qyq8eQJZmma2",
+                    "CqjWmJFDEBgijLvHHc6ozHnUJR6c63SDDc3u2D73pjk6",
                     {
-                      "AddressOwner": "0xc7035483b90ae369f3ce48c3971bf58c19417997746c67320c35d154a6425ab7"
+                      "ObjectOwner": "0x791f65cc868cc6ef0bc0ff4028939f10b96270274481cdebf421d647bef00b6e"
                     }
                   ]
                 },
@@ -571,14 +549,14 @@
               }
             ],
             [
-              "0xbaf8c62cceab2a9537145168eb4e45c4ca05491d949774ce7509186a7fd55f64",
+              "0xc13d95c6c09f720c4c667184663093b88898e331e4911dc8077197936f470359",
               {
                 "input_state": "NotExist",
                 "output_state": {
                   "ObjectWrite": [
-                    "A2WLnzxY8u1FEh7yE6MA4c2XNoe8j9V6QppZajh5eN4Z",
+                    "H4XcYS3o3LpVog76LBcyuqzf6L4vHYXFRG8eUHeydS2g",
                     {
-                      "AddressOwner": "0x3282178ff167d02a033e89d1280a1ec25f9dd069a0f1400c244192f1f75cbabc"
+                      "AddressOwner": "0x45e45dbd905642cc2ca9c3cfd1a0a1f9517758e5d98deb676040c49340c8b267"
                     }
                   ]
                 },
@@ -586,29 +564,14 @@
               }
             ],
             [
-              "0xdbc7841f48d68276b0996669907d78068b10f71a0674aceebc454e43dfd99731",
+              "0xfc4360fe27e0682f68fa6cb7286e5d136b36ac6337d12fa2337f912db919e42a",
               {
                 "input_state": "NotExist",
                 "output_state": {
                   "ObjectWrite": [
-                    "J5PRx3Qf5gm7XK3q4KQJSTT1Zup7bunh8S4S6BaJrXK9",
+                    "J2PeXcQtyqshCogHU5p6impsjTTuiUpcKUTh6KkWUgTR",
                     {
-                      "ObjectOwner": "0xc2c9ddd800c90e8a9f7f02f35379fdebe07532f71e953937fcd04fa84c7a24c0"
-                    }
-                  ]
-                },
-                "id_operation": "Created"
-              }
-            ],
-            [
-              "0xdfc0922b6d60397ecc543811c43a6cd1ad4535fa2c846aa6599447e6cc4795c0",
-              {
-                "input_state": "NotExist",
-                "output_state": {
-                  "ObjectWrite": [
-                    "EvjjbZkfF5FdT48EShMHFvh6CFwANaAaoo7bcAzgRLvj",
-                    {
-                      "ObjectOwner": "0x6f2d03a861c6a388c75aa04ef956525f6fa2f05b067be9f9e436e98501c66f8b"
+                      "ObjectOwner": "0x6450460d7e7be475407908e48144f095500bc73cf7254f91c182a45570d0cac6"
                     }
                   ]
                 },
@@ -633,103 +596,103 @@
               "type_args": []
             },
             "contents": [
-              232,
-              14,
-              72,
-              38,
-              40,
-              13,
-              121,
-              140,
-              248,
-              193,
-              87,
-              156,
-              150,
-              228,
-              154,
-              136,
-              166,
-              92,
               15,
-              240,
-              225,
-              156,
+              179,
+              7,
+              220,
+              99,
+              116,
+              11,
+              43,
+              34,
+              99,
               124,
+              173,
+              183,
+              91,
+              122,
+              153,
+              83,
               227,
-              251,
-              244,
-              22,
-              171,
-              191,
-              166,
-              19,
+              216,
               174,
-              199,
-              3,
-              84,
-              131,
-              185,
-              10,
-              227,
-              105,
-              243,
-              206,
-              72,
-              195,
-              151,
-              27,
-              245,
-              140,
-              25,
-              65,
-              121,
-              151,
-              116,
-              108,
-              103,
+              143,
+              123,
+              179,
+              93,
+              16,
+              223,
+              139,
               50,
-              12,
-              53,
-              209,
-              84,
-              166,
-              66,
-              90,
-              183,
-              199,
-              3,
-              84,
-              131,
-              185,
-              10,
-              227,
+              20,
+              184,
+              146,
+              41,
+              59,
+              251,
+              52,
+              173,
+              111,
+              69,
+              44,
+              97,
+              173,
+              211,
               105,
-              243,
+              121,
               206,
-              72,
-              195,
-              151,
-              27,
-              245,
-              140,
-              25,
-              65,
+              147,
+              8,
+              165,
+              7,
+              244,
+              202,
+              119,
+              73,
+              129,
+              123,
+              165,
+              161,
+              154,
+              87,
+              212,
+              255,
+              44,
+              213,
+              63,
+              59,
+              251,
+              52,
+              173,
+              111,
+              69,
+              44,
+              97,
+              173,
+              211,
+              105,
               121,
-              151,
-              116,
-              108,
-              103,
-              50,
-              12,
-              53,
-              209,
-              84,
-              166,
-              66,
-              90,
-              183,
-              2,
+              206,
+              147,
+              8,
+              165,
+              7,
+              244,
+              202,
+              119,
+              73,
+              129,
+              123,
+              165,
+              161,
+              154,
+              87,
+              212,
+              255,
+              44,
+              213,
+              63,
+              1,
               0,
               0,
               0,
@@ -758,113 +721,113 @@
               "type_args": []
             },
             "contents": [
-              251,
-              91,
-              71,
-              93,
-              58,
-              113,
-              7,
-              34,
-              32,
-              73,
-              58,
+              209,
+              123,
+              224,
+              206,
+              121,
+              241,
+              77,
+              244,
+              72,
+              86,
+              107,
+              103,
+              131,
+              192,
               239,
-              215,
-              234,
-              130,
-              32,
-              211,
-              15,
               101,
-              233,
-              95,
+              12,
+              50,
+              118,
+              14,
+              142,
               183,
-              248,
-              96,
-              141,
-              116,
-              3,
-              192,
-              80,
-              95,
-              180,
-              167,
-              152,
-              52,
-              108,
-              41,
-              160,
-              169,
-              155,
               157,
-              10,
-              128,
-              201,
-              237,
-              227,
-              122,
-              119,
-              199,
-              253,
-              147,
-              234,
-              210,
-              149,
-              253,
-              176,
-              27,
-              137,
-              94,
-              241,
-              57,
-              44,
-              80,
-              135,
-              181,
-              152,
-              52,
-              108,
-              41,
-              160,
-              169,
-              155,
               157,
-              10,
-              128,
-              201,
-              237,
-              227,
-              122,
-              119,
-              199,
-              253,
-              147,
-              234,
-              210,
-              149,
-              253,
-              176,
-              27,
-              137,
-              94,
-              241,
-              57,
-              44,
-              80,
-              135,
+              157,
+              178,
+              187,
+              220,
+              115,
+              108,
               181,
-              2,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              0,
-              14,
-              208,
+              43,
+              45,
+              177,
+              156,
+              231,
+              178,
+              150,
+              99,
+              62,
+              73,
+              244,
+              142,
+              134,
+              60,
+              43,
+              8,
+              213,
+              234,
+              10,
+              136,
+              82,
+              115,
+              191,
+              165,
+              116,
+              226,
+              219,
+              10,
+              133,
+              236,
+              226,
+              37,
+              229,
+              45,
+              177,
+              156,
+              231,
+              178,
+              150,
+              99,
+              62,
+              73,
+              244,
+              142,
+              134,
+              60,
+              43,
+              8,
+              213,
+              234,
+              10,
+              136,
+              82,
+              115,
+              191,
+              165,
+              116,
+              226,
+              219,
+              10,
+              133,
+              236,
+              226,
+              37,
+              229,
+              1,
+              0,
+              0,
+              0,
+              0,
+              0,
+              0,
+              0,
+              0,
+              14,
+              208,
               231,
               124,
               3,
@@ -883,103 +846,103 @@
               "type_args": []
             },
             "contents": [
-              87,
-              237,
-              32,
-              86,
-              222,
-              32,
-              49,
-              210,
-              53,
-              230,
-              10,
-              194,
-              125,
-              91,
-              46,
-              170,
+              242,
+              245,
+              215,
+              89,
+              82,
               128,
+              97,
               158,
-              85,
-              158,
+              1,
+              156,
+              124,
+              176,
+              4,
+              137,
+              192,
+              182,
+              113,
+              144,
+              74,
               11,
-              173,
-              248,
-              152,
-              226,
-              64,
-              231,
-              208,
-              252,
-              170,
-              26,
-              8,
               72,
-              217,
-              15,
-              101,
-              11,
-              244,
-              216,
-              122,
-              209,
-              41,
+              130,
+              17,
+              145,
+              107,
+              150,
+              212,
+              219,
               236,
-              71,
-              57,
-              46,
-              195,
-              138,
-              140,
-              108,
+              228,
+              205,
+              29,
+              50,
+              72,
+              42,
+              34,
+              159,
+              131,
+              186,
+              206,
+              45,
+              164,
+              201,
               11,
-              181,
-              234,
-              75,
-              109,
-              171,
-              97,
-              14,
+              77,
+              217,
+              156,
+              138,
+              115,
+              6,
               58,
-              132,
-              20,
-              49,
-              171,
+              106,
+              141,
+              220,
+              91,
+              214,
+              204,
               153,
+              222,
+              216,
+              112,
+              100,
+              145,
+              42,
+              50,
               72,
-              217,
-              15,
-              101,
+              42,
+              34,
+              159,
+              131,
+              186,
+              206,
+              45,
+              164,
+              201,
               11,
-              244,
-              216,
-              122,
-              209,
-              41,
-              236,
-              71,
-              57,
-              46,
-              195,
+              77,
+              217,
+              156,
               138,
-              140,
-              108,
-              11,
-              181,
-              234,
-              75,
-              109,
-              171,
-              97,
-              14,
+              115,
+              6,
               58,
-              132,
-              20,
-              49,
-              171,
+              106,
+              141,
+              220,
+              91,
+              214,
+              204,
               153,
-              2,
+              222,
+              216,
+              112,
+              100,
+              145,
+              42,
+              1,
               0,
               0,
               0,
@@ -1008,103 +971,103 @@
               "type_args": []
             },
             "contents": [
-              12,
-              179,
-              128,
-              203,
-              50,
-              90,
-              131,
-              15,
-              3,
-              238,
-              75,
-              218,
+              26,
+              73,
+              49,
+              169,
+              67,
+              19,
               121,
+              35,
+              127,
+              251,
+              115,
+              102,
+              203,
               11,
+              73,
+              57,
+              227,
+              115,
               5,
-              225,
-              117,
-              83,
-              128,
-              22,
+              39,
+              92,
+              71,
+              87,
               245,
-              212,
-              124,
-              179,
-              82,
-              201,
-              60,
-              198,
-              218,
-              220,
-              19,
-              4,
-              50,
-              130,
-              23,
-              143,
-              241,
-              103,
-              208,
-              42,
-              3,
-              62,
-              137,
+              250,
+              108,
+              229,
+              163,
+              116,
+              21,
+              52,
+              122,
+              69,
+              228,
+              93,
+              189,
+              144,
+              86,
+              66,
+              204,
+              44,
+              169,
+              195,
+              207,
               209,
-              40,
-              10,
-              30,
-              194,
-              95,
-              157,
-              208,
-              105,
               160,
-              241,
-              64,
-              12,
-              36,
-              65,
-              146,
-              241,
-              247,
-              92,
-              186,
-              188,
-              50,
-              130,
-              23,
-              143,
-              241,
+              161,
+              249,
+              81,
+              119,
+              88,
+              229,
+              217,
+              141,
+              235,
               103,
-              208,
-              42,
-              3,
-              62,
-              137,
+              96,
+              64,
+              196,
+              147,
+              64,
+              200,
+              178,
+              103,
+              69,
+              228,
+              93,
+              189,
+              144,
+              86,
+              66,
+              204,
+              44,
+              169,
+              195,
+              207,
               209,
-              40,
-              10,
-              30,
-              194,
-              95,
-              157,
-              208,
-              105,
               160,
-              241,
+              161,
+              249,
+              81,
+              119,
+              88,
+              229,
+              217,
+              141,
+              235,
+              103,
+              96,
               64,
-              12,
-              36,
-              65,
-              146,
-              241,
-              247,
-              92,
-              186,
-              188,
-              2,
+              196,
+              147,
+              64,
+              200,
+              178,
+              103,
+              1,
               0,
               0,
               0,
@@ -1129,11 +1092,11 @@
             "type_": {
               "address": "0000000000000000000000000000000000000000000000000000000000000003",
               "module": "validator_set",
-              "name": "ValidatorEpochInfoEventV2",
+              "name": "ValidatorEpochInfoEventV1",
               "type_args": []
             },
             "contents": [
-              3,
+              2,
               0,
               0,
               0,
@@ -1141,38 +1104,38 @@
               0,
               0,
               0,
-              199,
-              3,
-              84,
-              131,
-              185,
-              10,
-              227,
+              59,
+              251,
+              52,
+              173,
+              111,
+              69,
+              44,
+              97,
+              173,
+              211,
               105,
-              243,
-              206,
-              72,
-              195,
-              151,
-              27,
-              245,
-              140,
-              25,
-              65,
               121,
-              151,
-              116,
-              108,
-              103,
-              50,
-              12,
-              53,
-              209,
-              84,
-              166,
-              66,
-              90,
-              183,
+              206,
+              147,
+              8,
+              165,
+              7,
+              244,
+              202,
+              119,
+              73,
+              129,
+              123,
+              165,
+              161,
+              154,
+              87,
+              212,
+              255,
+              44,
+              213,
+              63,
               232,
               3,
               0,
@@ -1182,12 +1145,12 @@
               0,
               0,
               0,
-              244,
-              17,
-              203,
-              109,
-              95,
-              7,
+              56,
+              111,
+              132,
+              8,
+              177,
+              6,
               0,
               196,
               9,
@@ -1214,19 +1177,19 @@
               0,
               0,
               0,
-              244,
-              17,
-              203,
-              109,
-              95,
-              7,
+              56,
+              111,
+              132,
+              8,
+              177,
+              6,
               0,
-              73,
-              5,
-              86,
-              4,
-              171,
-              92,
+              161,
+              32,
+              121,
+              162,
+              33,
+              90,
               5,
               0,
               0,
@@ -1247,11 +1210,11 @@
             "type_": {
               "address": "0000000000000000000000000000000000000000000000000000000000000003",
               "module": "validator_set",
-              "name": "ValidatorEpochInfoEventV2",
+              "name": "ValidatorEpochInfoEventV1",
               "type_args": []
             },
             "contents": [
-              3,
+              2,
               0,
               0,
               0,
@@ -1259,38 +1222,38 @@
               0,
               0,
               0,
-              152,
-              52,
-              108,
-              41,
-              160,
-              169,
-              155,
-              157,
-              10,
-              128,
-              201,
-              237,
-              227,
-              122,
-              119,
-              199,
-              253,
-              147,
+              45,
+              177,
+              156,
+              231,
+              178,
+              150,
+              99,
+              62,
+              73,
+              244,
+              142,
+              134,
+              60,
+              43,
+              8,
+              213,
               234,
-              210,
-              149,
-              253,
-              176,
-              27,
-              137,
-              94,
-              241,
-              57,
-              44,
-              80,
-              135,
-              181,
+              10,
+              136,
+              82,
+              115,
+              191,
+              165,
+              116,
+              226,
+              219,
+              10,
+              133,
+              236,
+              226,
+              37,
+              229,
               232,
               3,
               0,
@@ -1300,12 +1263,12 @@
               0,
               0,
               0,
-              244,
-              17,
-              203,
-              109,
-              95,
-              7,
+              56,
+              111,
+              132,
+              8,
+              177,
+              6,
               0,
               196,
               9,
@@ -1332,19 +1295,19 @@
               0,
               0,
               0,
-              244,
-              17,
-              203,
-              109,
-              95,
-              7,
+              56,
+              111,
+              132,
+              8,
+              177,
+              6,
               0,
-              73,
-              5,
-              86,
-              4,
-              171,
-              92,
+              161,
+              32,
+              121,
+              162,
+              33,
+              90,
               5,
               0,
               0,
@@ -1365,11 +1328,11 @@
             "type_": {
               "address": "0000000000000000000000000000000000000000000000000000000000000003",
               "module": "validator_set",
-              "name": "ValidatorEpochInfoEventV2",
+              "name": "ValidatorEpochInfoEventV1",
               "type_args": []
             },
             "contents": [
-              3,
+              2,
               0,
               0,
               0,
@@ -1377,38 +1340,38 @@
               0,
               0,
               0,
+              50,
               72,
-              217,
-              15,
-              101,
+              42,
+              34,
+              159,
+              131,
+              186,
+              206,
+              45,
+              164,
+              201,
               11,
-              244,
-              216,
-              122,
-              209,
-              41,
-              236,
-              71,
-              57,
-              46,
-              195,
+              77,
+              217,
+              156,
               138,
-              140,
-              108,
-              11,
-              181,
-              234,
-              75,
-              109,
-              171,
-              97,
-              14,
+              115,
+              6,
               58,
-              132,
-              20,
-              49,
-              171,
+              106,
+              141,
+              220,
+              91,
+              214,
+              204,
               153,
+              222,
+              216,
+              112,
+              100,
+              145,
+              42,
               232,
               3,
               0,
@@ -1418,12 +1381,12 @@
               0,
               0,
               0,
-              244,
-              17,
-              203,
-              109,
-              95,
-              7,
+              56,
+              111,
+              132,
+              8,
+              177,
+              6,
               0,
               196,
               9,
@@ -1450,19 +1413,19 @@
               0,
               0,
               0,
-              244,
-              17,
-              203,
-              109,
-              95,
-              7,
+              56,
+              111,
+              132,
+              8,
+              177,
+              6,
               0,
-              73,
-              5,
-              86,
-              4,
-              171,
-              92,
+              161,
+              32,
+              121,
+              162,
+              33,
+              90,
               5,
               0,
               0,
@@ -1483,11 +1446,11 @@
             "type_": {
               "address": "0000000000000000000000000000000000000000000000000000000000000003",
               "module": "validator_set",
-              "name": "ValidatorEpochInfoEventV2",
+              "name": "ValidatorEpochInfoEventV1",
               "type_args": []
             },
             "contents": [
-              3,
+              2,
               0,
               0,
               0,
@@ -1495,38 +1458,38 @@
               0,
               0,
               0,
-              50,
-              130,
-              23,
-              143,
-              241,
-              103,
-              208,
-              42,
-              3,
-              62,
-              137,
+              69,
+              228,
+              93,
+              189,
+              144,
+              86,
+              66,
+              204,
+              44,
+              169,
+              195,
+              207,
               209,
-              40,
-              10,
-              30,
-              194,
-              95,
-              157,
-              208,
-              105,
               160,
-              241,
+              161,
+              249,
+              81,
+              119,
+              88,
+              229,
+              217,
+              141,
+              235,
+              103,
+              96,
               64,
-              12,
-              36,
-              65,
-              146,
-              241,
-              247,
-              92,
-              186,
-              188,
+              196,
+              147,
+              64,
+              200,
+              178,
+              103,
               232,
               3,
               0,
@@ -1536,12 +1499,12 @@
               0,
               0,
               0,
-              244,
-              17,
-              203,
-              109,
-              95,
-              7,
+              56,
+              111,
+              132,
+              8,
+              177,
+              6,
               0,
               196,
               9,
@@ -1568,19 +1531,19 @@
               0,
               0,
               0,
-              244,
-              17,
-              203,
-              109,
-              95,
-              7,
+              56,
+              111,
+              132,
+              8,
+              177,
+              6,
               0,
-              73,
-              5,
-              86,
-              4,
-              171,
-              92,
+              161,
+              32,
+              121,
+              162,
+              33,
+              90,
               5,
               0,
               0,
@@ -1600,12 +1563,12 @@
             "sender": "0x0000000000000000000000000000000000000000000000000000000000000000",
             "type_": {
               "address": "0000000000000000000000000000000000000000000000000000000000000003",
-              "module": "validator_set",
-              "name": "ValidatorJoinEvent",
+              "module": "iota_system_state_inner",
+              "name": "SystemEpochInfoEventV1",
               "type_args": []
             },
             "contents": [
-              3,
+              2,
               0,
               0,
               0,
@@ -1613,83 +1576,15 @@
               0,
               0,
               0,
-              245,
-              102,
-              129,
-              54,
-              96,
-              157,
-              170,
-              89,
-              196,
-              43,
-              209,
-              118,
-              250,
-              95,
-              88,
-              86,
-              6,
-              162,
-              244,
-              209,
-              239,
-              219,
-              71,
-              136,
-              52,
-              112,
-              134,
-              45,
-              59,
-              63,
-              115,
-              136,
-              148,
-              42,
-              142,
-              98,
-              212,
-              124,
               1,
-              32,
-              200,
-              159,
-              249,
-              18,
-              173,
-              14,
-              35,
-              233,
-              104,
-              182,
-              193,
-              93,
-              160,
-              226,
-              192,
-              97,
-              115,
-              27,
-              55,
-              81,
-              112,
-              175,
-              105,
-              37
-            ]
-          },
-          {
-            "package_id": "0x0000000000000000000000000000000000000000000000000000000000000003",
-            "transaction_module": "iota_system",
-            "sender": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "type_": {
-              "address": "0000000000000000000000000000000000000000000000000000000000000003",
-              "module": "iota_system_state_inner",
-              "name": "SystemEpochInfoEvent",
-              "type_args": []
-            },
-            "contents": [
+              0,
+              0,
+              0,
+              0,
+              0,
+              0,
+              0,
+              232,
               3,
               0,
               0,
@@ -1698,7 +1593,13 @@
               0,
               0,
               0,
-              1,
+              224,
+              188,
+              17,
+              34,
+              196,
+              26,
+              0,
               0,
               0,
               0,
@@ -1706,8 +1607,6 @@
               0,
               0,
               0,
-              232,
-              3,
               0,
               0,
               0,
@@ -1715,40 +1614,19 @@
               0,
               0,
               0,
-              80,
-              178,
-              216,
-              102,
-              186,
-              38,
               0,
-              128,
-              214,
-              221,
-              2,
               0,
               0,
               0,
               0,
-              240,
-              245,
-              253,
-              2,
               0,
               0,
               0,
               0,
-              240,
-              223,
-              190,
-              2,
               0,
               0,
               0,
               0,
-              128,
-              132,
-              30,
               0,
               0,
               0,
@@ -1770,9 +1648,9 @@
               0,
               0,
               0,
-              128,
-              107,
-              108,
+              0,
+              240,
+              138,
               26,
               149,
               185,
@@ -1795,7 +1673,7 @@
                 }
               },
               "has_public_transfer": false,
-              "version": 6,
+              "version": 2,
               "contents": [
                 0,
                 0,
@@ -1829,7 +1707,7 @@
                 0,
                 0,
                 5,
-                2,
+                1,
                 0,
                 0,
                 0,
@@ -1845,8 +1723,8 @@
               "initial_shared_version": 1
             }
           },
-          "previous_transaction": "7D8EoGyF5bEHXCwfBJUZ6cJBbkFs7Fvzy9UY2jL6WXGm",
-          "storage_rebate": 1451600
+          "previous_transaction": "8eZxmVup35tyyVdZ31sKB9av3iNMKuJrxZ8ouJ4SRWtu",
+          "storage_rebate": 0
         },
         {
           "data": {
@@ -1861,8 +1739,8 @@
                     {
                       "struct": {
                         "address": "0000000000000000000000000000000000000000000000000000000000000003",
-                        "module": "validator",
-                        "name": "Validator",
+                        "module": "iota_system_state_inner",
+                        "name": "IotaSystemStateV1",
                         "type_args": []
                       }
                     }
@@ -1870,40 +1748,41 @@
                 }
               },
               "has_public_transfer": false,
-              "version": 6,
+              "version": 2,
               "contents": [
+                106,
+                242,
+                162,
+                183,
+                202,
+                96,
+                191,
+                118,
+                23,
                 74,
-                207,
-                136,
-                178,
-                213,
-                87,
-                184,
-                51,
-                62,
-                2,
-                32,
-                107,
-                252,
-                230,
-                208,
-                59,
-                130,
-                104,
-                173,
-                228,
-                140,
-                221,
-                2,
-                54,
-                166,
-                208,
-                208,
-                203,
-                244,
+                223,
+                211,
+                233,
+                196,
                 149,
-                215,
-                75,
+                127,
+                142,
+                147,
+                119,
+                89,
+                96,
+                49,
+                130,
+                249,
+                180,
+                108,
+                127,
+                108,
+                95,
+                25,
+                198,
+                210,
+                1,
                 0,
                 0,
                 0,
@@ -1911,252 +1790,324 @@
                 0,
                 0,
                 0,
+                1,
                 0,
-                245,
-                102,
-                129,
-                54,
-                96,
-                157,
-                170,
-                89,
-                196,
-                43,
-                209,
-                118,
-                250,
-                95,
-                88,
-                86,
-                6,
-                162,
-                244,
-                209,
-                239,
-                219,
-                71,
-                136,
-                52,
-                112,
-                134,
-                45,
-                59,
-                63,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                1,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                1,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                57,
+                250,
                 115,
-                136,
-                96,
-                165,
-                62,
-                107,
-                156,
-                158,
-                216,
-                84,
-                96,
-                151,
-                72,
-                60,
-                127,
-                24,
+                22,
+                182,
+                11,
                 178,
+                229,
+                253,
+                205,
+                92,
+                179,
+                236,
+                134,
+                160,
+                75,
+                54,
+                44,
+                186,
+                33,
+                145,
+                160,
+                137,
+                160,
+                136,
+                5,
+                12,
+                185,
+                38,
+                134,
                 120,
-                132,
-                46,
-                8,
+                155,
+                0,
+                240,
                 105,
-                210,
-                52,
+                42,
+                5,
+                130,
                 100,
-                137,
-                117,
-                48,
-                242,
-                39,
-                113,
-                30,
-                93,
-                92,
-                15,
-                231,
-                70,
-                106,
-                24,
-                198,
-                223,
-                117,
-                158,
-                231,
-                217,
-                91,
-                65,
-                211,
-                51,
-                35,
-                89,
-                11,
-                248,
-                58,
-                244,
-                233,
-                118,
-                164,
-                6,
+                43,
                 0,
-                18,
-                138,
-                151,
-                88,
-                229,
-                243,
-                38,
-                108,
-                193,
-                254,
-                149,
-                81,
-                156,
-                182,
+                240,
                 49,
-                181,
-                74,
-                110,
-                91,
-                243,
+                247,
+                140,
+                10,
+                24,
+                0,
+                4,
+                59,
+                251,
                 52,
-                60,
-                170,
-                98,
-                18,
-                181,
-                176,
-                127,
-                133,
-                164,
-                206,
-                104,
-                108,
-                53,
-                77,
-                94,
-                205,
-                220,
-                210,
-                32,
-                207,
-                129,
-                54,
-                12,
-                182,
-                29,
-                102,
-                61,
-                164,
-                70,
-                65,
-                92,
-                223,
-                12,
-                100,
-                100,
-                218,
-                182,
-                114,
-                64,
+                173,
+                111,
                 69,
-                6,
-                60,
-                197,
-                86,
-                217,
-                55,
-                130,
+                44,
+                97,
+                173,
+                211,
                 105,
-                246,
-                35,
-                198,
-                32,
-                20,
+                121,
+                206,
+                147,
+                8,
+                165,
+                7,
+                244,
+                202,
+                119,
+                73,
+                129,
+                123,
+                165,
+                161,
+                154,
                 87,
-                228,
-                166,
+                212,
+                255,
+                44,
+                213,
+                63,
                 96,
-                203,
-                177,
-                45,
-                143,
-                32,
-                164,
-                6,
-                188,
-                131,
+                141,
+                207,
+                246,
+                209,
+                85,
+                4,
                 10,
+                101,
+                111,
+                72,
+                25,
+                177,
                 49,
-                73,
-                253,
-                43,
-                70,
-                97,
-                189,
-                91,
-                77,
-                165,
-                139,
-                113,
-                6,
-                239,
-                124,
-                39,
-                16,
-                48,
-                180,
-                146,
-                1,
+                17,
+                181,
+                44,
+                87,
+                70,
+                168,
+                107,
+                167,
+                47,
+                57,
+                95,
+                186,
+                254,
+                46,
+                195,
+                132,
+                125,
+                30,
+                129,
+                64,
+                230,
+                36,
+                167,
+                81,
+                253,
+                246,
+                181,
+                242,
+                5,
+                11,
+                199,
+                32,
+                92,
+                249,
+                211,
+                0,
+                4,
+                201,
+                11,
+                12,
+                116,
+                10,
+                255,
+                211,
                 38,
-                21,
-                25,
+                206,
+                103,
+                60,
+                194,
+                178,
                 58,
-                185,
-                14,
-                59,
-                219,
-                52,
-                229,
-                98,
-                216,
+                45,
+                36,
+                213,
+                62,
+                42,
+                254,
+                178,
+                134,
+                223,
+                198,
+                104,
+                253,
                 64,
-                147,
-                144,
-                33,
-                202,
-                4,
-                30,
-                242,
-                244,
+                96,
+                8,
+                157,
                 109,
-                108,
-                93,
-                207,
+                43,
+                23,
+                183,
+                153,
+                221,
+                54,
+                249,
+                13,
+                51,
+                46,
+                84,
                 167,
-                234,
-                6,
-                118,
-                129,
-                131,
                 163,
-                47,
-                169,
                 56,
-                167,
-                155,
-                58,
-                146,
-                95,
-                139,
-                70,
-                22,
-                220,
+                212,
+                32,
+                32,
+                38,
+                163,
+                54,
+                223,
+                222,
+                200,
+                16,
+                231,
+                136,
+                101,
+                109,
+                60,
+                170,
+                54,
+                183,
+                183,
+                132,
+                232,
+                253,
+                218,
+                17,
+                151,
+                230,
+                164,
+                94,
+                212,
+                132,
+                90,
+                230,
+                7,
+                98,
+                32,
+                217,
+                53,
+                60,
+                49,
+                54,
+                152,
+                131,
+                119,
+                1,
+                32,
+                5,
+                215,
+                206,
+                234,
                 120,
-                10,
+                214,
+                210,
+                148,
+                142,
+                129,
+                161,
+                106,
+                254,
+                253,
+                73,
+                188,
+                78,
+                237,
+                59,
+                75,
+                133,
+                63,
+                48,
+                175,
+                52,
+                76,
+                124,
+                156,
+                164,
+                117,
+                75,
+                204,
+                212,
+                49,
+                8,
+                33,
+                96,
+                102,
+                254,
+                60,
+                113,
+                252,
+                79,
+                3,
+                66,
+                110,
+                30,
+                211,
+                234,
+                248,
+                46,
+                26,
+                12,
+                142,
+                136,
+                104,
+                199,
+                247,
+                129,
+                48,
+                228,
+                61,
+                39,
+                13,
+                72,
+                101,
+                101,
+                199,
+                19,
+                109,
+                21,
+                11,
                 118,
                 97,
                 108,
@@ -2166,71 +2117,16 @@
                 116,
                 111,
                 114,
-                48,
-                11,
-                100,
-                101,
-                115,
-                99,
-                114,
-                105,
-                112,
-                116,
-                105,
-                111,
-                110,
-                25,
-                104,
-                116,
-                116,
-                112,
-                115,
-                58,
-                47,
+                45,
+                49,
+                0,
+                0,
+                0,
+                29,
                 47,
                 105,
-                111,
-                116,
-                97,
-                46,
-                111,
-                114,
-                103,
-                47,
-                108,
-                111,
-                103,
-                111,
-                46,
-                112,
-                110,
-                103,
-                20,
-                104,
-                116,
-                116,
                 112,
-                115,
-                58,
-                47,
-                47,
-                119,
-                119,
-                119,
-                46,
-                105,
-                111,
-                116,
-                97,
-                46,
-                111,
-                114,
-                103,
-                28,
-                47,
-                100,
-                110,
-                115,
+                52,
                 47,
                 49,
                 50,
@@ -2246,44 +2142,21 @@
                 99,
                 112,
                 47,
-                56,
-                48,
-                56,
-                48,
+                54,
+                53,
+                52,
+                52,
+                54,
                 47,
                 104,
                 116,
                 116,
                 112,
-                23,
-                47,
-                100,
-                110,
-                115,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
+                24,
                 47,
-                117,
-                100,
+                105,
                 112,
-                47,
-                56,
-                48,
-                56,
                 52,
-                23,
-                47,
-                100,
-                110,
-                115,
                 47,
                 49,
                 50,
@@ -2299,15 +2172,16 @@
                 100,
                 112,
                 47,
+                54,
+                53,
+                52,
+                52,
                 56,
-                48,
-                56,
-                49,
-                23,
+                24,
                 47,
-                100,
-                110,
-                115,
+                105,
+                112,
+                52,
                 47,
                 49,
                 50,
@@ -2323,11 +2197,11 @@
                 100,
                 112,
                 47,
-                56,
-                48,
-                56,
-                50,
-                0,
+                54,
+                53,
+                52,
+                53,
+                52,
                 0,
                 0,
                 0,
@@ -2335,40 +2209,38 @@
                 0,
                 0,
                 0,
-                76,
-                179,
-                167,
-                126,
-                18,
-                238,
-                65,
-                140,
                 237,
-                181,
-                246,
-                156,
-                79,
-                25,
+                202,
+                141,
+                82,
+                243,
+                82,
+                185,
+                130,
+                172,
+                46,
+                92,
+                14,
+                227,
+                72,
+                139,
+                162,
+                213,
+                206,
+                89,
                 121,
-                145,
                 179,
-                60,
-                69,
-                239,
-                45,
-                52,
-                76,
-                157,
-                69,
-                145,
-                127,
-                61,
-                97,
-                107,
-                36,
-                112,
-                0,
-                0,
+                214,
+                64,
+                241,
+                40,
+                30,
+                200,
+                224,
+                136,
+                215,
+                39,
+                57,
                 0,
                 0,
                 0,
@@ -2377,6 +2249,8 @@
                 0,
                 0,
                 0,
+                196,
+                9,
                 0,
                 0,
                 0,
@@ -2384,37 +2258,37 @@
                 0,
                 0,
                 74,
-                147,
-                61,
-                94,
-                223,
-                159,
-                108,
-                51,
-                148,
-                133,
-                235,
-                178,
-                86,
-                145,
-                162,
+                247,
+                153,
+                224,
+                143,
+                124,
+                199,
+                167,
+                208,
+                50,
+                229,
+                166,
+                53,
+                141,
+                230,
+                155,
+                237,
+                8,
+                69,
+                247,
                 162,
-                82,
-                76,
-                36,
-                48,
-                67,
-                60,
-                227,
-                173,
-                4,
-                51,
-                128,
-                14,
-                236,
-                227,
                 221,
-                255,
+                120,
+                65,
+                215,
+                137,
+                47,
+                111,
+                156,
+                51,
+                80,
+                173,
                 232,
                 3,
                 0,
@@ -2423,47 +2297,42 @@
                 0,
                 0,
                 0,
-                148,
-                42,
-                142,
-                98,
-                212,
+                15,
+                179,
+                7,
+                220,
+                99,
+                116,
+                11,
+                43,
+                34,
+                99,
                 124,
-                1,
-                32,
-                200,
-                159,
-                249,
-                18,
                 173,
-                14,
-                35,
-                233,
-                104,
-                182,
-                193,
+                183,
+                91,
+                122,
+                153,
+                83,
+                227,
+                216,
+                174,
+                143,
+                123,
+                179,
                 93,
-                160,
-                226,
-                192,
-                97,
-                115,
-                27,
-                55,
-                81,
-                112,
-                175,
-                105,
-                37,
+                16,
+                223,
+                139,
+                50,
+                20,
+                184,
+                146,
+                41,
+                1,
                 0,
                 0,
                 0,
-                128,
-                106,
-                172,
-                175,
-                60,
-                9,
                 0,
                 0,
                 0,
@@ -2471,49 +2340,62 @@
                 0,
                 0,
                 0,
+                124,
+                204,
+                61,
+                163,
+                2,
+                6,
                 0,
                 0,
+                174,
+                210,
+                94,
+                232,
+                170,
                 0,
-                128,
-                106,
-                172,
-                175,
-                60,
-                9,
                 0,
-                111,
-                45,
-                3,
-                168,
-                97,
-                198,
-                163,
-                136,
-                199,
-                90,
-                160,
-                78,
-                249,
-                86,
-                82,
-                95,
-                111,
-                162,
-                240,
-                91,
-                6,
+                145,
+                108,
+                209,
+                118,
+                87,
+                87,
+                5,
+                0,
+                100,
+                80,
+                70,
+                13,
+                126,
                 123,
-                233,
-                249,
                 228,
-                54,
-                233,
-                133,
-                1,
+                117,
+                64,
+                121,
+                8,
+                228,
+                129,
+                68,
+                240,
+                149,
+                80,
+                11,
+                199,
+                60,
+                247,
+                37,
+                79,
+                145,
+                193,
+                130,
+                164,
+                85,
+                112,
+                208,
+                202,
                 198,
-                111,
-                139,
-                0,
+                2,
                 0,
                 0,
                 0,
@@ -2545,38 +2427,38 @@
                 0,
                 0,
                 0,
-                151,
-                165,
-                252,
-                16,
-                16,
-                249,
-                41,
-                39,
-                113,
-                8,
+                66,
+                171,
+                40,
+                184,
+                198,
+                248,
+                37,
+                80,
+                178,
                 91,
-                60,
-                88,
-                225,
-                48,
-                64,
-                35,
-                186,
-                161,
-                250,
-                1,
-                81,
-                51,
-                48,
-                225,
-                254,
-                105,
-                14,
-                166,
-                38,
-                16,
-                144,
+                133,
+                208,
+                36,
+                170,
+                67,
+                205,
+                191,
+                10,
+                49,
+                13,
+                172,
+                27,
+                248,
+                33,
+                15,
+                228,
+                163,
+                61,
+                156,
+                207,
+                73,
+                153,
                 0,
                 0,
                 0,
@@ -2594,12 +2476,12 @@
                 0,
                 0,
                 0,
-                128,
-                106,
-                172,
-                175,
-                60,
-                9,
+                124,
+                204,
+                61,
+                163,
+                2,
+                6,
                 0,
                 232,
                 3,
@@ -2617,136 +2499,39 @@
                 0,
                 0,
                 0,
-                85,
-                6,
-                129,
+                154,
+                63,
+                153,
+                219,
+                190,
+                60,
                 107,
-                168,
-                182,
-                56,
-                113,
-                98,
-                53,
-                93,
-                4,
-                125,
-                158,
-                41,
-                70,
-                117,
-                96,
-                211,
-                191,
-                19,
-                133,
-                196,
-                76,
-                28,
-                116,
-                110,
+                172,
+                161,
                 128,
-                178,
-                221,
-                195,
-                186,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0
-              ]
-            }
-          },
-          "owner": {
-            "ObjectOwner": "0x5900861dc05e16e4230f67df667da400b6f1ad94734c0c86ffc87315c9d81dd5"
-          },
-          "previous_transaction": "7D8EoGyF5bEHXCwfBJUZ6cJBbkFs7Fvzy9UY2jL6WXGm",
-          "storage_rebate": 7470800
-        },
-        {
-          "data": {
-            "Move": {
-              "type_": {
-                "Other": {
-                  "address": "0000000000000000000000000000000000000000000000000000000000000002",
-                  "module": "dynamic_field",
-                  "name": "Field",
-                  "type_args": [
-                    "u64",
-                    {
-                      "struct": {
-                        "address": "0000000000000000000000000000000000000000000000000000000000000003",
-                        "module": "iota_system_state_inner",
-                        "name": "IotaSystemStateInnerV2",
-                        "type_args": []
-                      }
-                    }
-                  ]
-                }
-              },
-              "has_public_transfer": false,
-              "version": 6,
-              "contents": [
-                91,
-                137,
-                14,
-                175,
-                42,
-                188,
-                250,
-                42,
-                185,
-                11,
-                119,
-                184,
-                230,
-                243,
+                223,
+                192,
+                219,
+                114,
+                132,
+                40,
                 213,
-                216,
-                96,
-                149,
-                134,
-                195,
-                229,
-                131,
-                186,
+                246,
+                227,
+                9,
+                177,
+                93,
                 243,
-                220,
-                205,
-                90,
-                241,
+                81,
                 126,
-                223,
-                72,
-                209,
-                2,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                2,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                1,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
+                145,
+                127,
+                241,
+                139,
+                224,
+                194,
+                8,
                 0,
-                2,
                 0,
                 0,
                 0,
@@ -2754,299 +2539,250 @@
                 0,
                 0,
                 0,
-                79,
-                119,
-                144,
-                163,
-                247,
-                191,
                 45,
-                221,
-                234,
-                6,
-                103,
-                112,
+                177,
                 156,
-                173,
-                41,
-                65,
-                7,
-                198,
-                139,
-                39,
-                85,
-                185,
-                144,
-                234,
-                233,
-                27,
-                255,
-                32,
-                224,
+                231,
+                178,
                 150,
-                115,
-                205,
-                128,
-                91,
-                214,
-                68,
-                154,
-                59,
-                103,
+                99,
+                62,
+                73,
+                244,
+                142,
+                134,
+                60,
                 43,
-                0,
-                224,
-                188,
-                17,
-                34,
-                196,
-                26,
-                0,
-                4,
-                199,
-                3,
-                84,
-                131,
-                185,
+                8,
+                213,
+                234,
                 10,
-                227,
-                105,
-                243,
-                206,
-                72,
-                195,
-                151,
-                27,
-                245,
-                140,
-                25,
-                65,
-                121,
-                151,
+                136,
+                82,
+                115,
+                191,
+                165,
                 116,
-                108,
-                103,
-                50,
-                12,
-                53,
-                209,
-                84,
-                166,
-                66,
-                90,
-                183,
+                226,
+                219,
+                10,
+                133,
+                236,
+                226,
+                37,
+                229,
                 96,
-                141,
-                207,
+                153,
+                242,
+                94,
                 246,
-                209,
-                85,
-                4,
-                10,
-                101,
-                111,
-                72,
-                25,
-                177,
-                49,
-                17,
-                181,
+                31,
+                128,
+                50,
+                185,
+                20,
+                99,
+                100,
+                96,
+                152,
                 44,
+                92,
+                198,
+                241,
+                52,
+                239,
+                29,
+                218,
+                231,
+                102,
                 87,
-                70,
-                168,
-                107,
-                167,
-                47,
-                57,
-                95,
-                186,
+                242,
+                203,
                 254,
-                46,
-                195,
-                132,
-                125,
-                30,
-                129,
-                64,
-                230,
-                36,
-                167,
-                81,
-                253,
-                246,
-                181,
-                242,
-                5,
-                11,
-                199,
-                32,
-                92,
-                249,
-                211,
-                0,
-                4,
-                201,
-                11,
-                12,
+                193,
+                235,
+                252,
+                141,
+                9,
+                115,
                 116,
+                8,
+                13,
+                246,
+                252,
+                240,
+                220,
+                184,
+                188,
+                75,
+                13,
+                142,
                 10,
+                245,
+                216,
+                14,
+                187,
                 255,
-                211,
-                38,
-                206,
-                103,
-                60,
-                194,
-                178,
-                58,
+                43,
+                76,
+                89,
+                159,
+                84,
+                244,
                 45,
-                36,
-                213,
-                62,
-                42,
-                254,
-                178,
-                134,
+                99,
+                18,
                 223,
-                198,
-                104,
-                253,
-                64,
+                195,
+                20,
+                39,
                 96,
-                8,
-                157,
-                109,
-                43,
-                23,
-                183,
-                153,
-                221,
-                54,
-                249,
-                13,
-                51,
-                46,
-                84,
-                167,
-                163,
+                120,
+                193,
+                204,
+                52,
+                126,
+                187,
+                190,
+                197,
+                25,
+                139,
+                226,
+                88,
+                81,
+                63,
                 56,
-                212,
-                32,
-                54,
-                229,
+                107,
+                147,
+                13,
+                2,
+                194,
+                116,
+                154,
+                128,
+                62,
+                35,
+                48,
                 149,
+                94,
+                189,
+                26,
+                16,
+                32,
+                122,
+                3,
+                30,
+                157,
+                52,
+                195,
+                36,
                 160,
-                153,
-                0,
-                149,
-                41,
-                2,
-                12,
-                159,
-                11,
-                237,
+                76,
+                194,
                 183,
-                232,
-                172,
-                239,
+                16,
+                106,
+                36,
+                32,
+                2,
+                216,
+                206,
                 21,
-                94,
-                208,
-                184,
-                219,
-                158,
-                170,
-                43,
+                7,
+                4,
+                151,
+                70,
+                39,
+                234,
+                215,
+                20,
+                41,
                 150,
-                93,
-                242,
-                32,
-                222,
-                246,
-                207,
-                32,
-                245,
-                64,
-                76,
-                18,
-                227,
-                129,
-                141,
-                164,
-                251,
-                225,
-                193,
-                225,
-                255,
-                222,
-                40,
-                239,
-                108,
-                248,
-                77,
-                176,
-                165,
-                136,
-                148,
-                156,
                 113,
-                25,
-                160,
-                250,
-                14,
-                98,
+                224,
+                91,
+                32,
+                3,
+                60,
+                195,
+                7,
+                177,
+                11,
+                189,
                 198,
-                178,
-                48,
-                148,
-                81,
-                45,
-                99,
-                42,
-                80,
-                47,
-                61,
                 69,
                 193,
-                153,
-                23,
-                69,
-                77,
-                65,
-                148,
-                12,
-                218,
-                166,
-                136,
-                89,
-                61,
+                118,
+                101,
+                132,
+                133,
+                243,
+                255,
                 102,
-                137,
-                39,
-                225,
-                90,
-                67,
-                159,
-                177,
-                77,
+                108,
+                2,
+                133,
+                7,
+                68,
+                189,
+                150,
                 46,
-                144,
-                186,
-                192,
-                151,
-                223,
-                1,
-                151,
-                220,
-                117,
+                93,
+                146,
+                0,
+                141,
+                222,
+                107,
+                252,
+                48,
+                173,
+                72,
                 33,
-                235,
-                142,
+                196,
+                123,
+                102,
+                115,
+                188,
+                207,
+                117,
+                48,
+                189,
+                20,
+                63,
+                36,
+                94,
                 101,
-                76,
-                246,
+                110,
+                96,
+                96,
+                218,
+                135,
                 207,
+                130,
+                60,
+                108,
+                28,
+                33,
+                226,
+                4,
+                178,
+                120,
+                120,
+                61,
+                127,
+                163,
+                62,
+                231,
+                69,
+                205,
+                199,
+                183,
+                145,
+                196,
+                92,
+                33,
+                251,
+                211,
                 11,
                 118,
                 97,
@@ -3058,7 +2794,7 @@
                 111,
                 114,
                 45,
-                49,
+                48,
                 0,
                 0,
                 0,
@@ -3082,11 +2818,11 @@
                 99,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                48,
-                49,
+                52,
+                51,
+                54,
                 47,
                 104,
                 116,
@@ -3112,11 +2848,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                48,
+                52,
                 51,
+                56,
                 24,
                 47,
                 105,
@@ -3137,37 +2873,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                48,
-                57,
-                24,
-                47,
-                105,
-                112,
                 52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
-                53,
-                50,
-                49,
-                49,
-                49,
-                0,
+                52,
+                52,
                 0,
                 0,
                 0,
@@ -3175,38 +2885,38 @@
                 0,
                 0,
                 0,
-                158,
-                21,
-                4,
-                132,
-                147,
-                197,
-                55,
-                157,
-                104,
-                199,
-                11,
-                82,
-                210,
-                44,
-                230,
-                232,
-                51,
-                81,
-                13,
-                89,
-                112,
-                234,
-                251,
-                255,
-                56,
+                139,
+                224,
+                68,
+                32,
+                91,
+                176,
+                203,
+                154,
+                171,
+                120,
+                35,
+                40,
+                91,
+                57,
+                179,
+                164,
                 23,
-                190,
+                110,
                 253,
-                67,
-                99,
-                84,
-                234,
+                173,
+                253,
+                143,
+                209,
+                90,
+                0,
+                61,
+                90,
+                186,
+                109,
+                177,
+                59,
+                90,
                 0,
                 0,
                 0,
@@ -3223,38 +2933,38 @@
                 0,
                 0,
                 0,
-                58,
-                173,
-                132,
-                75,
-                224,
+                18,
+                5,
+                29,
+                220,
+                228,
+                186,
+                162,
+                227,
+                204,
+                127,
+                217,
+                247,
                 93,
-                90,
-                60,
-                253,
-                176,
-                39,
+                81,
+                88,
+                63,
+                196,
+                75,
+                65,
+                142,
                 11,
-                172,
-                153,
-                12,
+                57,
+                159,
+                31,
                 113,
-                237,
-                20,
-                103,
-                149,
-                114,
-                8,
-                32,
-                12,
-                59,
-                244,
-                40,
-                38,
-                44,
-                61,
-                175,
-                1,
+                251,
+                185,
+                116,
+                209,
+                4,
+                123,
+                14,
                 232,
                 3,
                 0,
@@ -3263,38 +2973,38 @@
                 0,
                 0,
                 0,
-                232,
-                14,
-                72,
-                38,
-                40,
-                13,
+                209,
+                123,
+                224,
+                206,
                 121,
-                140,
-                248,
-                193,
-                87,
-                156,
-                150,
-                228,
-                154,
-                136,
-                166,
-                92,
-                15,
-                240,
-                225,
-                156,
-                124,
-                227,
-                251,
+                241,
+                77,
                 244,
-                22,
-                171,
-                191,
-                166,
-                19,
-                174,
+                72,
+                86,
+                107,
+                103,
+                131,
+                192,
+                239,
+                101,
+                12,
+                50,
+                118,
+                14,
+                142,
+                183,
+                157,
+                157,
+                157,
+                178,
+                187,
+                220,
+                115,
+                108,
+                181,
+                43,
                 1,
                 0,
                 0,
@@ -3306,62 +3016,62 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
+                124,
+                204,
+                61,
+                163,
+                2,
                 6,
                 0,
                 0,
-                92,
-                165,
-                189,
-                208,
-                85,
-                1,
+                174,
+                210,
+                94,
+                232,
+                170,
                 0,
-                161,
-                32,
-                121,
-                162,
-                33,
-                90,
-                5,
                 0,
-                194,
-                201,
-                221,
-                216,
+                145,
+                108,
+                209,
+                118,
+                87,
+                87,
+                5,
                 0,
-                201,
-                14,
-                138,
-                159,
-                127,
-                2,
-                243,
-                83,
                 121,
-                253,
-                235,
-                224,
-                117,
-                50,
-                247,
-                30,
-                149,
-                57,
-                55,
-                252,
-                208,
-                79,
-                168,
-                76,
-                122,
-                36,
+                31,
+                101,
+                204,
+                134,
+                140,
+                198,
+                239,
+                11,
                 192,
-                3,
+                255,
+                64,
+                40,
+                147,
+                159,
+                16,
+                185,
+                98,
+                112,
+                39,
+                68,
+                129,
+                205,
+                235,
+                244,
+                33,
+                214,
+                71,
+                190,
+                240,
+                11,
+                110,
+                2,
                 0,
                 0,
                 0,
@@ -3393,38 +3103,38 @@
                 0,
                 0,
                 0,
-                28,
-                3,
-                133,
+                162,
+                2,
+                46,
                 57,
-                100,
-                73,
-                32,
-                113,
-                183,
-                112,
-                201,
-                166,
-                191,
-                35,
-                47,
-                34,
-                32,
+                140,
+                215,
+                171,
+                207,
+                199,
+                51,
+                119,
+                103,
+                99,
                 159,
-                48,
-                137,
-                3,
-                222,
-                105,
-                110,
-                220,
-                204,
-                41,
-                226,
-                63,
-                78,
-                18,
-                254,
+                136,
+                104,
+                178,
+                52,
+                54,
+                253,
+                140,
+                74,
+                230,
+                132,
+                248,
+                104,
+                75,
+                249,
+                252,
+                181,
+                229,
+                232,
                 0,
                 0,
                 0,
@@ -3442,11 +3152,11 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
+                124,
+                204,
+                61,
+                163,
+                2,
                 6,
                 0,
                 232,
@@ -3465,38 +3175,38 @@
                 0,
                 0,
                 0,
-                215,
-                233,
-                197,
-                73,
-                0,
-                103,
-                112,
-                32,
-                41,
-                241,
-                60,
-                231,
-                183,
-                150,
-                128,
-                181,
-                240,
-                93,
-                160,
-                34,
-                202,
-                137,
-                79,
-                180,
-                142,
+                251,
+                213,
+                102,
+                25,
+                149,
+                159,
+                37,
+                192,
+                210,
+                95,
                 204,
-                252,
-                45,
-                63,
-                115,
-                54,
+                21,
                 18,
+                42,
+                226,
+                5,
+                226,
+                152,
+                81,
+                144,
+                191,
+                110,
+                76,
+                51,
+                233,
+                213,
+                87,
+                45,
+                246,
+                101,
+                58,
+                130,
                 0,
                 0,
                 0,
@@ -3505,250 +3215,250 @@
                 0,
                 0,
                 0,
-                152,
-                52,
-                108,
-                41,
-                160,
-                169,
-                155,
-                157,
-                10,
-                128,
+                50,
+                72,
+                42,
+                34,
+                159,
+                131,
+                186,
+                206,
+                45,
+                164,
                 201,
-                237,
-                227,
-                122,
-                119,
-                199,
-                253,
-                147,
-                234,
-                210,
-                149,
-                253,
-                176,
-                27,
-                137,
-                94,
-                241,
-                57,
-                44,
-                80,
-                135,
-                181,
-                96,
+                11,
+                77,
+                217,
+                156,
+                138,
+                115,
+                6,
+                58,
+                106,
+                141,
+                220,
+                91,
+                214,
+                204,
                 153,
-                242,
-                94,
-                246,
-                31,
-                128,
-                50,
-                185,
-                20,
-                99,
+                222,
+                216,
+                112,
                 100,
+                145,
+                42,
                 96,
+                173,
+                222,
+                239,
+                148,
+                216,
                 152,
-                44,
-                92,
-                198,
+                200,
+                142,
+                64,
+                219,
+                222,
+                255,
+                145,
+                197,
                 241,
-                52,
-                239,
-                29,
-                218,
-                231,
-                102,
-                87,
-                242,
-                203,
-                254,
-                193,
-                235,
-                252,
-                141,
-                9,
-                115,
+                5,
+                249,
+                207,
+                44,
                 116,
-                8,
-                13,
-                246,
-                252,
-                240,
-                220,
-                184,
+                127,
+                182,
+                242,
                 188,
-                75,
-                13,
-                142,
-                10,
+                55,
+                236,
+                3,
+                214,
+                201,
+                30,
+                219,
+                46,
+                26,
+                87,
+                140,
                 245,
-                216,
-                14,
-                187,
-                255,
-                43,
-                76,
-                89,
-                159,
-                84,
-                244,
-                45,
-                99,
-                18,
-                223,
-                195,
-                20,
-                39,
-                96,
-                120,
-                193,
-                204,
-                52,
-                126,
-                187,
+                68,
                 190,
-                197,
-                25,
                 139,
+                9,
+                49,
                 226,
-                88,
-                81,
-                63,
-                56,
-                107,
-                147,
+                95,
+                36,
+                61,
+                89,
+                176,
+                195,
                 13,
-                2,
-                194,
-                116,
-                154,
-                128,
-                62,
-                35,
-                48,
-                149,
-                94,
-                189,
-                26,
-                16,
-                32,
-                203,
-                102,
-                81,
-                231,
-                227,
-                62,
-                133,
-                128,
-                82,
-                172,
-                128,
-                160,
-                66,
-                220,
-                100,
-                44,
-                76,
-                81,
-                90,
-                157,
-                141,
-                9,
-                51,
-                103,
                 152,
-                49,
-                100,
-                219,
-                11,
-                122,
-                111,
-                172,
-                32,
-                207,
-                136,
-                11,
-                207,
-                233,
-                27,
-                111,
-                229,
-                25,
-                40,
-                88,
-                39,
-                71,
-                22,
-                200,
-                16,
-                132,
-                203,
-                110,
-                41,
-                43,
-                82,
-                213,
-                213,
-                214,
-                217,
-                106,
-                48,
-                242,
+                161,
+                108,
                 227,
-                234,
-                136,
-                48,
-                132,
-                51,
-                104,
-                180,
-                35,
-                134,
-                184,
-                250,
-                233,
-                184,
-                252,
-                132,
-                203,
-                143,
-                130,
-                190,
-                89,
-                79,
-                35,
-                164,
+                186,
+                29,
+                108,
+                241,
+                215,
+                245,
+                4,
+                38,
+                153,
+                46,
+                176,
+                173,
+                179,
+                19,
+                75,
+                5,
+                91,
+                232,
+                20,
+                13,
+                45,
+                181,
+                242,
+                95,
+                176,
+                13,
+                131,
+                248,
+                228,
+                34,
+                43,
+                240,
+                31,
+                214,
                 172,
-                124,
+                147,
                 161,
-                131,
-                231,
-                233,
-                47,
-                142,
-                173,
-                185,
-                209,
-                100,
-                170,
-                167,
-                145,
-                170,
+                255,
+                77,
+                121,
+                218,
+                88,
+                242,
+                32,
+                97,
+                138,
+                198,
+                62,
+                136,
+                198,
+                103,
+                175,
+                249,
+                91,
+                77,
+                120,
+                56,
+                146,
+                191,
+                105,
+                25,
+                87,
+                27,
+                118,
+                59,
+                62,
+                33,
+                84,
+                159,
+                132,
+                242,
+                67,
+                253,
+                50,
+                9,
+                132,
+                32,
+                211,
+                127,
+                23,
+                124,
+                68,
+                158,
+                122,
+                141,
+                69,
+                188,
+                41,
+                144,
                 117,
+                211,
                 169,
                 65,
-                129,
-                197,
-                80,
-                165,
-                227,
-                124,
+                239,
+                69,
+                38,
+                170,
+                84,
+                174,
+                198,
+                7,
+                179,
+                110,
+                215,
+                182,
+                252,
+                113,
+                72,
+                226,
+                48,
+                133,
+                8,
+                105,
+                153,
+                110,
+                47,
+                196,
+                176,
+                44,
+                252,
+                140,
+                171,
+                99,
+                25,
+                5,
+                109,
+                170,
+                61,
+                34,
+                234,
+                19,
+                78,
+                134,
+                220,
+                12,
+                12,
+                146,
+                181,
+                134,
+                46,
+                50,
+                246,
+                204,
+                83,
+                195,
+                216,
+                58,
+                47,
+                246,
+                133,
                 52,
-                71,
-                172,
+                153,
+                89,
+                95,
+                128,
+                57,
+                13,
+                156,
                 11,
                 118,
                 97,
@@ -3760,7 +3470,7 @@
                 111,
                 114,
                 45,
-                48,
+                50,
                 0,
                 0,
                 0,
@@ -3784,11 +3494,11 @@
                 99,
                 112,
                 47,
+                54,
                 53,
-                50,
-                48,
-                56,
-                55,
+                52,
+                53,
+                54,
                 47,
                 104,
                 116,
@@ -3814,36 +3524,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                48,
-                56,
-                57,
-                24,
-                47,
-                105,
-                112,
                 52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
-                53,
-                50,
-                48,
-                57,
                 53,
+                56,
                 24,
                 47,
                 105,
@@ -3864,12 +3549,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                48,
-                57,
-                55,
-                0,
+                52,
+                54,
+                52,
                 0,
                 0,
                 0,
@@ -3877,38 +3561,38 @@
                 0,
                 0,
                 0,
-                111,
-                108,
-                251,
-                55,
-                106,
+                121,
+                245,
+                173,
+                214,
+                62,
+                45,
+                78,
+                231,
+                42,
+                141,
+                80,
                 70,
-                0,
-                83,
-                166,
-                65,
-                77,
-                255,
-                24,
-                35,
-                226,
-                124,
-                182,
-                112,
-                225,
-                195,
+                101,
+                210,
+                114,
+                51,
+                185,
+                135,
+                223,
+                13,
+                169,
+                239,
+                245,
+                68,
+                254,
+                122,
+                133,
+                237,
+                80,
                 108,
-                2,
-                145,
-                10,
-                215,
-                79,
-                160,
-                179,
-                110,
-                91,
-                27,
-                7,
+                161,
+                30,
                 0,
                 0,
                 0,
@@ -3925,38 +3609,38 @@
                 0,
                 0,
                 0,
-                182,
-                37,
-                132,
+                164,
+                51,
+                96,
+                252,
+                84,
+                166,
+                231,
+                126,
+                125,
                 69,
-                191,
-                87,
-                35,
-                192,
-                23,
-                153,
-                64,
+                141,
+                222,
+                212,
+                230,
+                206,
+                158,
+                145,
+                216,
+                89,
+                46,
+                224,
+                195,
+                37,
+                168,
+                53,
+                214,
+                209,
+                133,
                 68,
-                151,
-                249,
-                39,
-                198,
-                66,
-                80,
-                154,
-                234,
-                83,
-                180,
-                249,
-                23,
-                44,
-                27,
-                124,
-                233,
-                248,
-                200,
-                162,
-                175,
+                191,
+                142,
+                226,
                 232,
                 3,
                 0,
@@ -3965,38 +3649,38 @@
                 0,
                 0,
                 0,
-                251,
-                91,
-                71,
-                93,
-                58,
-                113,
-                7,
-                34,
-                32,
-                73,
-                58,
-                239,
+                242,
+                245,
                 215,
-                234,
-                130,
-                32,
-                211,
-                15,
-                101,
-                233,
-                95,
-                183,
-                248,
-                96,
-                141,
-                116,
-                3,
+                89,
+                82,
+                128,
+                97,
+                158,
+                1,
+                156,
+                124,
+                176,
+                4,
+                137,
                 192,
-                80,
-                95,
-                180,
-                167,
+                182,
+                113,
+                144,
+                74,
+                11,
+                72,
+                130,
+                17,
+                145,
+                107,
+                150,
+                212,
+                219,
+                236,
+                228,
+                205,
+                29,
                 1,
                 0,
                 0,
@@ -4008,62 +3692,62 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
+                124,
+                204,
+                61,
+                163,
+                2,
                 6,
                 0,
                 0,
-                92,
-                165,
-                189,
-                208,
-                85,
-                1,
+                174,
+                210,
+                94,
+                232,
+                170,
                 0,
-                161,
-                32,
-                121,
-                162,
-                33,
-                90,
-                5,
                 0,
-                164,
-                195,
-                143,
-                144,
-                61,
-                151,
-                68,
-                202,
-                34,
-                67,
-                11,
-                174,
-                222,
+                145,
+                108,
                 209,
-                188,
-                55,
-                192,
-                237,
-                61,
+                118,
+                87,
+                87,
+                5,
+                0,
+                60,
+                50,
+                180,
+                43,
+                227,
+                162,
+                219,
+                29,
+                125,
+                221,
+                81,
+                200,
+                83,
                 117,
-                206,
-                85,
+                18,
+                127,
+                246,
+                174,
+                251,
+                39,
                 104,
+                52,
+                25,
                 62,
-                105,
-                189,
-                61,
-                31,
-                196,
-                11,
-                103,
-                48,
-                3,
+                70,
+                158,
+                1,
+                226,
+                93,
+                72,
+                245,
+                85,
+                2,
                 0,
                 0,
                 0,
@@ -4095,38 +3779,38 @@
                 0,
                 0,
                 0,
-                86,
-                11,
-                133,
-                42,
-                34,
-                128,
-                46,
-                144,
-                245,
-                237,
-                103,
-                194,
-                141,
-                145,
+                81,
+                125,
+                125,
                 70,
-                227,
-                187,
                 103,
-                72,
-                225,
-                126,
+                63,
+                184,
                 12,
-                195,
-                94,
-                216,
-                109,
-                11,
-                185,
-                136,
-                231,
-                209,
-                101,
+                3,
+                228,
+                100,
+                158,
+                86,
+                236,
+                215,
+                25,
+                233,
+                65,
+                9,
+                225,
+                127,
+                207,
+                98,
+                242,
+                200,
+                41,
+                56,
+                223,
+                20,
+                82,
+                36,
+                144,
                 0,
                 0,
                 0,
@@ -4144,11 +3828,11 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
+                124,
+                204,
+                61,
+                163,
+                2,
                 6,
                 0,
                 232,
@@ -4167,38 +3851,38 @@
                 0,
                 0,
                 0,
-                48,
-                196,
-                28,
-                202,
-                166,
-                13,
-                73,
-                199,
-                135,
-                166,
-                25,
-                93,
-                219,
-                125,
-                63,
-                116,
-                202,
-                177,
-                217,
-                91,
-                147,
-                64,
-                31,
-                161,
+                49,
+                246,
                 218,
-                162,
-                170,
-                69,
-                161,
+                38,
+                205,
+                194,
+                217,
+                99,
+                178,
+                200,
+                79,
+                165,
+                209,
+                164,
+                114,
+                99,
+                171,
+                118,
+                230,
+                130,
+                90,
+                255,
+                202,
+                41,
+                223,
+                145,
                 76,
-                100,
-                232,
+                62,
+                88,
+                164,
+                241,
+                120,
                 0,
                 0,
                 0,
@@ -4207,250 +3891,250 @@
                 0,
                 0,
                 0,
-                72,
-                217,
-                15,
-                101,
-                11,
-                244,
-                216,
-                122,
-                209,
-                41,
-                236,
-                71,
-                57,
-                46,
+                69,
+                228,
+                93,
+                189,
+                144,
+                86,
+                66,
+                204,
+                44,
+                169,
                 195,
-                138,
-                140,
-                108,
-                11,
-                181,
-                234,
-                75,
-                109,
-                171,
-                97,
-                14,
-                58,
-                132,
-                20,
-                49,
-                171,
-                153,
+                207,
+                209,
+                160,
+                161,
+                249,
+                81,
+                119,
+                88,
+                229,
+                217,
+                141,
+                235,
+                103,
                 96,
-                173,
-                222,
-                239,
-                148,
-                216,
-                152,
-                200,
-                142,
                 64,
-                219,
-                222,
-                255,
-                145,
-                197,
+                196,
+                147,
+                64,
+                200,
+                178,
+                103,
+                96,
+                179,
+                253,
+                94,
+                251,
+                92,
+                135,
+                36,
+                3,
+                164,
+                173,
+                19,
                 241,
-                5,
-                249,
-                207,
-                44,
+                25,
+                149,
+                19,
+                96,
+                109,
+                35,
+                53,
+                74,
+                132,
+                82,
+                73,
+                174,
+                161,
+                87,
+                86,
+                76,
+                35,
+                255,
+                60,
+                21,
+                198,
+                201,
+                230,
+                82,
+                183,
+                45,
                 116,
-                127,
-                182,
-                242,
+                14,
+                140,
+                172,
+                185,
+                60,
                 188,
-                55,
-                236,
-                3,
-                214,
-                201,
-                30,
-                219,
-                46,
-                26,
-                87,
-                140,
-                245,
-                68,
-                190,
-                139,
-                9,
-                49,
-                226,
-                95,
-                36,
-                61,
-                89,
-                176,
-                195,
-                13,
-                152,
-                161,
-                108,
-                227,
-                186,
-                29,
-                108,
-                241,
-                215,
-                245,
-                4,
-                38,
-                153,
-                46,
-                176,
-                173,
-                179,
-                19,
-                75,
+                192,
+                104,
+                107,
+                14,
+                192,
+                204,
+                12,
+                28,
+                118,
+                11,
+                251,
+                66,
+                180,
+                54,
+                81,
+                159,
+                197,
+                168,
                 5,
-                91,
-                232,
-                20,
-                13,
-                45,
-                181,
+                75,
+                118,
+                83,
+                58,
+                151,
+                169,
                 242,
-                95,
-                176,
-                13,
-                131,
-                248,
-                228,
-                34,
-                43,
-                240,
-                31,
-                214,
-                172,
-                147,
+                57,
+                135,
+                208,
+                151,
+                239,
+                150,
+                177,
+                242,
+                82,
+                107,
+                178,
+                7,
+                63,
                 161,
-                255,
-                77,
-                121,
-                218,
-                88,
+                10,
+                119,
+                25,
+                148,
+                23,
+                114,
+                52,
+                126,
                 242,
-                32,
-                157,
-                111,
-                65,
-                91,
-                154,
                 116,
-                26,
+                244,
                 32,
-                81,
-                165,
-                157,
-                125,
-                130,
-                182,
-                69,
-                127,
-                200,
-                123,
+                44,
+                195,
+                142,
+                100,
+                204,
+                221,
+                210,
+                56,
+                220,
+                159,
+                252,
+                43,
+                109,
+                45,
+                129,
                 212,
-                219,
-                165,
-                4,
-                238,
-                15,
-                68,
+                168,
+                89,
+                191,
+                44,
+                18,
+                142,
+                55,
+                166,
+                147,
                 169,
-                73,
-                115,
-                59,
-                197,
-                138,
-                254,
+                39,
+                81,
+                113,
+                109,
+                74,
+                111,
                 32,
-                72,
-                185,
-                38,
-                230,
-                150,
-                233,
-                38,
-                148,
+                67,
+                83,
+                247,
+                195,
+                31,
+                24,
+                188,
                 165,
+                86,
+                175,
+                68,
                 17,
-                3,
-                58,
-                186,
-                78,
-                49,
-                172,
-                39,
-                198,
-                43,
-                231,
-                128,
-                216,
-                233,
-                5,
-                174,
-                222,
-                133,
-                66,
-                72,
+                34,
+                236,
+                33,
+                55,
+                120,
+                104,
+                114,
+                61,
+                167,
+                69,
+                129,
+                149,
+                36,
+                40,
                 216,
-                253,
-                39,
+                145,
+                186,
+                240,
+                203,
+                190,
                 48,
-                179,
-                18,
-                62,
                 181,
-                29,
-                193,
+                111,
+                79,
+                167,
+                197,
+                9,
                 154,
-                105,
-                231,
-                94,
-                0,
-                253,
-                147,
-                164,
-                152,
-                191,
-                209,
-                90,
-                200,
-                210,
-                59,
-                88,
-                101,
-                171,
-                112,
-                145,
-                55,
-                221,
-                230,
-                140,
-                56,
-                240,
-                86,
+                150,
+                224,
+                28,
+                60,
+                46,
+                8,
+                148,
+                63,
                 84,
-                193,
-                49,
-                6,
-                45,
-                237,
-                198,
-                215,
-                147,
-                111,
-                94,
-                143,
-                129,
-                109,
-                183,
+                203,
+                153,
+                87,
+                15,
+                26,
+                86,
+                208,
+                145,
+                204,
+                145,
+                25,
+                124,
+                35,
+                62,
+                14,
+                136,
+                91,
+                231,
+                161,
+                80,
+                201,
+                205,
+                64,
+                58,
+                13,
+                96,
+                245,
+                185,
+                36,
+                46,
+                134,
+                189,
                 11,
                 118,
                 97,
@@ -4462,7 +4146,7 @@
                 111,
                 114,
                 45,
-                50,
+                51,
                 0,
                 0,
                 0,
@@ -4486,11 +4170,11 @@
                 99,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                49,
-                53,
+                52,
+                54,
+                54,
                 47,
                 104,
                 116,
@@ -4516,11 +4200,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                49,
-                55,
+                52,
+                54,
+                56,
                 24,
                 47,
                 105,
@@ -4541,37 +4225,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                50,
-                51,
-                24,
-                47,
-                105,
-                112,
                 52,
-                47,
-                49,
-                50,
                 55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
-                53,
-                50,
-                49,
-                50,
-                53,
-                0,
+                52,
                 0,
                 0,
                 0,
@@ -4579,38 +4237,38 @@
                 0,
                 0,
                 0,
-                245,
-                129,
-                174,
+                209,
+                199,
+                154,
+                78,
+                21,
+                110,
+                135,
+                195,
+                67,
+                136,
+                35,
                 94,
-                253,
-                236,
-                254,
-                169,
-                210,
-                13,
-                151,
-                145,
-                128,
-                169,
-                56,
-                66,
-                49,
-                90,
-                127,
-                254,
-                26,
-                181,
-                229,
-                54,
-                109,
-                20,
-                56,
-                103,
-                14,
-                16,
-                207,
-                50,
+                39,
+                97,
+                239,
+                158,
+                2,
+                153,
+                53,
+                161,
+                61,
+                9,
+                6,
+                74,
+                159,
+                148,
+                70,
+                72,
+                180,
+                122,
+                44,
+                178,
                 0,
                 0,
                 0,
@@ -4627,38 +4285,38 @@
                 0,
                 0,
                 0,
-                53,
-                11,
-                141,
-                159,
-                199,
-                174,
-                192,
-                150,
-                68,
-                81,
-                180,
-                184,
-                90,
-                118,
-                142,
-                78,
-                57,
-                233,
-                107,
+                38,
+                175,
+                8,
                 245,
-                123,
-                23,
-                55,
-                108,
-                96,
-                29,
-                244,
-                253,
+                39,
+                20,
+                18,
+                239,
+                5,
+                160,
+                19,
+                43,
+                237,
+                138,
+                215,
                 107,
+                149,
                 49,
+                242,
+                105,
+                61,
+                6,
+                20,
+                174,
+                86,
+                220,
+                229,
+                145,
+                50,
+                170,
                 76,
-                18,
+                138,
                 232,
                 3,
                 0,
@@ -4667,38 +4325,38 @@
                 0,
                 0,
                 0,
-                87,
-                237,
-                32,
-                86,
-                222,
-                32,
+                26,
+                73,
                 49,
-                210,
-                53,
-                230,
-                10,
-                194,
-                125,
-                91,
-                46,
-                170,
-                128,
-                158,
-                85,
-                158,
+                169,
+                67,
+                19,
+                121,
+                35,
+                127,
+                251,
+                115,
+                102,
+                203,
                 11,
-                173,
-                248,
-                152,
-                226,
-                64,
-                231,
-                208,
-                252,
-                170,
-                26,
-                8,
+                73,
+                57,
+                227,
+                115,
+                5,
+                39,
+                92,
+                71,
+                87,
+                245,
+                250,
+                108,
+                229,
+                163,
+                116,
+                21,
+                52,
+                122,
                 1,
                 0,
                 0,
@@ -4710,63 +4368,62 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
+                124,
+                204,
+                61,
+                163,
+                2,
                 6,
                 0,
                 0,
-                92,
-                165,
-                189,
-                208,
-                85,
-                1,
+                174,
+                210,
+                94,
+                232,
+                170,
                 0,
-                161,
-                32,
-                121,
-                162,
-                33,
-                90,
-                5,
                 0,
-                63,
-                107,
-                147,
-                31,
-                121,
-                253,
-                11,
-                42,
-                20,
-                237,
-                118,
-                165,
-                178,
-                55,
-                20,
-                52,
-                76,
-                66,
-                31,
-                153,
-                162,
-                204,
+                145,
+                108,
                 209,
-                151,
-                142,
-                242,
-                39,
-                14,
-                22,
                 118,
-                20,
-                204,
-                3,
+                87,
+                87,
+                5,
                 0,
+                19,
+                28,
+                67,
+                124,
+                172,
+                129,
+                201,
+                135,
+                94,
+                72,
+                64,
+                197,
+                38,
+                95,
+                35,
+                44,
+                43,
+                75,
+                225,
+                178,
+                139,
+                236,
+                218,
+                45,
+                144,
+                227,
+                8,
+                251,
+                114,
+                45,
+                40,
+                137,
+                2,
                 0,
                 0,
                 0,
@@ -4797,38 +4454,39 @@
                 0,
                 0,
                 0,
-                13,
-                83,
-                208,
-                2,
-                216,
-                71,
-                135,
-                76,
-                196,
-                240,
-                55,
-                169,
-                172,
-                163,
-                129,
-                77,
+                0,
+                225,
+                151,
+                122,
+                183,
+                140,
+                80,
+                88,
+                134,
+                103,
+                4,
+                35,
+                29,
+                155,
+                30,
+                74,
+                213,
+                228,
+                35,
+                178,
+                125,
+                105,
                 167,
-                141,
-                222,
                 234,
-                139,
-                250,
-                125,
-                75,
-                145,
-                233,
-                139,
-                57,
-                119,
-                196,
-                24,
-                85,
+                254,
+                209,
+                95,
+                150,
+                138,
+                239,
+                111,
+                38,
+                232,
                 0,
                 0,
                 0,
@@ -4846,11 +4504,11 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
+                124,
+                204,
+                61,
+                163,
+                2,
                 6,
                 0,
                 232,
@@ -4869,38 +4527,78 @@
                 0,
                 0,
                 0,
-                219,
                 119,
-                163,
-                77,
-                109,
+                115,
+                238,
+                13,
+                243,
+                22,
+                28,
+                78,
+                108,
+                60,
+                101,
+                25,
+                123,
+                138,
+                116,
+                103,
                 87,
-                164,
+                57,
+                235,
+                83,
+                123,
+                185,
+                5,
+                43,
+                108,
+                250,
+                199,
+                194,
+                8,
+                58,
+                14,
+                13,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                255,
+                42,
+                54,
                 155,
-                190,
-                236,
-                145,
-                24,
-                50,
-                181,
-                141,
-                163,
-                62,
-                29,
-                37,
-                149,
-                161,
-                187,
-                246,
-                10,
-                50,
-                162,
-                143,
+                16,
+                100,
+                224,
+                39,
+                217,
+                65,
+                114,
+                0,
+                139,
+                225,
+                83,
                 252,
-                237,
-                179,
-                142,
-                209,
+                84,
+                75,
+                243,
+                235,
+                17,
+                199,
+                41,
+                252,
+                146,
+                124,
+                26,
+                180,
+                181,
+                181,
+                29,
+                244,
                 0,
                 0,
                 0,
@@ -4909,370 +4607,79 @@
                 0,
                 0,
                 0,
-                50,
-                130,
-                23,
-                143,
-                241,
-                103,
-                208,
-                42,
-                3,
-                62,
-                137,
-                209,
-                40,
-                10,
-                30,
-                194,
-                95,
-                157,
-                208,
-                105,
-                160,
-                241,
+                0,
+                245,
                 64,
-                12,
-                36,
-                65,
-                146,
-                241,
-                247,
-                92,
-                186,
-                188,
-                96,
-                179,
-                253,
-                94,
-                251,
-                92,
-                135,
-                36,
-                3,
-                164,
-                173,
-                19,
-                241,
-                25,
-                149,
-                19,
-                96,
-                109,
-                35,
-                53,
-                74,
-                132,
-                82,
-                73,
+                131,
+                228,
+                230,
+                202,
+                193,
+                136,
+                58,
+                201,
+                134,
+                167,
                 174,
-                161,
-                87,
-                86,
-                76,
-                35,
-                255,
-                60,
-                21,
+                61,
+                63,
+                171,
+                27,
+                171,
+                150,
+                193,
+                39,
+                53,
+                93,
+                49,
+                184,
                 198,
-                201,
-                230,
-                82,
-                183,
-                45,
-                116,
-                14,
+                180,
+                117,
+                20,
+                160,
+                225,
+                139,
+                4,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                100,
+                96,
                 140,
-                172,
-                185,
-                60,
-                188,
-                192,
-                104,
-                107,
-                14,
-                192,
-                204,
-                12,
-                28,
-                118,
-                11,
-                251,
-                66,
+                115,
+                178,
+                133,
+                212,
+                21,
+                85,
                 180,
-                54,
-                81,
-                159,
-                197,
-                168,
-                5,
-                75,
-                118,
-                83,
-                58,
-                151,
-                169,
-                242,
-                57,
-                135,
-                208,
-                151,
+                158,
+                44,
+                146,
+                235,
+                132,
+                110,
+                13,
                 239,
-                150,
-                177,
-                242,
-                82,
-                107,
-                178,
-                7,
-                63,
-                161,
-                10,
-                119,
-                25,
-                148,
-                23,
-                114,
-                52,
-                126,
-                242,
-                116,
-                244,
-                32,
-                186,
-                104,
-                213,
-                91,
-                218,
-                163,
-                181,
+                115,
                 223,
-                208,
-                177,
-                219,
-                199,
-                179,
-                145,
-                245,
-                154,
-                172,
-                70,
-                98,
-                48,
-                93,
-                0,
-                253,
-                230,
-                76,
-                154,
-                76,
                 110,
-                236,
-                134,
-                14,
-                117,
-                32,
-                7,
-                134,
-                124,
-                99,
-                82,
-                250,
-                224,
-                138,
-                194,
-                105,
-                98,
-                161,
-                155,
-                103,
-                211,
-                145,
-                87,
-                27,
-                138,
-                230,
-                219,
-                213,
-                59,
-                58,
-                230,
-                35,
-                134,
-                160,
-                69,
-                70,
-                5,
-                103,
-                48,
+                114,
+                226,
+                165,
                 144,
-                238,
-                206,
-                27,
-                158,
-                108,
-                237,
-                242,
-                132,
-                172,
-                88,
-                33,
-                180,
-                55,
-                105,
-                22,
-                117,
-                124,
-                154,
-                184,
-                220,
-                33,
-                23,
-                196,
-                29,
-                87,
-                181,
-                60,
-                222,
-                146,
-                252,
-                251,
-                23,
-                170,
-                22,
-                100,
-                150,
-                209,
-                54,
-                177,
-                108,
-                181,
+                102,
+                85,
+                239,
                 12,
-                50,
-                42,
-                25,
-                133,
-                43,
-                11,
-                118,
-                97,
-                108,
-                105,
-                100,
-                97,
-                116,
-                111,
-                114,
+                249,
+                109,
                 45,
-                51,
-                0,
-                0,
-                0,
-                29,
-                47,
-                105,
-                112,
-                52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                116,
-                99,
-                112,
-                47,
-                53,
-                50,
-                49,
-                50,
-                57,
-                47,
-                104,
-                116,
-                116,
-                112,
-                24,
-                47,
-                105,
-                112,
-                52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
-                53,
-                50,
-                49,
-                51,
-                49,
-                24,
-                47,
-                105,
-                112,
-                52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
-                53,
-                50,
-                49,
-                51,
-                55,
-                24,
-                47,
-                105,
-                112,
-                52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
-                53,
-                50,
-                49,
-                51,
-                57,
                 0,
                 0,
                 0,
@@ -5281,38 +4688,38 @@
                 0,
                 0,
                 0,
-                167,
-                69,
-                231,
                 171,
-                22,
-                87,
-                230,
-                137,
-                122,
+                39,
+                109,
+                25,
+                86,
+                101,
                 155,
+                65,
+                21,
+                200,
+                37,
+                226,
                 115,
-                67,
-                34,
-                144,
-                147,
-                123,
-                26,
-                4,
-                108,
-                11,
-                211,
-                40,
-                136,
-                229,
-                98,
-                147,
-                57,
-                133,
-                122,
-                176,
-                98,
-                125,
+                169,
+                182,
+                74,
+                60,
+                111,
+                254,
+                140,
+                247,
+                230,
+                222,
+                63,
+                45,
+                45,
+                35,
+                196,
+                16,
+                111,
+                145,
+                85,
                 0,
                 0,
                 0,
@@ -5321,226 +4728,39 @@
                 0,
                 0,
                 0,
-                196,
-                9,
                 0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                98,
-                84,
-                73,
-                35,
-                238,
-                36,
-                120,
-                182,
-                53,
-                204,
-                253,
-                142,
-                197,
-                168,
-                56,
-                27,
-                133,
-                121,
-                187,
-                11,
-                224,
-                185,
-                166,
-                209,
-                34,
-                6,
-                52,
-                1,
-                193,
-                148,
-                253,
-                48,
-                232,
-                3,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                12,
-                179,
-                128,
-                203,
-                50,
-                90,
-                131,
-                15,
-                3,
-                238,
-                75,
-                218,
-                121,
-                11,
-                5,
-                225,
+                254,
+                222,
+                88,
+                194,
+                222,
+                164,
+                236,
+                45,
                 117,
-                83,
-                128,
-                22,
-                245,
-                212,
-                124,
-                179,
-                82,
-                201,
-                60,
-                198,
-                218,
-                220,
-                19,
-                4,
-                1,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                56,
-                111,
-                132,
-                8,
-                177,
-                6,
-                0,
-                0,
-                92,
-                165,
-                189,
-                208,
-                85,
-                1,
-                0,
-                161,
-                32,
-                121,
-                162,
-                33,
-                90,
-                5,
-                0,
-                123,
-                148,
-                172,
-                91,
-                189,
+                125,
+                80,
+                122,
                 1,
-                12,
-                106,
                 119,
-                84,
-                85,
-                227,
-                223,
-                27,
-                108,
-                154,
-                141,
-                36,
-                169,
-                246,
-                194,
-                169,
-                194,
-                2,
-                85,
-                184,
-                114,
-                184,
-                18,
-                253,
-                191,
-                135,
-                3,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                120,
-                242,
-                231,
-                14,
-                134,
-                130,
-                104,
-                11,
-                103,
+                21,
+                186,
+                58,
+                42,
                 210,
-                189,
-                19,
-                28,
-                11,
-                147,
-                107,
-                81,
-                11,
-                11,
-                65,
-                86,
-                11,
-                202,
-                206,
-                15,
-                46,
+                122,
+                75,
+                254,
                 158,
-                1,
+                92,
+                161,
+                201,
                 100,
-                197,
-                160,
-                6,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                200,
-                0,
+                39,
+                218,
+                24,
+                41,
+                151,
                 0,
                 0,
                 0,
@@ -5548,22 +4768,13 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
-                6,
                 0,
-                232,
-                3,
                 0,
                 0,
                 0,
                 0,
                 0,
                 0,
-                200,
                 0,
                 0,
                 0,
@@ -5571,1027 +4782,97 @@
                 0,
                 0,
                 0,
-                211,
-                120,
-                82,
-                183,
-                112,
-                80,
-                203,
-                13,
-                147,
-                76,
-                148,
-                115,
-                172,
-                242,
-                93,
-                194,
-                226,
-                79,
-                116,
-                169,
-                48,
-                72,
-                230,
-                175,
-                70,
-                79,
-                244,
-                144,
-                173,
-                213,
-                121,
-                156,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                89,
-                0,
-                134,
-                29,
-                192,
-                94,
-                22,
-                228,
-                35,
-                15,
-                103,
-                223,
-                102,
-                125,
-                164,
-                0,
-                182,
-                241,
-                173,
-                148,
-                115,
-                76,
-                12,
-                134,
-                255,
-                200,
-                115,
-                21,
-                201,
-                216,
-                29,
-                213,
-                1,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                116,
-                140,
-                27,
-                170,
-                209,
-                171,
-                17,
-                61,
-                7,
-                56,
-                218,
-                138,
-                21,
-                4,
-                220,
-                241,
-                80,
-                162,
-                255,
-                203,
-                11,
-                22,
-                170,
-                48,
-                59,
-                7,
-                101,
-                161,
-                69,
-                24,
-                201,
-                112,
-                5,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                247,
-                48,
-                198,
-                197,
-                187,
-                95,
-                147,
-                209,
-                15,
-                245,
-                38,
-                60,
-                142,
-                201,
-                225,
-                91,
-                113,
-                53,
-                180,
-                225,
-                99,
-                175,
-                83,
-                223,
-                59,
-                116,
-                194,
-                11,
-                151,
-                235,
-                146,
-                196,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                80,
-                80,
-                142,
-                127,
-                158,
-                232,
-                36,
-                13,
-                132,
-                21,
-                170,
-                224,
-                230,
-                25,
-                125,
-                12,
-                24,
-                68,
-                177,
-                231,
-                44,
-                91,
-                31,
-                217,
-                105,
-                9,
-                198,
-                144,
-                96,
-                16,
-                146,
-                139,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                117,
-                254,
-                42,
-                52,
-                238,
-                250,
-                101,
-                84,
-                49,
-                145,
-                237,
-                191,
-                142,
-                110,
-                6,
-                188,
-                55,
-                241,
-                1,
-                107,
-                182,
-                234,
-                227,
-                213,
-                34,
-                177,
-                229,
-                70,
-                184,
-                220,
-                217,
-                51,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                96,
-                255,
-                222,
-                2,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                96,
-                234,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                4,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                150,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                141,
-                73,
-                253,
-                26,
-                7,
-                0,
-                0,
-                192,
-                41,
-                247,
-                61,
-                84,
-                5,
-                0,
-                0,
-                128,
-                198,
-                164,
-                126,
-                141,
-                3,
-                0,
-                7,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                153,
-                48,
-                123,
-                170,
-                237,
-                150,
-                85,
-                58,
-                253,
-                170,
-                119,
-                84,
-                156,
-                116,
-                215,
-                211,
-                179,
-                29,
-                196,
-                212,
-                126,
-                30,
-                21,
-                144,
-                136,
-                246,
-                168,
-                36,
-                73,
-                149,
-                230,
-                173,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                232,
-                3,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                45,
-                35,
-                248,
-                175,
-                146,
-                1,
-                0,
-                0,
-                141,
-                159,
-                48,
-                47,
-                164,
-                128,
-                59,
-                91,
-                130,
-                122,
-                142,
-                115,
-                144,
-                23,
-                163,
-                64,
-                108,
-                107,
-                72,
-                181,
-                174,
-                239,
-                219,
-                205,
-                93,
-                109,
-                38,
-                203,
-                113,
-                12,
-                216,
-                183,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0
-              ]
-            }
-          },
-          "owner": {
-            "ObjectOwner": "0x0000000000000000000000000000000000000000000000000000000000000005"
-          },
-          "previous_transaction": "7D8EoGyF5bEHXCwfBJUZ6cJBbkFs7Fvzy9UY2jL6WXGm",
-          "storage_rebate": 26980000
-        }
-      ],
-      "output_objects": [
-        {
-          "data": {
-            "Move": {
-              "type_": {
-                "Other": {
-                  "address": "0000000000000000000000000000000000000000000000000000000000000003",
-                  "module": "iota_system",
-                  "name": "IotaSystemState",
-                  "type_args": []
-                }
-              },
-              "has_public_transfer": false,
-              "version": 7,
-              "contents": [
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                5,
-                2,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0
-              ]
-            }
-          },
-          "owner": {
-            "Shared": {
-              "initial_shared_version": 1
-            }
-          },
-          "previous_transaction": "93PPEMeHQJUoVDVpEyTAEsyByUjrQTs4SPhSgM2wyfy6",
-          "storage_rebate": 35902400
-        },
-        {
-          "data": {
-            "Move": {
-              "type_": {
-                "Other": {
-                  "address": "0000000000000000000000000000000000000000000000000000000000000002",
-                  "module": "dynamic_field",
-                  "name": "Field",
-                  "type_args": [
-                    "u64",
-                    {
-                      "struct": {
-                        "address": "0000000000000000000000000000000000000000000000000000000000000003",
-                        "module": "iota_system_state_inner",
-                        "name": "IotaSystemStateInnerV2",
-                        "type_args": []
-                      }
-                    }
-                  ]
-                }
-              },
-              "has_public_transfer": false,
-              "version": 7,
-              "contents": [
-                91,
-                137,
-                14,
-                175,
-                42,
-                188,
-                250,
-                42,
-                185,
-                11,
-                119,
-                184,
-                230,
-                243,
-                213,
-                216,
-                96,
-                149,
-                134,
-                195,
-                229,
-                131,
-                186,
-                243,
-                220,
-                205,
-                90,
-                241,
-                126,
-                223,
-                72,
-                209,
-                2,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                3,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                1,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                2,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                79,
-                119,
-                144,
-                163,
-                247,
-                191,
-                45,
-                221,
-                234,
-                6,
-                103,
-                112,
-                156,
-                173,
-                41,
-                65,
-                7,
-                198,
-                139,
-                39,
-                85,
-                185,
-                144,
-                234,
-                233,
-                27,
-                255,
-                32,
-                224,
-                150,
-                115,
-                205,
-                0,
-                199,
-                66,
-                95,
-                47,
-                245,
-                105,
-                43,
-                0,
-                80,
-                178,
-                216,
-                102,
-                186,
-                38,
-                0,
-                5,
-                199,
-                3,
-                84,
-                131,
-                185,
-                10,
-                227,
-                105,
-                243,
-                206,
-                72,
-                195,
-                151,
-                27,
-                245,
-                140,
-                25,
-                65,
-                121,
-                151,
-                116,
-                108,
-                103,
-                50,
-                12,
-                53,
-                209,
-                84,
-                166,
-                66,
-                90,
-                183,
-                96,
-                141,
-                207,
-                246,
-                209,
-                85,
-                4,
-                10,
-                101,
-                111,
-                72,
-                25,
-                177,
-                49,
-                17,
-                181,
-                44,
-                87,
-                70,
-                168,
-                107,
-                167,
-                47,
-                57,
-                95,
-                186,
-                254,
-                46,
-                195,
-                132,
-                125,
-                30,
-                129,
-                64,
-                230,
-                36,
-                167,
-                81,
-                253,
-                246,
-                181,
-                242,
-                5,
-                11,
-                199,
-                32,
-                92,
-                249,
-                211,
-                0,
-                4,
-                201,
-                11,
-                12,
-                116,
-                10,
-                255,
-                211,
-                38,
-                206,
-                103,
-                60,
-                194,
-                178,
-                58,
-                45,
-                36,
-                213,
-                62,
-                42,
-                254,
-                178,
-                134,
-                223,
-                198,
-                104,
-                253,
-                64,
-                96,
-                8,
-                157,
-                109,
-                43,
-                23,
-                183,
-                153,
-                221,
-                54,
-                249,
-                13,
-                51,
-                46,
-                84,
-                167,
-                163,
-                56,
-                212,
-                32,
-                54,
-                229,
-                149,
-                160,
-                153,
-                0,
-                149,
-                41,
-                2,
-                12,
-                159,
-                11,
-                237,
-                183,
-                232,
-                172,
-                239,
-                21,
-                94,
-                208,
-                184,
-                219,
-                158,
-                170,
-                43,
-                150,
-                93,
-                242,
-                32,
-                222,
-                246,
-                207,
-                32,
-                245,
-                64,
-                76,
-                18,
-                227,
-                129,
-                141,
-                164,
-                251,
-                225,
-                193,
-                225,
-                255,
-                222,
-                40,
-                239,
-                108,
-                248,
-                77,
-                176,
-                165,
-                136,
-                148,
-                156,
-                113,
-                25,
-                160,
-                250,
-                14,
-                98,
-                198,
-                178,
-                48,
-                148,
-                81,
-                45,
-                99,
-                42,
-                80,
-                47,
-                61,
-                69,
-                193,
-                153,
-                23,
-                69,
-                77,
-                65,
-                148,
-                12,
-                218,
-                166,
-                136,
-                89,
-                61,
-                102,
-                137,
-                39,
-                225,
-                90,
-                67,
-                159,
-                177,
-                77,
-                46,
-                144,
-                186,
+                0,
+                0,
+                0,
+                96,
+                234,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                4,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                150,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                141,
+                73,
+                253,
+                26,
+                7,
+                0,
+                0,
                 192,
-                151,
-                223,
-                1,
-                151,
-                220,
-                117,
-                33,
-                235,
-                142,
-                101,
-                76,
-                246,
-                207,
-                11,
-                118,
-                97,
-                108,
-                105,
-                100,
-                97,
-                116,
-                111,
-                114,
-                45,
-                49,
+                41,
+                247,
+                61,
+                84,
+                5,
                 0,
                 0,
+                128,
+                198,
+                164,
+                126,
+                141,
+                3,
                 0,
-                29,
-                47,
-                105,
-                112,
-                52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                116,
-                99,
-                112,
-                47,
-                53,
-                50,
-                49,
-                48,
-                49,
-                47,
-                104,
-                116,
-                116,
-                112,
-                24,
-                47,
-                105,
-                112,
-                52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
-                53,
-                50,
-                49,
-                48,
-                51,
-                24,
-                47,
-                105,
-                112,
-                52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
+                7,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                166,
+                4,
                 47,
-                117,
-                100,
                 112,
-                47,
-                53,
-                50,
-                49,
-                48,
+                189,
+                16,
+                209,
+                252,
+                102,
                 57,
-                24,
-                47,
-                105,
-                112,
-                52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
+                148,
+                80,
+                98,
+                167,
+                43,
+                219,
+                234,
+                27,
+                136,
+                160,
+                254,
+                187,
+                150,
+                197,
+                7,
+                70,
+                7,
+                202,
+                220,
                 47,
-                53,
-                50,
-                49,
-                49,
-                49,
+                159,
+                89,
                 0,
                 0,
                 0,
@@ -6600,38 +4881,23 @@
                 0,
                 0,
                 0,
-                158,
-                21,
-                4,
-                132,
-                147,
-                197,
-                55,
-                157,
-                104,
-                199,
-                11,
-                82,
-                210,
-                44,
-                230,
                 232,
-                51,
-                81,
-                13,
-                89,
-                112,
-                234,
-                251,
-                255,
-                56,
-                23,
-                190,
-                253,
-                67,
-                99,
-                84,
-                234,
+                3,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
                 0,
                 0,
                 0,
@@ -6640,87 +4906,99 @@
                 0,
                 0,
                 0,
-                208,
-                7,
                 0,
                 0,
                 0,
                 0,
                 0,
                 0,
-                58,
-                173,
-                132,
-                75,
-                224,
-                93,
-                90,
-                60,
-                253,
-                176,
-                39,
-                11,
-                172,
-                153,
-                12,
-                113,
-                237,
-                20,
-                103,
-                149,
-                114,
-                8,
-                32,
-                12,
-                59,
-                244,
-                40,
-                38,
-                44,
-                61,
-                175,
-                1,
-                232,
-                3,
                 0,
                 0,
                 0,
                 0,
                 0,
                 0,
-                232,
-                14,
+                0,
+                0,
+                0,
+                0,
+                0,
+                83,
+                125,
+                6,
+                216,
+                146,
+                1,
+                0,
+                0,
+                36,
+                82,
+                30,
+                65,
+                183,
+                192,
+                23,
                 72,
-                38,
-                40,
-                13,
-                121,
-                140,
-                248,
-                193,
-                87,
-                156,
-                150,
-                228,
-                154,
+                123,
+                231,
+                100,
+                128,
+                86,
+                159,
                 136,
-                166,
-                92,
-                15,
-                240,
-                225,
-                156,
-                124,
-                227,
-                251,
-                244,
-                22,
+                163,
+                24,
+                82,
+                67,
+                139,
+                141,
+                248,
+                200,
                 171,
-                191,
-                166,
-                19,
-                174,
-                1,
+                163,
+                5,
+                98,
+                244,
+                137,
+                223,
+                150,
+                206,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0
+              ]
+            }
+          },
+          "owner": {
+            "ObjectOwner": "0x0000000000000000000000000000000000000000000000000000000000000005"
+          },
+          "previous_transaction": "8eZxmVup35tyyVdZ31sKB9av3iNMKuJrxZ8ouJ4SRWtu",
+          "storage_rebate": 0
+        }
+      ],
+      "output_objects": [
+        {
+          "data": {
+            "Move": {
+              "type_": {
+                "Other": {
+                  "address": "0000000000000000000000000000000000000000000000000000000000000003",
+                  "module": "iota_system",
+                  "name": "IotaSystemState",
+                  "type_args": []
+                }
+              },
+              "has_public_transfer": false,
+              "version": 3,
+              "contents": [
+                0,
+                0,
+                0,
                 0,
                 0,
                 0,
@@ -6731,62 +5009,12 @@
                 0,
                 0,
                 0,
-                244,
-                17,
-                203,
-                109,
-                95,
-                7,
                 0,
                 0,
-                10,
-                120,
-                28,
-                185,
                 0,
-                2,
                 0,
-                73,
-                5,
-                86,
-                4,
-                171,
-                92,
-                5,
                 0,
-                194,
-                201,
-                221,
-                216,
                 0,
-                201,
-                14,
-                138,
-                159,
-                127,
-                2,
-                243,
-                83,
-                121,
-                253,
-                235,
-                224,
-                117,
-                50,
-                247,
-                30,
-                149,
-                57,
-                55,
-                252,
-                208,
-                79,
-                168,
-                76,
-                122,
-                36,
-                192,
-                4,
                 0,
                 0,
                 0,
@@ -6799,10 +5027,83 @@
                 0,
                 0,
                 0,
+                5,
+                1,
+                0,
+                0,
                 0,
                 0,
                 0,
                 0,
+                0
+              ]
+            }
+          },
+          "owner": {
+            "Shared": {
+              "initial_shared_version": 1
+            }
+          },
+          "previous_transaction": "326n9ZcQDrJVxyFL8aWkknSmFahVxwpqZQ5q5ySmWrUy",
+          "storage_rebate": 0
+        },
+        {
+          "data": {
+            "Move": {
+              "type_": {
+                "Other": {
+                  "address": "0000000000000000000000000000000000000000000000000000000000000002",
+                  "module": "dynamic_field",
+                  "name": "Field",
+                  "type_args": [
+                    "u64",
+                    {
+                      "struct": {
+                        "address": "0000000000000000000000000000000000000000000000000000000000000003",
+                        "module": "iota_system_state_inner",
+                        "name": "IotaSystemStateV1",
+                        "type_args": []
+                      }
+                    }
+                  ]
+                }
+              },
+              "has_public_transfer": false,
+              "version": 3,
+              "contents": [
+                106,
+                242,
+                162,
+                183,
+                202,
+                96,
+                191,
+                118,
+                23,
+                74,
+                223,
+                211,
+                233,
+                196,
+                149,
+                127,
+                142,
+                147,
+                119,
+                89,
+                96,
+                49,
+                130,
+                249,
+                180,
+                108,
+                127,
+                108,
+                95,
+                25,
+                198,
+                210,
+                1,
                 0,
                 0,
                 0,
@@ -6810,6 +5111,7 @@
                 0,
                 0,
                 0,
+                2,
                 0,
                 0,
                 0,
@@ -6817,363 +5119,315 @@
                 0,
                 0,
                 0,
+                1,
                 0,
-                28,
-                3,
-                133,
-                57,
-                100,
-                73,
-                32,
-                113,
-                183,
-                112,
-                201,
-                166,
-                191,
-                35,
-                47,
-                34,
-                32,
-                159,
-                48,
-                137,
-                3,
-                222,
-                105,
-                110,
-                220,
-                204,
-                41,
-                226,
-                63,
-                78,
-                18,
-                254,
                 0,
                 0,
                 0,
                 0,
                 0,
                 0,
+                1,
                 0,
                 0,
-                200,
                 0,
                 0,
                 0,
                 0,
                 0,
+                57,
+                250,
+                115,
+                22,
+                182,
+                11,
+                178,
+                229,
+                253,
+                205,
+                92,
+                179,
+                236,
+                134,
+                160,
+                75,
+                54,
+                44,
+                186,
+                33,
+                145,
+                160,
+                137,
+                160,
+                136,
+                5,
+                12,
+                185,
+                38,
+                134,
+                120,
+                155,
                 0,
+                224,
+                244,
+                68,
+                154,
+                59,
+                103,
+                43,
                 0,
+                224,
+                188,
+                17,
+                34,
+                196,
+                26,
                 0,
+                4,
+                59,
+                251,
+                52,
+                173,
+                111,
+                69,
+                44,
+                97,
+                173,
+                211,
+                105,
+                121,
+                206,
+                147,
+                8,
+                165,
+                7,
                 244,
+                202,
+                119,
+                73,
+                129,
+                123,
+                165,
+                161,
+                154,
+                87,
+                212,
+                255,
+                44,
+                213,
+                63,
+                96,
+                141,
+                207,
+                246,
+                209,
+                85,
+                4,
+                10,
+                101,
+                111,
+                72,
+                25,
+                177,
+                49,
                 17,
-                203,
-                109,
+                181,
+                44,
+                87,
+                70,
+                168,
+                107,
+                167,
+                47,
+                57,
                 95,
-                7,
-                0,
-                232,
-                3,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                200,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                215,
-                233,
-                197,
-                73,
+                186,
+                254,
+                46,
+                195,
+                132,
+                125,
+                30,
+                129,
+                64,
+                230,
+                36,
+                167,
+                81,
+                253,
+                246,
+                181,
+                242,
+                5,
+                11,
+                199,
+                32,
+                92,
+                249,
+                211,
                 0,
+                4,
+                201,
+                11,
+                12,
+                116,
+                10,
+                255,
+                211,
+                38,
+                206,
                 103,
-                112,
+                60,
+                194,
+                178,
+                58,
+                45,
+                36,
+                213,
+                62,
+                42,
+                254,
+                178,
+                134,
+                223,
+                198,
+                104,
+                253,
+                64,
+                96,
+                8,
+                157,
+                109,
+                43,
+                23,
+                183,
+                153,
+                221,
+                54,
+                249,
+                13,
+                51,
+                46,
+                84,
+                167,
+                163,
+                56,
+                212,
+                32,
+                32,
+                38,
+                163,
+                54,
+                223,
+                222,
+                200,
+                16,
+                231,
+                136,
+                101,
+                109,
+                60,
+                170,
+                54,
+                183,
+                183,
+                132,
+                232,
+                253,
+                218,
+                17,
+                151,
+                230,
+                164,
+                94,
+                212,
+                132,
+                90,
+                230,
+                7,
+                98,
                 32,
-                41,
-                241,
+                217,
+                53,
                 60,
-                231,
-                183,
-                150,
-                128,
-                181,
-                240,
-                93,
-                160,
-                34,
-                202,
-                137,
-                79,
-                180,
-                142,
-                204,
-                252,
-                45,
-                63,
-                115,
+                49,
                 54,
-                18,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
                 152,
-                52,
-                108,
-                41,
-                160,
-                169,
-                155,
-                157,
-                10,
-                128,
-                201,
-                237,
-                227,
-                122,
+                131,
                 119,
-                199,
-                253,
-                147,
+                1,
+                32,
+                5,
+                215,
+                206,
                 234,
+                120,
+                214,
                 210,
-                149,
-                253,
-                176,
-                27,
-                137,
-                94,
-                241,
-                57,
-                44,
-                80,
-                135,
-                181,
-                96,
-                153,
-                242,
-                94,
-                246,
-                31,
-                128,
-                50,
-                185,
-                20,
-                99,
-                100,
-                96,
-                152,
-                44,
-                92,
-                198,
-                241,
-                52,
-                239,
-                29,
-                218,
-                231,
-                102,
-                87,
-                242,
-                203,
+                148,
+                142,
+                129,
+                161,
+                106,
                 254,
-                193,
-                235,
-                252,
-                141,
-                9,
-                115,
-                116,
-                8,
-                13,
-                246,
-                252,
-                240,
-                220,
-                184,
+                253,
+                73,
                 188,
+                78,
+                237,
+                59,
                 75,
-                13,
-                142,
-                10,
-                245,
-                216,
-                14,
-                187,
-                255,
-                43,
-                76,
-                89,
-                159,
-                84,
-                244,
-                45,
-                99,
-                18,
-                223,
-                195,
-                20,
-                39,
-                96,
-                120,
-                193,
-                204,
-                52,
-                126,
-                187,
-                190,
-                197,
-                25,
-                139,
-                226,
-                88,
-                81,
+                133,
                 63,
-                56,
-                107,
-                147,
-                13,
-                2,
-                194,
-                116,
-                154,
-                128,
-                62,
-                35,
                 48,
-                149,
-                94,
-                189,
-                26,
-                16,
-                32,
-                203,
-                102,
-                81,
-                231,
-                227,
-                62,
-                133,
-                128,
-                82,
-                172,
-                128,
-                160,
-                66,
-                220,
-                100,
-                44,
+                175,
+                52,
                 76,
-                81,
-                90,
-                157,
-                141,
-                9,
-                51,
-                103,
-                152,
+                124,
+                156,
+                164,
+                117,
+                75,
+                204,
+                212,
                 49,
-                100,
-                219,
-                11,
-                122,
-                111,
-                172,
-                32,
-                207,
-                136,
-                11,
-                207,
-                233,
-                27,
-                111,
-                229,
-                25,
-                40,
-                88,
-                39,
-                71,
-                22,
-                200,
-                16,
-                132,
-                203,
+                8,
+                33,
+                96,
+                102,
+                254,
+                60,
+                113,
+                252,
+                79,
+                3,
+                66,
                 110,
-                41,
-                43,
-                82,
-                213,
-                213,
-                214,
-                217,
-                106,
-                48,
-                242,
-                227,
+                30,
+                211,
                 234,
+                248,
+                46,
+                26,
+                12,
+                142,
                 136,
-                48,
-                132,
-                51,
                 104,
-                180,
-                35,
-                134,
-                184,
-                250,
-                233,
-                184,
-                252,
-                132,
-                203,
-                143,
-                130,
-                190,
-                89,
-                79,
-                35,
-                164,
-                172,
-                124,
-                161,
-                131,
-                231,
-                233,
-                47,
-                142,
-                173,
-                185,
-                209,
-                100,
-                170,
-                167,
-                145,
-                170,
-                117,
-                169,
-                65,
+                199,
+                247,
                 129,
-                197,
-                80,
-                165,
-                227,
-                124,
-                52,
-                71,
-                172,
+                48,
+                228,
+                61,
+                39,
+                13,
+                72,
+                101,
+                101,
+                199,
+                19,
+                109,
+                21,
                 11,
                 118,
                 97,
@@ -7185,7 +5439,7 @@
                 111,
                 114,
                 45,
-                48,
+                49,
                 0,
                 0,
                 0,
@@ -7209,11 +5463,11 @@
                 99,
                 112,
                 47,
+                54,
                 53,
-                50,
-                48,
-                56,
-                55,
+                52,
+                52,
+                54,
                 47,
                 104,
                 116,
@@ -7239,11 +5493,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                48,
+                52,
+                52,
                 56,
-                57,
                 24,
                 47,
                 105,
@@ -7264,76 +5518,50 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                48,
-                57,
-                53,
-                24,
-                47,
-                105,
-                112,
                 52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
                 53,
-                50,
-                48,
-                57,
-                55,
-                0,
-                0,
+                52,
                 0,
                 0,
                 0,
                 0,
                 0,
                 0,
-                111,
-                108,
-                251,
-                55,
-                106,
-                70,
                 0,
-                83,
-                166,
-                65,
-                77,
-                255,
-                24,
-                35,
-                226,
-                124,
-                182,
-                112,
-                225,
-                195,
-                108,
-                2,
-                145,
-                10,
-                215,
-                79,
-                160,
+                237,
+                202,
+                141,
+                82,
+                243,
+                82,
+                185,
+                130,
+                172,
+                46,
+                92,
+                14,
+                227,
+                72,
+                139,
+                162,
+                213,
+                206,
+                89,
+                121,
                 179,
-                110,
-                91,
-                27,
-                7,
+                214,
+                64,
+                241,
+                40,
+                30,
+                200,
+                224,
+                136,
+                215,
+                39,
+                57,
                 0,
                 0,
                 0,
@@ -7342,46 +5570,46 @@
                 0,
                 0,
                 0,
-                208,
-                7,
+                196,
+                9,
                 0,
                 0,
                 0,
                 0,
                 0,
                 0,
-                182,
-                37,
-                132,
-                69,
-                191,
-                87,
-                35,
-                192,
-                23,
+                74,
+                247,
                 153,
-                64,
-                68,
-                151,
-                249,
-                39,
-                198,
-                66,
-                80,
-                154,
-                234,
-                83,
-                180,
-                249,
-                23,
-                44,
-                27,
+                224,
+                143,
                 124,
-                233,
-                248,
-                200,
+                199,
+                167,
+                208,
+                50,
+                229,
+                166,
+                53,
+                141,
+                230,
+                155,
+                237,
+                8,
+                69,
+                247,
                 162,
-                175,
+                221,
+                120,
+                65,
+                215,
+                137,
+                47,
+                111,
+                156,
+                51,
+                80,
+                173,
                 232,
                 3,
                 0,
@@ -7390,38 +5618,38 @@
                 0,
                 0,
                 0,
-                251,
-                91,
-                71,
-                93,
-                58,
-                113,
+                15,
+                179,
                 7,
+                220,
+                99,
+                116,
+                11,
+                43,
                 34,
-                32,
-                73,
-                58,
-                239,
-                215,
-                234,
-                130,
-                32,
-                211,
-                15,
-                101,
-                233,
-                95,
+                99,
+                124,
+                173,
                 183,
-                248,
-                96,
-                141,
-                116,
-                3,
-                192,
-                80,
-                95,
-                180,
-                167,
+                91,
+                122,
+                153,
+                83,
+                227,
+                216,
+                174,
+                143,
+                123,
+                179,
+                93,
+                16,
+                223,
+                139,
+                50,
+                20,
+                184,
+                146,
+                41,
                 1,
                 0,
                 0,
@@ -7433,62 +5661,62 @@
                 0,
                 0,
                 0,
-                244,
-                17,
-                203,
-                109,
-                95,
-                7,
-                0,
-                0,
-                10,
-                120,
-                28,
-                185,
+                56,
+                111,
+                132,
+                8,
+                177,
+                6,
                 0,
-                2,
                 0,
-                73,
-                5,
-                86,
-                4,
-                171,
                 92,
+                165,
+                189,
+                208,
+                85,
+                1,
+                0,
+                161,
+                32,
+                121,
+                162,
+                33,
+                90,
                 5,
                 0,
-                164,
-                195,
-                143,
-                144,
-                61,
-                151,
+                100,
+                80,
+                70,
+                13,
+                126,
+                123,
+                228,
+                117,
+                64,
+                121,
+                8,
+                228,
+                129,
                 68,
-                202,
-                34,
-                67,
+                240,
+                149,
+                80,
                 11,
-                174,
-                222,
-                209,
-                188,
-                55,
-                192,
-                237,
-                61,
-                117,
-                206,
+                199,
+                60,
+                247,
+                37,
+                79,
+                145,
+                193,
+                130,
+                164,
                 85,
-                104,
-                62,
-                105,
-                189,
-                61,
-                31,
-                196,
-                11,
-                103,
-                48,
-                4,
+                112,
+                208,
+                202,
+                198,
+                3,
                 0,
                 0,
                 0,
@@ -7520,38 +5748,38 @@
                 0,
                 0,
                 0,
-                86,
-                11,
+                66,
+                171,
+                40,
+                184,
+                198,
+                248,
+                37,
+                80,
+                178,
+                91,
                 133,
-                42,
-                34,
-                128,
-                46,
-                144,
-                245,
-                237,
-                103,
-                194,
-                141,
-                145,
-                70,
-                227,
-                187,
-                103,
-                72,
-                225,
-                126,
-                12,
-                195,
-                94,
-                216,
-                109,
-                11,
-                185,
-                136,
-                231,
-                209,
-                101,
+                208,
+                36,
+                170,
+                67,
+                205,
+                191,
+                10,
+                49,
+                13,
+                172,
+                27,
+                248,
+                33,
+                15,
+                228,
+                163,
+                61,
+                156,
+                207,
+                73,
+                153,
                 0,
                 0,
                 0,
@@ -7569,12 +5797,12 @@
                 0,
                 0,
                 0,
-                244,
-                17,
-                203,
-                109,
-                95,
-                7,
+                56,
+                111,
+                132,
+                8,
+                177,
+                6,
                 0,
                 232,
                 3,
@@ -7592,38 +5820,38 @@
                 0,
                 0,
                 0,
-                48,
-                196,
-                28,
-                202,
-                166,
-                13,
-                73,
-                199,
-                135,
-                166,
-                25,
-                93,
-                219,
-                125,
+                154,
                 63,
-                116,
-                202,
+                153,
+                219,
+                190,
+                60,
+                107,
+                172,
+                161,
+                128,
+                223,
+                192,
+                219,
+                114,
+                132,
+                40,
+                213,
+                246,
+                227,
+                9,
                 177,
-                217,
-                91,
-                147,
-                64,
-                31,
-                161,
-                218,
-                162,
-                170,
-                69,
-                161,
-                76,
-                100,
-                232,
+                93,
+                243,
+                81,
+                126,
+                145,
+                127,
+                241,
+                139,
+                224,
+                194,
+                8,
                 0,
                 0,
                 0,
@@ -7632,250 +5860,250 @@
                 0,
                 0,
                 0,
-                72,
-                217,
-                15,
-                101,
-                11,
+                45,
+                177,
+                156,
+                231,
+                178,
+                150,
+                99,
+                62,
+                73,
                 244,
-                216,
-                122,
-                209,
-                41,
-                236,
-                71,
-                57,
-                46,
-                195,
-                138,
-                140,
-                108,
-                11,
-                181,
+                142,
+                134,
+                60,
+                43,
+                8,
+                213,
                 234,
-                75,
-                109,
-                171,
-                97,
-                14,
-                58,
-                132,
-                20,
-                49,
-                171,
+                10,
+                136,
+                82,
+                115,
+                191,
+                165,
+                116,
+                226,
+                219,
+                10,
+                133,
+                236,
+                226,
+                37,
+                229,
+                96,
                 153,
+                242,
+                94,
+                246,
+                31,
+                128,
+                50,
+                185,
+                20,
+                99,
+                100,
                 96,
-                173,
-                222,
-                239,
-                148,
-                216,
                 152,
-                200,
-                142,
-                64,
-                219,
-                222,
-                255,
-                145,
-                197,
-                241,
-                5,
-                249,
-                207,
                 44,
-                116,
-                127,
-                182,
-                242,
-                188,
-                55,
-                236,
-                3,
-                214,
-                201,
-                30,
-                219,
-                46,
-                26,
+                92,
+                198,
+                241,
+                52,
+                239,
+                29,
+                218,
+                231,
+                102,
                 87,
-                140,
-                245,
-                68,
-                190,
-                139,
+                242,
+                203,
+                254,
+                193,
+                235,
+                252,
+                141,
                 9,
-                49,
-                226,
-                95,
-                36,
-                61,
-                89,
-                176,
-                195,
+                115,
+                116,
+                8,
                 13,
-                152,
-                161,
-                108,
-                227,
-                186,
-                29,
-                108,
-                241,
-                215,
-                245,
-                4,
-                38,
-                153,
-                46,
-                176,
-                173,
-                179,
-                19,
+                246,
+                252,
+                240,
+                220,
+                184,
+                188,
                 75,
-                5,
-                91,
-                232,
-                20,
-                13,
-                45,
-                181,
-                242,
-                95,
-                176,
                 13,
-                131,
-                248,
-                228,
-                34,
-                43,
-                240,
-                31,
-                214,
-                172,
-                147,
-                161,
+                142,
+                10,
+                245,
+                216,
+                14,
+                187,
                 255,
-                77,
-                121,
-                218,
+                43,
+                76,
+                89,
+                159,
+                84,
+                244,
+                45,
+                99,
+                18,
+                223,
+                195,
+                20,
+                39,
+                96,
+                120,
+                193,
+                204,
+                52,
+                126,
+                187,
+                190,
+                197,
+                25,
+                139,
+                226,
                 88,
-                242,
-                32,
-                157,
-                111,
-                65,
-                91,
-                154,
+                81,
+                63,
+                56,
+                107,
+                147,
+                13,
+                2,
+                194,
                 116,
+                154,
+                128,
+                62,
+                35,
+                48,
+                149,
+                94,
+                189,
                 26,
+                16,
                 32,
-                81,
-                165,
+                122,
+                3,
+                30,
                 157,
-                125,
-                130,
-                182,
-                69,
-                127,
-                200,
-                123,
-                212,
-                219,
-                165,
-                4,
-                238,
-                15,
-                68,
-                169,
-                73,
-                115,
-                59,
-                197,
-                138,
-                254,
+                52,
+                195,
+                36,
+                160,
+                76,
+                194,
+                183,
+                16,
+                106,
+                36,
                 32,
-                72,
-                185,
-                38,
-                230,
+                2,
+                216,
+                206,
+                21,
+                7,
+                4,
+                151,
+                70,
+                39,
+                234,
+                215,
+                20,
+                41,
                 150,
-                233,
-                38,
-                148,
-                165,
-                17,
+                113,
+                224,
+                91,
+                32,
                 3,
-                58,
-                186,
-                78,
-                49,
-                172,
-                39,
+                60,
+                195,
+                7,
+                177,
+                11,
+                189,
                 198,
-                43,
-                231,
-                128,
-                216,
-                233,
-                5,
-                174,
-                222,
+                69,
+                193,
+                118,
+                101,
+                132,
                 133,
-                66,
+                243,
+                255,
+                102,
+                108,
+                2,
+                133,
+                7,
+                68,
+                189,
+                150,
+                46,
+                93,
+                146,
+                0,
+                141,
+                222,
+                107,
+                252,
+                48,
+                173,
                 72,
-                216,
-                253,
-                39,
+                33,
+                196,
+                123,
+                102,
+                115,
+                188,
+                207,
+                117,
                 48,
-                179,
-                18,
-                62,
-                181,
-                29,
-                193,
-                154,
-                105,
-                231,
+                189,
+                20,
+                63,
+                36,
                 94,
-                0,
-                253,
-                147,
-                164,
-                152,
-                191,
-                209,
-                90,
-                200,
-                210,
-                59,
-                88,
                 101,
-                171,
-                112,
-                145,
-                55,
-                221,
-                230,
-                140,
-                56,
-                240,
-                86,
-                84,
-                193,
-                49,
-                6,
-                45,
-                237,
-                198,
-                215,
-                147,
-                111,
-                94,
-                143,
-                129,
-                109,
+                110,
+                96,
+                96,
+                218,
+                135,
+                207,
+                130,
+                60,
+                108,
+                28,
+                33,
+                226,
+                4,
+                178,
+                120,
+                120,
+                61,
+                127,
+                163,
+                62,
+                231,
+                69,
+                205,
+                199,
                 183,
+                145,
+                196,
+                92,
+                33,
+                251,
+                211,
                 11,
                 118,
                 97,
@@ -7887,7 +6115,7 @@
                 111,
                 114,
                 45,
-                50,
+                48,
                 0,
                 0,
                 0,
@@ -7911,11 +6139,11 @@
                 99,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                49,
-                53,
+                52,
+                51,
+                54,
                 47,
                 104,
                 116,
@@ -7941,36 +6169,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                49,
-                55,
-                24,
-                47,
-                105,
-                112,
                 52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
-                53,
-                50,
-                49,
-                50,
                 51,
+                56,
                 24,
                 47,
                 105,
@@ -7991,12 +6194,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                50,
-                53,
-                0,
+                52,
+                52,
+                52,
                 0,
                 0,
                 0,
@@ -8004,38 +6206,38 @@
                 0,
                 0,
                 0,
-                245,
-                129,
-                174,
-                94,
+                139,
+                224,
+                68,
+                32,
+                91,
+                176,
+                203,
+                154,
+                171,
+                120,
+                35,
+                40,
+                91,
+                57,
+                179,
+                164,
+                23,
+                110,
                 253,
-                236,
-                254,
-                169,
-                210,
-                13,
-                151,
-                145,
-                128,
-                169,
-                56,
-                66,
-                49,
+                173,
+                253,
+                143,
+                209,
                 90,
-                127,
-                254,
-                26,
-                181,
-                229,
-                54,
+                0,
+                61,
+                90,
+                186,
                 109,
-                20,
-                56,
-                103,
-                14,
-                16,
-                207,
-                50,
+                177,
+                59,
+                90,
                 0,
                 0,
                 0,
@@ -8044,46 +6246,46 @@
                 0,
                 0,
                 0,
-                208,
-                7,
+                196,
+                9,
                 0,
                 0,
                 0,
                 0,
                 0,
                 0,
-                53,
-                11,
-                141,
-                159,
-                199,
-                174,
-                192,
-                150,
-                68,
+                18,
+                5,
+                29,
+                220,
+                228,
+                186,
+                162,
+                227,
+                204,
+                127,
+                217,
+                247,
+                93,
                 81,
-                180,
-                184,
-                90,
-                118,
+                88,
+                63,
+                196,
+                75,
+                65,
                 142,
-                78,
+                11,
                 57,
-                233,
-                107,
-                245,
+                159,
+                31,
+                113,
+                251,
+                185,
+                116,
+                209,
+                4,
                 123,
-                23,
-                55,
-                108,
-                96,
-                29,
-                244,
-                253,
-                107,
-                49,
-                76,
-                18,
+                14,
                 232,
                 3,
                 0,
@@ -8092,38 +6294,38 @@
                 0,
                 0,
                 0,
-                87,
-                237,
-                32,
+                209,
+                123,
+                224,
+                206,
+                121,
+                241,
+                77,
+                244,
+                72,
                 86,
-                222,
-                32,
-                49,
-                210,
-                53,
-                230,
-                10,
-                194,
-                125,
-                91,
-                46,
-                170,
-                128,
-                158,
-                85,
-                158,
-                11,
-                173,
-                248,
-                152,
-                226,
-                64,
-                231,
-                208,
-                252,
-                170,
-                26,
-                8,
+                107,
+                103,
+                131,
+                192,
+                239,
+                101,
+                12,
+                50,
+                118,
+                14,
+                142,
+                183,
+                157,
+                157,
+                157,
+                178,
+                187,
+                220,
+                115,
+                108,
+                181,
+                43,
                 1,
                 0,
                 0,
@@ -8135,62 +6337,62 @@
                 0,
                 0,
                 0,
-                244,
-                17,
-                203,
-                109,
-                95,
-                7,
-                0,
-                0,
-                10,
-                120,
-                28,
-                185,
+                56,
+                111,
+                132,
+                8,
+                177,
+                6,
                 0,
-                2,
                 0,
-                73,
-                5,
-                86,
-                4,
-                171,
                 92,
+                165,
+                189,
+                208,
+                85,
+                1,
+                0,
+                161,
+                32,
+                121,
+                162,
+                33,
+                90,
                 5,
                 0,
-                63,
-                107,
-                147,
-                31,
                 121,
-                253,
-                11,
-                42,
-                20,
-                237,
-                118,
-                165,
-                178,
-                55,
-                20,
-                52,
-                76,
-                66,
                 31,
-                153,
-                162,
+                101,
                 204,
-                209,
-                151,
-                142,
-                242,
+                134,
+                140,
+                198,
+                239,
+                11,
+                192,
+                255,
+                64,
+                40,
+                147,
+                159,
+                16,
+                185,
+                98,
+                112,
                 39,
-                14,
-                22,
-                118,
-                20,
-                204,
-                4,
+                68,
+                129,
+                205,
+                235,
+                244,
+                33,
+                214,
+                71,
+                190,
+                240,
+                11,
+                110,
+                3,
                 0,
                 0,
                 0,
@@ -8222,38 +6424,38 @@
                 0,
                 0,
                 0,
-                13,
-                83,
-                208,
+                162,
                 2,
-                216,
-                71,
-                135,
-                76,
-                196,
-                240,
-                55,
-                169,
-                172,
-                163,
-                129,
-                77,
-                167,
-                141,
-                222,
-                234,
-                139,
-                250,
-                125,
-                75,
-                145,
-                233,
-                139,
+                46,
                 57,
+                140,
+                215,
+                171,
+                207,
+                199,
+                51,
                 119,
-                196,
-                24,
-                85,
+                103,
+                99,
+                159,
+                136,
+                104,
+                178,
+                52,
+                54,
+                253,
+                140,
+                74,
+                230,
+                132,
+                248,
+                104,
+                75,
+                249,
+                252,
+                181,
+                229,
+                232,
                 0,
                 0,
                 0,
@@ -8271,12 +6473,12 @@
                 0,
                 0,
                 0,
-                244,
-                17,
-                203,
-                109,
-                95,
-                7,
+                56,
+                111,
+                132,
+                8,
+                177,
+                6,
                 0,
                 232,
                 3,
@@ -8294,38 +6496,38 @@
                 0,
                 0,
                 0,
-                219,
-                119,
-                163,
-                77,
-                109,
-                87,
-                164,
-                155,
-                190,
-                236,
-                145,
-                24,
-                50,
-                181,
-                141,
-                163,
-                62,
-                29,
-                37,
+                251,
+                213,
+                102,
+                25,
                 149,
-                161,
-                187,
+                159,
+                37,
+                192,
+                210,
+                95,
+                204,
+                21,
+                18,
+                42,
+                226,
+                5,
+                226,
+                152,
+                81,
+                144,
+                191,
+                110,
+                76,
+                51,
+                233,
+                213,
+                87,
+                45,
                 246,
-                10,
-                50,
-                162,
-                143,
-                252,
-                237,
-                179,
-                142,
-                209,
+                101,
+                58,
+                130,
                 0,
                 0,
                 0,
@@ -8335,249 +6537,249 @@
                 0,
                 0,
                 50,
-                130,
-                23,
-                143,
-                241,
-                103,
-                208,
+                72,
                 42,
-                3,
-                62,
-                137,
-                209,
-                40,
-                10,
-                30,
-                194,
-                95,
-                157,
-                208,
-                105,
-                160,
-                241,
-                64,
-                12,
-                36,
-                65,
-                146,
-                241,
-                247,
-                92,
+                34,
+                159,
+                131,
                 186,
-                188,
-                96,
-                179,
-                253,
-                94,
-                251,
-                92,
-                135,
-                36,
-                3,
+                206,
+                45,
                 164,
-                173,
-                19,
-                241,
-                25,
-                149,
-                19,
-                96,
-                109,
-                35,
-                53,
-                74,
-                132,
-                82,
-                73,
-                174,
-                161,
-                87,
-                86,
-                76,
-                35,
-                255,
-                60,
-                21,
-                198,
                 201,
-                230,
-                82,
-                183,
-                45,
-                116,
-                14,
-                140,
-                172,
-                185,
-                60,
-                188,
-                192,
-                104,
-                107,
-                14,
-                192,
-                204,
-                12,
-                28,
-                118,
                 11,
-                251,
-                66,
-                180,
-                54,
-                81,
-                159,
+                77,
+                217,
+                156,
+                138,
+                115,
+                6,
+                58,
+                106,
+                141,
+                220,
+                91,
+                214,
+                204,
+                153,
+                222,
+                216,
+                112,
+                100,
+                145,
+                42,
+                96,
+                173,
+                222,
+                239,
+                148,
+                216,
+                152,
+                200,
+                142,
+                64,
+                219,
+                222,
+                255,
+                145,
                 197,
-                168,
+                241,
                 5,
-                75,
-                118,
-                83,
-                58,
-                151,
-                169,
-                242,
-                57,
-                135,
-                208,
-                151,
-                239,
-                150,
-                177,
+                249,
+                207,
+                44,
+                116,
+                127,
+                182,
                 242,
-                82,
-                107,
-                178,
-                7,
-                63,
+                188,
+                55,
+                236,
+                3,
+                214,
+                201,
+                30,
+                219,
+                46,
+                26,
+                87,
+                140,
+                245,
+                68,
+                190,
+                139,
+                9,
+                49,
+                226,
+                95,
+                36,
+                61,
+                89,
+                176,
+                195,
+                13,
+                152,
                 161,
-                10,
-                119,
-                25,
-                148,
-                23,
-                114,
-                52,
-                126,
-                242,
-                116,
-                244,
-                32,
+                108,
+                227,
                 186,
-                104,
-                213,
+                29,
+                108,
+                241,
+                215,
+                245,
+                4,
+                38,
+                153,
+                46,
+                176,
+                173,
+                179,
+                19,
+                75,
+                5,
                 91,
-                218,
-                163,
+                232,
+                20,
+                13,
+                45,
                 181,
-                223,
-                208,
-                177,
-                219,
-                199,
-                179,
-                145,
-                245,
-                154,
+                242,
+                95,
+                176,
+                13,
+                131,
+                248,
+                228,
+                34,
+                43,
+                240,
+                31,
+                214,
                 172,
-                70,
-                98,
-                48,
-                93,
-                0,
-                253,
-                230,
-                76,
-                154,
-                76,
-                110,
-                236,
-                134,
-                14,
-                117,
+                147,
+                161,
+                255,
+                77,
+                121,
+                218,
+                88,
+                242,
                 32,
-                7,
-                134,
-                124,
-                99,
-                82,
-                250,
-                224,
+                97,
                 138,
-                194,
-                105,
-                98,
-                161,
-                155,
+                198,
+                62,
+                136,
+                198,
                 103,
-                211,
-                145,
+                175,
+                249,
+                91,
+                77,
+                120,
+                56,
+                146,
+                191,
+                105,
+                25,
                 87,
                 27,
-                138,
-                230,
-                219,
-                213,
+                118,
                 59,
-                58,
-                230,
-                35,
-                134,
-                160,
-                69,
-                70,
-                5,
-                103,
-                48,
-                144,
-                238,
-                206,
-                27,
-                158,
-                108,
-                237,
+                62,
+                33,
+                84,
+                159,
+                132,
                 242,
+                67,
+                253,
+                50,
+                9,
                 132,
-                172,
-                88,
-                33,
-                180,
-                55,
-                105,
-                22,
-                117,
-                124,
-                154,
-                184,
-                220,
-                33,
+                32,
+                211,
+                127,
                 23,
+                124,
+                68,
+                158,
+                122,
+                141,
+                69,
+                188,
+                41,
+                144,
+                117,
+                211,
+                169,
+                65,
+                239,
+                69,
+                38,
+                170,
+                84,
+                174,
+                198,
+                7,
+                179,
+                110,
+                215,
+                182,
+                252,
+                113,
+                72,
+                226,
+                48,
+                133,
+                8,
+                105,
+                153,
+                110,
+                47,
                 196,
-                29,
-                87,
-                181,
-                60,
-                222,
-                146,
+                176,
+                44,
                 252,
-                251,
-                23,
+                140,
+                171,
+                99,
+                25,
+                5,
+                109,
                 170,
-                22,
-                100,
-                150,
-                209,
-                54,
-                177,
-                108,
-                181,
+                61,
+                34,
+                234,
+                19,
+                78,
+                134,
+                220,
+                12,
                 12,
+                146,
+                181,
+                134,
+                46,
                 50,
-                42,
-                25,
+                246,
+                204,
+                83,
+                195,
+                216,
+                58,
+                47,
+                246,
                 133,
-                43,
+                52,
+                153,
+                89,
+                95,
+                128,
+                57,
+                13,
+                156,
                 11,
                 118,
                 97,
@@ -8589,7 +6791,7 @@
                 111,
                 114,
                 45,
-                51,
+                50,
                 0,
                 0,
                 0,
@@ -8613,11 +6815,11 @@
                 99,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                50,
-                57,
+                52,
+                53,
+                54,
                 47,
                 104,
                 116,
@@ -8643,36 +6845,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                51,
-                49,
-                24,
-                47,
-                105,
-                112,
                 52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
                 53,
-                50,
-                49,
-                51,
-                55,
+                56,
                 24,
                 47,
                 105,
@@ -8693,12 +6870,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                51,
-                57,
-                0,
+                52,
+                54,
+                52,
                 0,
                 0,
                 0,
@@ -8706,38 +6882,38 @@
                 0,
                 0,
                 0,
-                167,
-                69,
+                121,
+                245,
+                173,
+                214,
+                62,
+                45,
+                78,
                 231,
-                171,
-                22,
-                87,
-                230,
-                137,
+                42,
+                141,
+                80,
+                70,
+                101,
+                210,
+                114,
+                51,
+                185,
+                135,
+                223,
+                13,
+                169,
+                239,
+                245,
+                68,
+                254,
                 122,
-                155,
-                115,
-                67,
-                34,
-                144,
-                147,
-                123,
-                26,
-                4,
-                108,
-                11,
-                211,
-                40,
-                136,
-                229,
-                98,
-                147,
-                57,
                 133,
-                122,
-                176,
-                98,
-                125,
+                237,
+                80,
+                108,
+                161,
+                30,
                 0,
                 0,
                 0,
@@ -8746,86 +6922,86 @@
                 0,
                 0,
                 0,
-                208,
-                7,
+                196,
+                9,
                 0,
                 0,
                 0,
                 0,
                 0,
                 0,
-                98,
+                164,
+                51,
+                96,
+                252,
                 84,
-                73,
-                35,
-                238,
-                36,
-                120,
-                182,
-                53,
-                204,
-                253,
-                142,
-                197,
-                168,
-                56,
-                27,
-                133,
-                121,
-                187,
-                11,
-                224,
-                185,
                 166,
+                231,
+                126,
+                125,
+                69,
+                141,
+                222,
+                212,
+                230,
+                206,
+                158,
+                145,
+                216,
+                89,
+                46,
+                224,
+                195,
+                37,
+                168,
+                53,
+                214,
                 209,
-                34,
-                6,
-                52,
-                1,
-                193,
-                148,
-                253,
-                48,
+                133,
+                68,
+                191,
+                142,
+                226,
                 232,
-                3,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                12,
-                179,
-                128,
-                203,
-                50,
-                90,
-                131,
-                15,
-                3,
-                238,
-                75,
-                218,
-                121,
-                11,
-                5,
-                225,
-                117,
-                83,
-                128,
-                22,
+                3,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                242,
                 245,
-                212,
-                124,
-                179,
+                215,
+                89,
                 82,
-                201,
-                60,
-                198,
-                218,
-                220,
-                19,
+                128,
+                97,
+                158,
+                1,
+                156,
+                124,
+                176,
                 4,
+                137,
+                192,
+                182,
+                113,
+                144,
+                74,
+                11,
+                72,
+                130,
+                17,
+                145,
+                107,
+                150,
+                212,
+                219,
+                236,
+                228,
+                205,
+                29,
                 1,
                 0,
                 0,
@@ -8837,62 +7013,62 @@
                 0,
                 0,
                 0,
-                244,
-                17,
-                203,
-                109,
-                95,
-                7,
-                0,
-                0,
-                10,
-                120,
-                28,
-                185,
+                56,
+                111,
+                132,
+                8,
+                177,
+                6,
                 0,
-                2,
                 0,
-                73,
-                5,
-                86,
-                4,
-                171,
                 92,
-                5,
-                0,
-                123,
-                148,
-                172,
-                91,
+                165,
                 189,
-                1,
-                12,
-                106,
-                119,
-                84,
+                208,
                 85,
+                1,
+                0,
+                161,
+                32,
+                121,
+                162,
+                33,
+                90,
+                5,
+                0,
+                60,
+                50,
+                180,
+                43,
                 227,
-                223,
-                27,
-                108,
-                154,
-                141,
-                36,
-                169,
+                162,
+                219,
+                29,
+                125,
+                221,
+                81,
+                200,
+                83,
+                117,
+                18,
+                127,
                 246,
-                194,
-                169,
-                194,
-                2,
+                174,
+                251,
+                39,
+                104,
+                52,
+                25,
+                62,
+                70,
+                158,
+                1,
+                226,
+                93,
+                72,
+                245,
                 85,
-                184,
-                114,
-                184,
-                18,
-                253,
-                191,
-                135,
-                4,
+                3,
                 0,
                 0,
                 0,
@@ -8924,38 +7100,38 @@
                 0,
                 0,
                 0,
-                120,
-                242,
-                231,
-                14,
-                134,
-                130,
-                104,
-                11,
-                103,
-                210,
-                189,
-                19,
-                28,
-                11,
-                147,
-                107,
                 81,
-                11,
-                11,
-                65,
-                86,
-                11,
-                202,
-                206,
-                15,
-                46,
-                158,
-                1,
+                125,
+                125,
+                70,
+                103,
+                63,
+                184,
+                12,
+                3,
+                228,
                 100,
-                197,
-                160,
-                6,
+                158,
+                86,
+                236,
+                215,
+                25,
+                233,
+                65,
+                9,
+                225,
+                127,
+                207,
+                98,
+                242,
+                200,
+                41,
+                56,
+                223,
+                20,
+                82,
+                36,
+                144,
                 0,
                 0,
                 0,
@@ -8973,12 +7149,12 @@
                 0,
                 0,
                 0,
-                244,
-                17,
-                203,
-                109,
-                95,
-                7,
+                56,
+                111,
+                132,
+                8,
+                177,
+                6,
                 0,
                 232,
                 3,
@@ -8996,38 +7172,38 @@
                 0,
                 0,
                 0,
-                211,
-                120,
-                82,
-                183,
-                112,
-                80,
-                203,
-                13,
-                147,
-                76,
-                148,
-                115,
-                172,
-                242,
-                93,
+                49,
+                246,
+                218,
+                38,
+                205,
                 194,
-                226,
-                79,
-                116,
-                169,
-                48,
-                72,
-                230,
-                175,
-                70,
+                217,
+                99,
+                178,
+                200,
                 79,
-                244,
-                144,
-                173,
-                213,
-                121,
-                156,
+                165,
+                209,
+                164,
+                114,
+                99,
+                171,
+                118,
+                230,
+                130,
+                90,
+                255,
+                202,
+                41,
+                223,
+                145,
+                76,
+                62,
+                88,
+                164,
+                241,
+                120,
                 0,
                 0,
                 0,
@@ -9036,325 +7212,270 @@
                 0,
                 0,
                 0,
-                245,
-                102,
-                129,
-                54,
-                96,
-                157,
-                170,
-                89,
-                196,
-                43,
-                209,
-                118,
-                250,
-                95,
-                88,
+                69,
+                228,
+                93,
+                189,
+                144,
                 86,
-                6,
-                162,
-                244,
+                66,
+                204,
+                44,
+                169,
+                195,
+                207,
                 209,
-                239,
-                219,
-                71,
-                136,
-                52,
-                112,
-                134,
-                45,
-                59,
-                63,
-                115,
-                136,
-                96,
-                165,
-                62,
-                107,
-                156,
-                158,
-                216,
-                84,
+                160,
+                161,
+                249,
+                81,
+                119,
+                88,
+                229,
+                217,
+                141,
+                235,
+                103,
                 96,
-                151,
-                72,
-                60,
-                127,
-                24,
+                64,
+                196,
+                147,
+                64,
+                200,
                 178,
-                120,
-                132,
-                46,
-                8,
-                105,
-                210,
-                52,
-                100,
-                137,
-                117,
-                48,
-                242,
-                39,
-                113,
-                30,
-                93,
+                103,
+                96,
+                179,
+                253,
+                94,
+                251,
                 92,
-                15,
-                231,
-                70,
-                106,
-                24,
-                198,
-                223,
-                117,
-                158,
-                231,
-                217,
-                91,
-                65,
-                211,
-                51,
-                35,
-                89,
-                11,
-                248,
-                58,
-                244,
-                233,
-                118,
+                135,
+                36,
+                3,
                 164,
-                6,
-                0,
-                18,
-                138,
-                151,
-                88,
-                229,
-                243,
-                38,
-                108,
-                193,
-                254,
+                173,
+                19,
+                241,
+                25,
                 149,
-                81,
-                156,
-                182,
-                49,
-                181,
-                74,
-                110,
-                91,
-                243,
-                52,
-                60,
-                170,
-                98,
-                18,
-                181,
-                176,
-                127,
-                133,
-                164,
-                206,
-                104,
-                108,
-                53,
-                77,
-                94,
-                205,
-                220,
-                210,
-                32,
-                207,
-                129,
-                54,
-                12,
-                182,
-                29,
-                102,
-                61,
-                164,
-                70,
-                65,
-                92,
-                223,
-                12,
-                100,
-                100,
-                218,
-                182,
-                114,
-                64,
-                69,
-                6,
-                60,
-                197,
-                86,
-                217,
-                55,
-                130,
-                105,
-                246,
-                35,
-                198,
-                32,
-                20,
-                87,
-                228,
-                166,
+                19,
                 96,
-                203,
-                177,
-                45,
-                143,
-                32,
-                164,
-                6,
-                188,
-                131,
-                10,
-                49,
+                109,
+                35,
+                53,
+                74,
+                132,
+                82,
                 73,
-                253,
-                43,
-                70,
-                97,
-                189,
-                91,
-                77,
-                165,
-                139,
-                113,
-                6,
-                239,
-                124,
-                39,
-                16,
-                48,
-                180,
-                146,
-                1,
-                38,
+                174,
+                161,
+                87,
+                86,
+                76,
+                35,
+                255,
+                60,
                 21,
-                25,
-                58,
+                198,
+                201,
+                230,
+                82,
+                183,
+                45,
+                116,
+                14,
+                140,
+                172,
                 185,
+                60,
+                188,
+                192,
+                104,
+                107,
                 14,
-                59,
-                219,
+                192,
+                204,
+                12,
+                28,
+                118,
+                11,
+                251,
+                66,
+                180,
+                54,
+                81,
+                159,
+                197,
+                168,
+                5,
+                75,
+                118,
+                83,
+                58,
+                151,
+                169,
+                242,
+                57,
+                135,
+                208,
+                151,
+                239,
+                150,
+                177,
+                242,
+                82,
+                107,
+                178,
+                7,
+                63,
+                161,
+                10,
+                119,
+                25,
+                148,
+                23,
+                114,
                 52,
-                229,
-                98,
-                216,
-                64,
-                147,
-                144,
-                33,
-                202,
-                4,
-                30,
+                126,
                 242,
+                116,
                 244,
+                32,
+                44,
+                195,
+                142,
+                100,
+                204,
+                221,
+                210,
+                56,
+                220,
+                159,
+                252,
+                43,
                 109,
-                108,
-                93,
-                207,
-                167,
-                234,
-                6,
-                118,
+                45,
                 129,
-                131,
-                163,
-                47,
+                212,
+                168,
+                89,
+                191,
+                44,
+                18,
+                142,
+                55,
+                166,
+                147,
                 169,
-                56,
-                167,
-                155,
-                58,
-                146,
-                95,
-                139,
-                70,
-                22,
-                220,
-                120,
-                10,
-                118,
-                97,
-                108,
-                105,
-                100,
-                97,
-                116,
-                111,
-                114,
-                48,
-                11,
-                100,
-                101,
-                115,
-                99,
-                114,
-                105,
-                112,
-                116,
-                105,
+                39,
+                81,
+                113,
+                109,
+                74,
                 111,
-                110,
-                25,
+                32,
+                67,
+                83,
+                247,
+                195,
+                31,
+                24,
+                188,
+                165,
+                86,
+                175,
+                68,
+                17,
+                34,
+                236,
+                33,
+                55,
+                120,
                 104,
-                116,
-                116,
-                112,
-                115,
-                58,
-                47,
-                47,
-                105,
-                111,
-                116,
-                97,
-                46,
-                111,
                 114,
-                103,
-                47,
-                108,
-                111,
-                103,
+                61,
+                167,
+                69,
+                129,
+                149,
+                36,
+                40,
+                216,
+                145,
+                186,
+                240,
+                203,
+                190,
+                48,
+                181,
                 111,
+                79,
+                167,
+                197,
+                9,
+                154,
+                150,
+                224,
+                28,
+                60,
                 46,
-                112,
-                110,
-                103,
-                20,
-                104,
-                116,
-                116,
-                112,
-                115,
+                8,
+                148,
+                63,
+                84,
+                203,
+                153,
+                87,
+                15,
+                26,
+                86,
+                208,
+                145,
+                204,
+                145,
+                25,
+                124,
+                35,
+                62,
+                14,
+                136,
+                91,
+                231,
+                161,
+                80,
+                201,
+                205,
+                64,
                 58,
-                47,
-                47,
-                119,
-                119,
-                119,
+                13,
+                96,
+                245,
+                185,
+                36,
                 46,
+                134,
+                189,
+                11,
+                118,
+                97,
+                108,
                 105,
-                111,
-                116,
+                100,
                 97,
-                46,
+                116,
                 111,
                 114,
-                103,
-                28,
+                45,
+                51,
+                0,
+                0,
+                0,
+                29,
                 47,
-                100,
-                110,
-                115,
+                105,
+                112,
+                52,
                 47,
                 49,
                 50,
@@ -9370,44 +7491,21 @@
                 99,
                 112,
                 47,
-                56,
-                48,
-                56,
-                48,
+                54,
+                53,
+                52,
+                54,
+                54,
                 47,
                 104,
                 116,
                 116,
                 112,
-                23,
-                47,
-                100,
-                110,
-                115,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
+                24,
                 47,
-                117,
-                100,
+                105,
                 112,
-                47,
-                56,
-                48,
-                56,
                 52,
-                23,
-                47,
-                100,
-                110,
-                115,
                 47,
                 49,
                 50,
@@ -9423,15 +7521,16 @@
                 100,
                 112,
                 47,
+                54,
+                53,
+                52,
+                54,
                 56,
-                48,
-                56,
-                49,
-                23,
+                24,
                 47,
-                100,
-                110,
-                115,
+                105,
+                112,
+                52,
                 47,
                 49,
                 50,
@@ -9447,11 +7546,11 @@
                 100,
                 112,
                 47,
-                56,
-                48,
-                56,
-                50,
-                0,
+                54,
+                53,
+                52,
+                55,
+                52,
                 0,
                 0,
                 0,
@@ -9459,38 +7558,38 @@
                 0,
                 0,
                 0,
-                76,
-                179,
-                167,
-                126,
-                18,
-                238,
-                65,
-                140,
-                237,
-                181,
-                246,
-                156,
-                79,
-                25,
-                121,
-                145,
-                179,
-                60,
-                69,
+                209,
+                199,
+                154,
+                78,
+                21,
+                110,
+                135,
+                195,
+                67,
+                136,
+                35,
+                94,
+                39,
+                97,
                 239,
-                45,
-                52,
-                76,
-                157,
-                69,
-                145,
-                127,
+                158,
+                2,
+                153,
+                53,
+                161,
                 61,
-                97,
-                107,
-                36,
-                112,
+                9,
+                6,
+                74,
+                159,
+                148,
+                70,
+                72,
+                180,
+                122,
+                44,
+                178,
                 0,
                 0,
                 0,
@@ -9499,46 +7598,46 @@
                 0,
                 0,
                 0,
-                208,
-                7,
+                196,
+                9,
                 0,
                 0,
                 0,
                 0,
                 0,
                 0,
-                74,
-                147,
+                38,
+                175,
+                8,
+                245,
+                39,
+                20,
+                18,
+                239,
+                5,
+                160,
+                19,
+                43,
+                237,
+                138,
+                215,
+                107,
+                149,
+                49,
+                242,
+                105,
                 61,
-                94,
-                223,
-                159,
-                108,
-                51,
-                148,
-                133,
-                235,
-                178,
+                6,
+                20,
+                174,
                 86,
+                220,
+                229,
                 145,
-                162,
-                162,
-                82,
+                50,
+                170,
                 76,
-                36,
-                48,
-                67,
-                60,
-                227,
-                173,
-                4,
-                51,
-                128,
-                14,
-                236,
-                227,
-                221,
-                255,
+                138,
                 232,
                 3,
                 0,
@@ -9547,41 +7646,39 @@
                 0,
                 0,
                 0,
-                148,
-                42,
-                142,
-                98,
-                212,
-                124,
-                1,
-                32,
-                200,
-                159,
-                249,
-                18,
-                173,
-                14,
+                26,
+                73,
+                49,
+                169,
+                67,
+                19,
+                121,
                 35,
-                233,
-                104,
-                182,
-                193,
-                93,
-                160,
-                226,
-                192,
-                97,
+                127,
+                251,
                 115,
-                27,
-                55,
-                81,
-                112,
-                175,
-                105,
-                37,
+                102,
+                203,
+                11,
+                73,
+                57,
+                227,
+                115,
+                5,
+                39,
+                92,
+                71,
+                87,
+                245,
+                250,
+                108,
+                229,
+                163,
+                116,
+                21,
+                52,
+                122,
                 1,
-                3,
-                0,
                 0,
                 0,
                 0,
@@ -9590,62 +7687,64 @@
                 0,
                 0,
                 0,
-                128,
-                106,
-                172,
-                175,
-                60,
-                9,
-                0,
-                0,
-                0,
-                0,
                 0,
                 0,
+                56,
+                111,
+                132,
+                8,
+                177,
+                6,
                 0,
                 0,
+                92,
+                165,
+                189,
+                208,
+                85,
+                1,
                 0,
+                161,
+                32,
+                121,
+                162,
+                33,
+                90,
+                5,
                 0,
-                128,
-                106,
+                19,
+                28,
+                67,
+                124,
                 172,
-                175,
-                60,
-                9,
-                0,
-                111,
-                45,
-                3,
-                168,
-                97,
-                198,
-                163,
-                136,
-                199,
-                90,
-                160,
-                78,
-                249,
-                86,
-                82,
+                129,
+                201,
+                135,
+                94,
+                72,
+                64,
+                197,
+                38,
                 95,
-                111,
-                162,
-                240,
-                91,
-                6,
-                123,
-                233,
-                249,
-                228,
-                54,
-                233,
-                133,
-                1,
-                198,
-                111,
+                35,
+                44,
+                43,
+                75,
+                225,
+                178,
                 139,
-                1,
+                236,
+                218,
+                45,
+                144,
+                227,
+                8,
+                251,
+                114,
+                45,
+                40,
+                137,
+                3,
                 0,
                 0,
                 0,
@@ -9677,38 +7776,38 @@
                 0,
                 0,
                 0,
+                225,
                 151,
-                165,
-                252,
-                16,
-                16,
-                249,
-                41,
-                39,
-                113,
-                8,
-                91,
-                60,
+                122,
+                183,
+                140,
+                80,
                 88,
-                225,
-                48,
-                64,
+                134,
+                103,
+                4,
                 35,
-                186,
-                161,
-                250,
-                1,
-                81,
-                51,
-                48,
-                225,
-                254,
+                29,
+                155,
+                30,
+                74,
+                213,
+                228,
+                35,
+                178,
+                125,
                 105,
-                14,
-                166,
+                167,
+                234,
+                254,
+                209,
+                95,
+                150,
+                138,
+                239,
+                111,
                 38,
-                16,
-                144,
+                232,
                 0,
                 0,
                 0,
@@ -9726,12 +7825,12 @@
                 0,
                 0,
                 0,
-                128,
-                106,
-                172,
-                175,
-                60,
-                9,
+                56,
+                111,
+                132,
+                8,
+                177,
+                6,
                 0,
                 232,
                 3,
@@ -9749,78 +7848,78 @@
                 0,
                 0,
                 0,
-                85,
-                6,
-                129,
-                107,
-                168,
-                182,
-                56,
-                113,
-                98,
-                53,
-                93,
-                4,
-                125,
-                158,
-                41,
-                70,
-                117,
-                96,
-                211,
-                191,
-                19,
-                133,
-                196,
-                76,
+                119,
+                115,
+                238,
+                13,
+                243,
+                22,
                 28,
+                78,
+                108,
+                60,
+                101,
+                25,
+                123,
+                138,
                 116,
-                110,
-                128,
-                178,
-                221,
-                195,
-                186,
-                0,
-                0,
-                0,
-                0,
+                103,
+                87,
+                57,
+                235,
+                83,
+                123,
+                185,
+                5,
+                43,
+                108,
+                250,
+                199,
+                194,
+                8,
+                58,
+                14,
+                13,
+                0,
+                0,
                 0,
                 0,
                 0,
                 0,
-                89,
                 0,
-                134,
-                29,
-                192,
-                94,
-                22,
-                228,
-                35,
-                15,
-                103,
-                223,
-                102,
-                125,
-                164,
                 0,
-                182,
-                241,
-                173,
-                148,
-                115,
-                76,
-                12,
-                134,
                 255,
-                200,
-                115,
-                21,
-                201,
-                216,
+                42,
+                54,
+                155,
+                16,
+                100,
+                224,
+                39,
+                217,
+                65,
+                114,
+                0,
+                139,
+                225,
+                83,
+                252,
+                84,
+                75,
+                243,
+                235,
+                17,
+                199,
+                41,
+                252,
+                146,
+                124,
+                26,
+                180,
+                181,
+                181,
                 29,
-                213,
+                244,
                 0,
                 0,
                 0,
@@ -9830,39 +7929,39 @@
                 0,
                 0,
                 0,
-                116,
-                140,
+                245,
+                64,
+                131,
+                228,
+                230,
+                202,
+                193,
+                136,
+                58,
+                201,
+                134,
+                167,
+                174,
+                61,
+                63,
+                171,
                 27,
-                170,
-                209,
                 171,
-                17,
-                61,
-                7,
-                56,
-                218,
-                138,
-                21,
+                150,
+                193,
+                39,
+                53,
+                93,
+                49,
+                184,
+                198,
+                180,
+                117,
+                20,
+                160,
+                225,
+                139,
                 4,
-                220,
-                241,
-                80,
-                162,
-                255,
-                203,
-                11,
-                22,
-                170,
-                48,
-                59,
-                7,
-                101,
-                161,
-                69,
-                24,
-                201,
-                112,
-                5,
                 0,
                 0,
                 0,
@@ -9870,38 +7969,38 @@
                 0,
                 0,
                 0,
-                247,
-                48,
-                198,
-                197,
-                187,
-                95,
-                147,
-                209,
-                15,
-                245,
-                38,
-                60,
-                142,
-                201,
-                225,
-                91,
-                113,
-                53,
+                100,
+                96,
+                140,
+                115,
+                178,
+                133,
+                212,
+                21,
+                85,
                 180,
-                225,
-                99,
-                175,
-                83,
-                223,
-                59,
-                116,
-                194,
-                11,
-                151,
-                235,
+                158,
+                44,
                 146,
-                196,
+                235,
+                132,
+                110,
+                13,
+                239,
+                115,
+                223,
+                110,
+                114,
+                226,
+                165,
+                144,
+                102,
+                85,
+                239,
+                12,
+                249,
+                109,
+                45,
                 0,
                 0,
                 0,
@@ -9910,38 +8009,38 @@
                 0,
                 0,
                 0,
-                80,
-                80,
-                142,
-                127,
-                158,
-                232,
-                36,
-                13,
-                132,
+                171,
+                39,
+                109,
+                25,
+                86,
+                101,
+                155,
+                65,
                 21,
-                170,
-                224,
+                200,
+                37,
+                226,
+                115,
+                169,
+                182,
+                74,
+                60,
+                111,
+                254,
+                140,
+                247,
                 230,
-                25,
-                125,
-                12,
-                24,
-                68,
-                177,
-                231,
-                44,
-                91,
-                31,
-                217,
-                105,
-                9,
-                198,
-                144,
-                96,
+                222,
+                63,
+                45,
+                45,
+                35,
+                196,
                 16,
-                146,
-                139,
+                111,
+                145,
+                85,
                 0,
                 0,
                 0,
@@ -9951,38 +8050,42 @@
                 0,
                 0,
                 0,
-                117,
-                254,
-                42,
-                52,
-                238,
-                250,
-                101,
-                84,
-                49,
-                145,
-                237,
-                191,
-                142,
-                110,
-                6,
-                188,
-                55,
-                241,
-                1,
-                107,
-                182,
-                234,
-                227,
-                213,
-                34,
-                177,
-                229,
-                70,
-                184,
-                220,
-                217,
-                51,
+                254,
+                222,
+                88,
+                194,
+                222,
+                164,
+                236,
+                45,
+                117,
+                125,
+                80,
+                122,
+                1,
+                119,
+                21,
+                186,
+                58,
+                42,
+                210,
+                122,
+                75,
+                254,
+                158,
+                92,
+                161,
+                201,
+                100,
+                39,
+                218,
+                24,
+                41,
+                151,
+                0,
+                0,
+                0,
+                0,
                 0,
                 0,
                 0,
@@ -9991,10 +8094,6 @@
                 0,
                 0,
                 0,
-                240,
-                223,
-                190,
-                2,
                 0,
                 0,
                 0,
@@ -10063,201 +8162,47 @@
                 0,
                 0,
                 0,
-                153,
-                48,
-                123,
-                170,
-                237,
-                150,
-                85,
-                58,
-                253,
-                170,
-                119,
-                84,
-                156,
-                116,
-                215,
-                211,
-                179,
-                29,
-                196,
-                212,
-                126,
-                30,
-                21,
-                144,
-                136,
-                246,
-                168,
-                36,
-                73,
-                149,
-                230,
-                173,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                232,
-                3,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                99,
-                14,
-                249,
-                175,
-                146,
-                1,
-                0,
-                0,
-                141,
-                159,
-                48,
+                166,
+                4,
                 47,
-                164,
-                128,
-                59,
-                91,
-                130,
-                122,
-                142,
-                115,
-                144,
-                23,
-                163,
-                64,
-                108,
-                107,
-                72,
-                181,
-                174,
-                239,
+                112,
+                189,
+                16,
+                209,
+                252,
+                102,
+                57,
+                148,
+                80,
+                98,
+                167,
+                43,
                 219,
-                205,
-                93,
-                109,
-                38,
-                203,
-                113,
-                12,
-                216,
-                183,
-                0,
-                0,
-                0,
+                234,
+                27,
+                136,
+                160,
+                254,
+                187,
+                150,
+                197,
+                7,
+                70,
+                7,
+                202,
+                220,
+                47,
+                159,
+                89,
                 0,
                 0,
                 0,
                 0,
-                0
-              ]
-            }
-          },
-          "owner": {
-            "ObjectOwner": "0x0000000000000000000000000000000000000000000000000000000000000005"
-          },
-          "previous_transaction": "93PPEMeHQJUoVDVpEyTAEsyByUjrQTs4SPhSgM2wyfy6",
-          "storage_rebate": 0
-        },
-        {
-          "data": {
-            "Move": {
-              "type_": {
-                "Other": {
-                  "address": "0000000000000000000000000000000000000000000000000000000000000002",
-                  "module": "dynamic_field",
-                  "name": "Field",
-                  "type_args": [
-                    "u64",
-                    {
-                      "struct": {
-                        "address": "0000000000000000000000000000000000000000000000000000000000000003",
-                        "module": "staking_pool",
-                        "name": "PoolTokenExchangeRate",
-                        "type_args": []
-                      }
-                    }
-                  ]
-                }
-              },
-              "has_public_transfer": false,
-              "version": 7,
-              "contents": [
-                28,
-                127,
                 0,
-                115,
-                35,
-                208,
-                231,
-                247,
-                153,
-                198,
-                26,
-                248,
-                97,
-                36,
-                240,
-                70,
-                61,
-                208,
-                54,
-                119,
-                112,
-                83,
-                141,
-                107,
-                39,
-                32,
-                84,
-                194,
-                253,
-                94,
-                205,
-                133,
+                0,
+                0,
+                0,
+                232,
                 3,
                 0,
                 0,
@@ -10267,87 +8212,7 @@
                 0,
                 0,
                 0,
-                244,
-                17,
-                203,
-                109,
-                95,
-                7,
                 0,
-                73,
-                5,
-                86,
-                4,
-                171,
-                92,
-                5,
-                0
-              ]
-            }
-          },
-          "owner": {
-            "ObjectOwner": "0x7b94ac5bbd010c6a775455e3df1b6c9a8d24a9f6c2a9c20255b872b812fdbf87"
-          },
-          "previous_transaction": "93PPEMeHQJUoVDVpEyTAEsyByUjrQTs4SPhSgM2wyfy6",
-          "storage_rebate": 0
-        },
-        {
-          "data": {
-            "Move": {
-              "type_": {
-                "Other": {
-                  "address": "0000000000000000000000000000000000000000000000000000000000000002",
-                  "module": "dynamic_field",
-                  "name": "Field",
-                  "type_args": [
-                    "u64",
-                    {
-                      "struct": {
-                        "address": "0000000000000000000000000000000000000000000000000000000000000003",
-                        "module": "staking_pool",
-                        "name": "PoolTokenExchangeRate",
-                        "type_args": []
-                      }
-                    }
-                  ]
-                }
-              },
-              "has_public_transfer": false,
-              "version": 7,
-              "contents": [
-                51,
-                249,
-                148,
-                47,
-                28,
-                199,
-                116,
-                74,
-                182,
-                226,
-                145,
-                104,
-                94,
-                87,
-                12,
-                226,
-                249,
-                54,
-                102,
-                152,
-                66,
-                17,
-                131,
-                108,
-                179,
-                193,
-                255,
-                171,
-                105,
-                242,
-                154,
-                22,
-                3,
                 0,
                 0,
                 0,
@@ -10356,28 +8221,84 @@
                 0,
                 0,
                 0,
-                244,
-                17,
-                203,
-                109,
-                95,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                210,
+                104,
                 7,
+                216,
+                146,
+                1,
                 0,
-                73,
-                5,
+                0,
+                36,
+                82,
+                30,
+                65,
+                183,
+                192,
+                23,
+                72,
+                123,
+                231,
+                100,
+                128,
                 86,
-                4,
+                159,
+                136,
+                163,
+                24,
+                82,
+                67,
+                139,
+                141,
+                248,
+                200,
                 171,
-                92,
+                163,
                 5,
+                98,
+                244,
+                137,
+                223,
+                150,
+                206,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
                 0
               ]
             }
           },
           "owner": {
-            "ObjectOwner": "0x3f6b931f79fd0b2a14ed76a5b23714344c421f99a2ccd1978ef2270e167614cc"
+            "ObjectOwner": "0x0000000000000000000000000000000000000000000000000000000000000005"
           },
-          "previous_transaction": "93PPEMeHQJUoVDVpEyTAEsyByUjrQTs4SPhSgM2wyfy6",
+          "previous_transaction": "326n9ZcQDrJVxyFL8aWkknSmFahVxwpqZQ5q5ySmWrUy",
           "storage_rebate": 0
         },
         {
@@ -10385,73 +8306,73 @@
             "Move": {
               "type_": "StakedIota",
               "has_public_transfer": true,
-              "version": 7,
+              "version": 3,
               "contents": [
-                68,
-                82,
-                90,
+                15,
+                240,
+                36,
                 200,
-                142,
-                233,
-                23,
-                115,
-                238,
-                145,
-                174,
-                250,
-                165,
-                20,
-                7,
-                174,
+                226,
+                13,
+                113,
+                188,
+                151,
                 98,
-                178,
-                185,
-                127,
-                187,
-                46,
-                193,
-                152,
-                136,
-                31,
-                109,
+                189,
+                133,
+                39,
+                114,
+                83,
+                101,
                 18,
-                91,
-                86,
+                88,
                 68,
-                103,
-                251,
-                91,
-                71,
-                93,
-                58,
-                113,
-                7,
-                34,
-                32,
-                73,
-                58,
-                239,
-                215,
-                234,
-                130,
+                96,
+                185,
                 32,
-                211,
-                15,
+                236,
+                146,
+                53,
+                166,
                 101,
-                233,
-                95,
-                183,
-                248,
-                96,
-                141,
-                116,
-                3,
+                26,
+                67,
+                5,
+                250,
+                235,
+                209,
+                123,
+                224,
+                206,
+                121,
+                241,
+                77,
+                244,
+                72,
+                86,
+                107,
+                103,
+                131,
                 192,
-                80,
-                95,
-                180,
-                167,
-                3,
+                239,
+                101,
+                12,
+                50,
+                118,
+                14,
+                142,
+                183,
+                157,
+                157,
+                157,
+                178,
+                187,
+                220,
+                115,
+                108,
+                181,
+                43,
+                2,
                 0,
                 0,
                 0,
@@ -10471,9 +8392,9 @@
             }
           },
           "owner": {
-            "AddressOwner": "0x98346c29a0a99b9d0a80c9ede37a77c7fd93ead295fdb01b895ef1392c5087b5"
+            "AddressOwner": "0x2db19ce7b296633e49f48e863c2b08d5ea0a885273bfa574e2db0a85ece225e5"
           },
-          "previous_transaction": "93PPEMeHQJUoVDVpEyTAEsyByUjrQTs4SPhSgM2wyfy6",
+          "previous_transaction": "326n9ZcQDrJVxyFL8aWkknSmFahVxwpqZQ5q5ySmWrUy",
           "storage_rebate": 0
         },
         {
@@ -10481,73 +8402,73 @@
             "Move": {
               "type_": "StakedIota",
               "has_public_transfer": true,
-              "version": 7,
+              "version": 3,
               "contents": [
-                105,
-                41,
-                107,
-                200,
-                128,
-                9,
-                10,
-                8,
+                40,
                 202,
-                250,
-                106,
-                245,
-                169,
-                123,
-                157,
-                240,
-                237,
-                31,
-                2,
+                112,
+                217,
+                109,
+                109,
+                156,
+                205,
+                135,
+                25,
+                51,
+                46,
+                187,
+                222,
+                63,
+                176,
+                72,
+                93,
+                21,
+                89,
+                146,
+                13,
+                133,
+                38,
+                9,
                 203,
-                18,
-                168,
+                166,
+                67,
+                189,
                 17,
-                251,
-                81,
-                0,
-                142,
-                191,
-                164,
-                244,
-                75,
-                33,
-                87,
-                237,
-                32,
-                86,
-                222,
-                32,
-                49,
-                210,
+                60,
                 53,
-                230,
-                10,
-                194,
-                125,
-                91,
-                46,
-                170,
-                128,
-                158,
-                85,
-                158,
+                15,
+                179,
+                7,
+                220,
+                99,
+                116,
                 11,
+                43,
+                34,
+                99,
+                124,
                 173,
-                248,
-                152,
-                226,
-                64,
-                231,
-                208,
-                252,
-                170,
-                26,
-                8,
-                3,
+                183,
+                91,
+                122,
+                153,
+                83,
+                227,
+                216,
+                174,
+                143,
+                123,
+                179,
+                93,
+                16,
+                223,
+                139,
+                50,
+                20,
+                184,
+                146,
+                41,
+                2,
                 0,
                 0,
                 0,
@@ -10567,9 +8488,9 @@
             }
           },
           "owner": {
-            "AddressOwner": "0x48d90f650bf4d87ad129ec47392ec38a8c6c0bb5ea4b6dab610e3a841431ab99"
+            "AddressOwner": "0x3bfb34ad6f452c61add36979ce9308a507f4ca7749817ba5a19a57d4ff2cd53f"
           },
-          "previous_transaction": "93PPEMeHQJUoVDVpEyTAEsyByUjrQTs4SPhSgM2wyfy6",
+          "previous_transaction": "326n9ZcQDrJVxyFL8aWkknSmFahVxwpqZQ5q5ySmWrUy",
           "storage_rebate": 0
         },
         {
@@ -10594,41 +8515,130 @@
                 }
               },
               "has_public_transfer": false,
-              "version": 7,
+              "version": 3,
               "contents": [
-                139,
-                195,
-                226,
-                132,
-                157,
-                70,
-                216,
-                94,
-                250,
-                84,
-                152,
-                243,
+                55,
+                182,
+                163,
+                91,
+                229,
+                253,
+                149,
+                44,
                 130,
-                19,
-                188,
-                157,
-                233,
-                10,
+                137,
+                97,
+                206,
+                185,
+                13,
+                28,
+                140,
+                90,
+                166,
+                199,
+                140,
+                40,
+                3,
+                84,
+                7,
+                115,
+                234,
+                137,
+                138,
+                249,
+                124,
+                14,
+                221,
+                2,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                56,
+                111,
+                132,
+                8,
+                177,
+                6,
+                0,
+                161,
+                32,
+                121,
+                162,
                 33,
-                228,
+                90,
+                5,
+                0
+              ]
+            }
+          },
+          "owner": {
+            "ObjectOwner": "0x3c32b42be3a2db1d7ddd51c85375127ff6aefb276834193e469e01e25d48f555"
+          },
+          "previous_transaction": "326n9ZcQDrJVxyFL8aWkknSmFahVxwpqZQ5q5ySmWrUy",
+          "storage_rebate": 0
+        },
+        {
+          "data": {
+            "Move": {
+              "type_": {
+                "Other": {
+                  "address": "0000000000000000000000000000000000000000000000000000000000000002",
+                  "module": "dynamic_field",
+                  "name": "Field",
+                  "type_args": [
+                    "u64",
+                    {
+                      "struct": {
+                        "address": "0000000000000000000000000000000000000000000000000000000000000003",
+                        "module": "staking_pool",
+                        "name": "PoolTokenExchangeRate",
+                        "type_args": []
+                      }
+                    }
+                  ]
+                }
+              },
+              "has_public_transfer": false,
+              "version": 3,
+              "contents": [
                 142,
-                194,
-                255,
-                237,
-                62,
-                17,
+                231,
+                82,
+                115,
+                210,
+                106,
+                132,
+                40,
+                137,
+                182,
+                175,
+                98,
+                152,
+                24,
+                76,
+                112,
+                170,
+                149,
                 73,
-                218,
-                169,
-                207,
-                174,
-                230,
-                3,
+                85,
+                224,
+                168,
+                228,
+                216,
+                95,
+                227,
+                235,
+                53,
+                254,
+                248,
+                238,
+                162,
+                2,
                 0,
                 0,
                 0,
@@ -10637,28 +8647,28 @@
                 0,
                 0,
                 0,
-                244,
-                17,
-                203,
-                109,
-                95,
-                7,
+                56,
+                111,
+                132,
+                8,
+                177,
+                6,
                 0,
-                73,
-                5,
-                86,
-                4,
-                171,
-                92,
+                161,
+                32,
+                121,
+                162,
+                33,
+                90,
                 5,
                 0
               ]
             }
           },
           "owner": {
-            "ObjectOwner": "0xa4c38f903d9744ca22430baeded1bc37c0ed3d75ce55683e69bd3d1fc40b6730"
+            "ObjectOwner": "0x131c437cac81c9875e4840c5265f232c2b4be1b28becda2d90e308fb722d2889"
           },
-          "previous_transaction": "93PPEMeHQJUoVDVpEyTAEsyByUjrQTs4SPhSgM2wyfy6",
+          "previous_transaction": "326n9ZcQDrJVxyFL8aWkknSmFahVxwpqZQ5q5ySmWrUy",
           "storage_rebate": 0
         },
         {
@@ -10666,73 +8676,73 @@
             "Move": {
               "type_": "StakedIota",
               "has_public_transfer": true,
-              "version": 7,
+              "version": 3,
               "contents": [
-                173,
-                31,
-                168,
-                134,
-                66,
-                136,
-                234,
-                211,
-                49,
-                19,
+                186,
+                60,
+                107,
+                121,
+                233,
+                24,
+                94,
+                249,
+                190,
+                4,
+                213,
+                102,
+                149,
+                57,
                 122,
-                45,
-                116,
-                160,
-                205,
-                55,
-                69,
-                75,
-                40,
-                239,
-                143,
-                119,
-                36,
-                239,
-                147,
-                59,
-                246,
-                218,
-                54,
-                167,
-                79,
+                144,
+                32,
+                48,
+                28,
+                41,
+                120,
                 173,
-                232,
-                14,
-                72,
-                38,
-                40,
-                13,
-                121,
-                140,
-                248,
-                193,
-                87,
-                156,
-                150,
-                228,
-                154,
-                136,
-                166,
-                92,
+                86,
+                175,
+                201,
+                186,
+                171,
+                98,
                 15,
-                240,
-                225,
+                218,
+                25,
+                137,
+                242,
+                245,
+                215,
+                89,
+                82,
+                128,
+                97,
+                158,
+                1,
                 156,
                 124,
-                227,
-                251,
-                244,
-                22,
-                171,
-                191,
-                166,
-                19,
-                174,
-                3,
+                176,
+                4,
+                137,
+                192,
+                182,
+                113,
+                144,
+                74,
+                11,
+                72,
+                130,
+                17,
+                145,
+                107,
+                150,
+                212,
+                219,
+                236,
+                228,
+                205,
+                29,
+                2,
                 0,
                 0,
                 0,
@@ -10752,83 +8762,68 @@
             }
           },
           "owner": {
-            "AddressOwner": "0xc7035483b90ae369f3ce48c3971bf58c19417997746c67320c35d154a6425ab7"
+            "AddressOwner": "0x32482a229f83bace2da4c90b4dd99c8a73063a6a8ddc5bd6cc99ded87064912a"
           },
-          "previous_transaction": "93PPEMeHQJUoVDVpEyTAEsyByUjrQTs4SPhSgM2wyfy6",
+          "previous_transaction": "326n9ZcQDrJVxyFL8aWkknSmFahVxwpqZQ5q5ySmWrUy",
           "storage_rebate": 0
         },
         {
           "data": {
             "Move": {
-              "type_": "StakedIota",
-              "has_public_transfer": true,
-              "version": 7,
+              "type_": {
+                "Other": {
+                  "address": "0000000000000000000000000000000000000000000000000000000000000002",
+                  "module": "dynamic_field",
+                  "name": "Field",
+                  "type_args": [
+                    "u64",
+                    {
+                      "struct": {
+                        "address": "0000000000000000000000000000000000000000000000000000000000000003",
+                        "module": "staking_pool",
+                        "name": "PoolTokenExchangeRate",
+                        "type_args": []
+                      }
+                    }
+                  ]
+                }
+              },
+              "has_public_transfer": false,
+              "version": 3,
               "contents": [
-                186,
-                248,
-                198,
-                44,
-                206,
-                171,
-                42,
-                149,
-                55,
-                20,
-                81,
-                104,
-                235,
-                78,
-                69,
-                196,
-                202,
-                5,
-                73,
-                29,
-                148,
-                151,
-                116,
-                206,
-                117,
-                9,
+                191,
+                224,
+                72,
+                221,
+                47,
+                4,
+                80,
+                223,
+                94,
+                134,
+                71,
+                236,
                 24,
-                106,
-                127,
-                213,
-                95,
-                100,
-                12,
-                179,
-                128,
-                203,
-                50,
-                90,
-                131,
-                15,
-                3,
-                238,
-                75,
-                218,
-                121,
-                11,
-                5,
-                225,
-                117,
-                83,
-                128,
-                22,
-                245,
-                212,
-                124,
-                179,
-                82,
+                230,
+                72,
+                163,
+                174,
+                161,
+                36,
+                105,
+                146,
+                112,
+                27,
                 201,
-                60,
-                198,
-                218,
-                220,
-                19,
-                4,
+                168,
+                81,
                 3,
+                125,
+                199,
+                39,
+                146,
+                152,
+                2,
                 0,
                 0,
                 0,
@@ -10837,79 +8832,102 @@
                 0,
                 0,
                 0,
-                14,
-                208,
-                231,
-                124,
-                3,
+                56,
+                111,
+                132,
+                8,
+                177,
+                6,
                 0,
+                161,
+                32,
+                121,
+                162,
+                33,
+                90,
+                5,
                 0
               ]
             }
           },
           "owner": {
-            "AddressOwner": "0x3282178ff167d02a033e89d1280a1ec25f9dd069a0f1400c244192f1f75cbabc"
+            "ObjectOwner": "0x791f65cc868cc6ef0bc0ff4028939f10b96270274481cdebf421d647bef00b6e"
           },
-          "previous_transaction": "93PPEMeHQJUoVDVpEyTAEsyByUjrQTs4SPhSgM2wyfy6",
+          "previous_transaction": "326n9ZcQDrJVxyFL8aWkknSmFahVxwpqZQ5q5ySmWrUy",
           "storage_rebate": 0
         },
         {
           "data": {
             "Move": {
-              "type_": {
-                "Other": {
-                  "address": "0000000000000000000000000000000000000000000000000000000000000002",
-                  "module": "dynamic_field",
-                  "name": "Field",
-                  "type_args": [
-                    "u64",
-                    {
-                      "struct": {
-                        "address": "0000000000000000000000000000000000000000000000000000000000000003",
-                        "module": "staking_pool",
-                        "name": "PoolTokenExchangeRate",
-                        "type_args": []
-                      }
-                    }
-                  ]
-                }
-              },
-              "has_public_transfer": false,
-              "version": 7,
+              "type_": "StakedIota",
+              "has_public_transfer": true,
+              "version": 3,
               "contents": [
-                219,
-                199,
+                193,
+                61,
+                149,
+                198,
+                192,
+                159,
+                114,
+                12,
+                76,
+                102,
+                113,
                 132,
-                31,
-                72,
-                214,
-                130,
-                118,
-                176,
-                153,
                 102,
-                105,
-                144,
-                125,
-                120,
-                6,
-                139,
-                16,
-                247,
-                26,
-                6,
-                116,
-                172,
-                238,
-                188,
-                69,
-                78,
-                67,
-                223,
-                217,
-                151,
+                48,
+                147,
+                184,
+                136,
+                152,
+                227,
                 49,
+                228,
+                145,
+                29,
+                200,
+                7,
+                113,
+                151,
+                147,
+                111,
+                71,
                 3,
+                89,
+                26,
+                73,
+                49,
+                169,
+                67,
+                19,
+                121,
+                35,
+                127,
+                251,
+                115,
+                102,
+                203,
+                11,
+                73,
+                57,
+                227,
+                115,
+                5,
+                39,
+                92,
+                71,
+                87,
+                245,
+                250,
+                108,
+                229,
+                163,
+                116,
+                21,
+                52,
+                122,
+                2,
                 0,
                 0,
                 0,
@@ -10918,28 +8936,20 @@
                 0,
                 0,
                 0,
-                244,
-                17,
-                203,
-                109,
-                95,
-                7,
+                14,
+                208,
+                231,
+                124,
+                3,
                 0,
-                73,
-                5,
-                86,
-                4,
-                171,
-                92,
-                5,
                 0
               ]
             }
           },
           "owner": {
-            "ObjectOwner": "0xc2c9ddd800c90e8a9f7f02f35379fdebe07532f71e953937fcd04fa84c7a24c0"
+            "AddressOwner": "0x45e45dbd905642cc2ca9c3cfd1a0a1f9517758e5d98deb676040c49340c8b267"
           },
-          "previous_transaction": "93PPEMeHQJUoVDVpEyTAEsyByUjrQTs4SPhSgM2wyfy6",
+          "previous_transaction": "326n9ZcQDrJVxyFL8aWkknSmFahVxwpqZQ5q5ySmWrUy",
           "storage_rebate": 0
         },
         {
@@ -10964,54 +8974,41 @@
                 }
               },
               "has_public_transfer": false,
-              "version": 7,
+              "version": 3,
               "contents": [
-                223,
-                192,
-                146,
-                43,
-                109,
+                252,
+                67,
                 96,
-                57,
-                126,
-                204,
-                84,
-                56,
-                17,
-                196,
-                58,
+                254,
+                39,
+                224,
+                104,
+                47,
+                104,
+                250,
                 108,
+                183,
+                40,
+                110,
+                93,
+                19,
+                107,
+                54,
+                172,
+                99,
+                55,
                 209,
-                173,
-                69,
-                53,
-                250,
-                44,
-                132,
-                106,
-                166,
-                89,
-                148,
-                71,
-                230,
-                204,
-                71,
-                149,
-                192,
-                3,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
+                47,
+                162,
+                51,
+                127,
+                145,
+                45,
+                185,
+                25,
+                228,
+                42,
+                2,
                 0,
                 0,
                 0,
@@ -11020,15 +9017,28 @@
                 0,
                 0,
                 0,
+                56,
+                111,
+                132,
+                8,
+                177,
+                6,
                 0,
+                161,
+                32,
+                121,
+                162,
+                33,
+                90,
+                5,
                 0
               ]
             }
           },
           "owner": {
-            "ObjectOwner": "0x6f2d03a861c6a388c75aa04ef956525f6fa2f05b067be9f9e436e98501c66f8b"
+            "ObjectOwner": "0x6450460d7e7be475407908e48144f095500bc73cf7254f91c182a45570d0cac6"
           },
-          "previous_transaction": "93PPEMeHQJUoVDVpEyTAEsyByUjrQTs4SPhSgM2wyfy6",
+          "previous_transaction": "326n9ZcQDrJVxyFL8aWkknSmFahVxwpqZQ5q5ySmWrUy",
           "storage_rebate": 0
         }
       ]
diff --git a/crates/iota-light-client/example_config/794.chk b/crates/iota-light-client/example_config/794.chk
deleted file mode 100644
index 5a46f24a964..00000000000
Binary files a/crates/iota-light-client/example_config/794.chk and /dev/null differ
diff --git a/crates/iota-light-client/example_config/801.chk b/crates/iota-light-client/example_config/801.chk
new file mode 100644
index 00000000000..d23a3fcbea8
Binary files /dev/null and b/crates/iota-light-client/example_config/801.chk differ
diff --git a/crates/iota-light-client/example_config/528.json b/crates/iota-light-client/example_config/801.json
similarity index 70%
rename from crates/iota-light-client/example_config/528.json
rename to crates/iota-light-client/example_config/801.json
index 331b8173efc..5335cb581bc 100644
--- a/crates/iota-light-client/example_config/528.json
+++ b/crates/iota-light-client/example_config/801.json
@@ -1,17 +1,17 @@
 {
   "data": {
-    "epoch": 1,
-    "sequence_number": 528,
-    "network_total_transactions": 2297,
-    "content_digest": "CoTC2SBtCwR1DnZHwr26PL4fHVgdcEFk4nRTy2Vm2f7Q",
-    "previous_digest": "BDdU4PsyAgEvVtBWAx2UFwVwpHZD69yGHZRVQQtiQkLR",
+    "epoch": 2,
+    "sequence_number": 801,
+    "network_total_transactions": 3498,
+    "content_digest": "2UJiT2bAw2jKqPXTgpQDVaQkWfQeUXhZNfo8q4PBAoGs",
+    "previous_digest": "5LLp9134guMunGhK7fFSSusyX24MmpEEpZh81qGJWeUE",
     "epoch_rolling_gas_cost_summary": {
-      "computationCost": "2000000",
-      "storageCost": "49156800",
-      "storageRebate": "988000",
+      "computationCost": "0",
+      "storageCost": "0",
+      "storageRebate": "0",
       "nonRefundableStorageFee": "0"
     },
-    "timestamp_ms": 1729529127725,
+    "timestamp_ms": 1730201277471,
     "checkpoint_commitments": [],
     "end_of_epoch_data": {
       "nextEpochCommittee": [
@@ -36,16 +36,16 @@
       "epochCommitments": [
         {
           "ECMHLiveObjectSetDigest": {
-            "digest": "9HWmXguz7819cCZjTkrGVo4JZRW2xouuU48mzXn2kBLF"
+            "digest": "BcGNBp2x8z6g7PztfV8gH83mqwn6kFbVUCujttE31aMz"
           }
         }
       ],
-      "epochSupplyChange": 766999998000000
+      "epochSupplyChange": 767000000000000
     },
     "version_specific_data": [
       0,
       1,
-      110,
+      109,
       0,
       0,
       0,
@@ -56,8 +56,8 @@
     ]
   },
   "auth_signature": {
-    "epoch": 1,
-    "signature": "r9m20hZ9J6rx5wmfXQb5hCf/5KlUivWgLZYmD7L0X+E/psUu7Zt2/nv2QeJuv8Pa",
+    "epoch": 2,
+    "signature": "iZf2OsWQ2VwXEVaMjKP7A/dMXlWBHB9nJkybu2Slbyv0hblfLkZ43L94G85k3KBZ",
     "signers_map": [
       58,
       48,
@@ -75,11 +75,11 @@
       0,
       0,
       0,
-      0,
-      0,
       1,
       0,
       2,
+      0,
+      3,
       0
     ]
   }
diff --git a/crates/iota-light-client/example_config/528_full.json b/crates/iota-light-client/example_config/801_full.json
similarity index 81%
rename from crates/iota-light-client/example_config/528_full.json
rename to crates/iota-light-client/example_config/801_full.json
index 8f8066816cb..888b7d0df7b 100644
--- a/crates/iota-light-client/example_config/528_full.json
+++ b/crates/iota-light-client/example_config/801_full.json
@@ -1,18 +1,18 @@
 {
   "checkpoint_summary": {
     "data": {
-      "epoch": 1,
-      "sequence_number": 528,
-      "network_total_transactions": 2297,
-      "content_digest": "CoTC2SBtCwR1DnZHwr26PL4fHVgdcEFk4nRTy2Vm2f7Q",
-      "previous_digest": "BDdU4PsyAgEvVtBWAx2UFwVwpHZD69yGHZRVQQtiQkLR",
+      "epoch": 2,
+      "sequence_number": 801,
+      "network_total_transactions": 3498,
+      "content_digest": "2UJiT2bAw2jKqPXTgpQDVaQkWfQeUXhZNfo8q4PBAoGs",
+      "previous_digest": "5LLp9134guMunGhK7fFSSusyX24MmpEEpZh81qGJWeUE",
       "epoch_rolling_gas_cost_summary": {
-        "computationCost": "2000000",
-        "storageCost": "49156800",
-        "storageRebate": "988000",
+        "computationCost": "0",
+        "storageCost": "0",
+        "storageRebate": "0",
         "nonRefundableStorageFee": "0"
       },
-      "timestamp_ms": 1729529127725,
+      "timestamp_ms": 1730201277471,
       "checkpoint_commitments": [],
       "end_of_epoch_data": {
         "nextEpochCommittee": [
@@ -37,16 +37,16 @@
         "epochCommitments": [
           {
             "ECMHLiveObjectSetDigest": {
-              "digest": "9HWmXguz7819cCZjTkrGVo4JZRW2xouuU48mzXn2kBLF"
+              "digest": "BcGNBp2x8z6g7PztfV8gH83mqwn6kFbVUCujttE31aMz"
             }
           }
         ],
-        "epochSupplyChange": 766999998000000
+        "epochSupplyChange": 767000000000000
       },
       "version_specific_data": [
         0,
         1,
-        110,
+        109,
         0,
         0,
         0,
@@ -57,8 +57,8 @@
       ]
     },
     "auth_signature": {
-      "epoch": 1,
-      "signature": "r9m20hZ9J6rx5wmfXQb5hCf/5KlUivWgLZYmD7L0X+E/psUu7Zt2/nv2QeJuv8Pa",
+      "epoch": 2,
+      "signature": "iZf2OsWQ2VwXEVaMjKP7A/dMXlWBHB9nJkybu2Slbyv0hblfLkZ43L94G85k3KBZ",
       "signers_map": [
         58,
         48,
@@ -76,11 +76,11 @@
         0,
         0,
         0,
-        0,
-        0,
         1,
         0,
         2,
+        0,
+        3,
         0
       ]
     }
@@ -89,12 +89,12 @@
     "V1": {
       "transactions": [
         {
-          "transaction": "9DHpHwoFnZzxHuv1Gyir6YFKWS8Ku9sJiTKw4k5qpM9W",
-          "effects": "6gy6Px9yi2dfPQDChyNHd4xcVHjQSB2DLcH7VrLpB3S4"
+          "transaction": "DXZzJ1raMzBmmoS3r1Qj183zfptm6CKAu9757eCfTXs6",
+          "effects": "HswoF6b5c4uf9e99vLd9owXKLYrkAvChqaExrCgfduaV"
         },
         {
-          "transaction": "Ai7U4nQvUNhzdARMaAGfisbHdNMHfRoTm1Z6xo74Q9Sr",
-          "effects": "XQ6d8gneNKRAWyLTATnwQ5UwvWLHsYhhcbCvLoahUpy"
+          "transaction": "Hero19xTN5BAmbkRVMG5HDAhrcp3ZiGiZwV2AFQSY1zX",
+          "effects": "ENitC7PnAdA8xLEPr7ZLizg7UDVHsaK9m6Mp74ufoSkr"
         }
       ],
       "user_signatures": [
@@ -120,57 +120,57 @@
                 "V1": {
                   "kind": {
                     "RandomnessStateUpdate": {
-                      "epoch": 1,
-                      "randomness_round": 110,
+                      "epoch": 2,
+                      "randomness_round": 109,
                       "random_bytes": [
-                        169,
-                        45,
-                        27,
-                        184,
-                        119,
-                        216,
-                        23,
-                        247,
-                        111,
-                        140,
-                        41,
-                        202,
-                        131,
-                        216,
-                        167,
-                        51,
-                        45,
-                        67,
-                        188,
+                        143,
+                        70,
+                        187,
+                        46,
+                        201,
+                        185,
+                        110,
+                        224,
                         52,
-                        155,
-                        45,
+                        24,
+                        25,
+                        44,
+                        218,
+                        30,
+                        83,
+                        163,
+                        233,
+                        49,
+                        75,
                         176,
-                        207,
+                        48,
+                        0,
+                        33,
+                        58,
+                        199,
+                        58,
+                        25,
+                        226,
+                        68,
+                        103,
+                        77,
+                        28,
+                        148,
+                        250,
+                        40,
+                        238,
+                        85,
+                        78,
                         224,
-                        46,
-                        196,
-                        218,
-                        115,
-                        27,
-                        67,
-                        60,
-                        255,
+                        227,
+                        232,
+                        247,
+                        121,
+                        174,
+                        235,
+                        58,
                         26,
-                        222,
-                        250,
-                        81,
-                        240,
-                        137,
-                        108,
-                        88,
-                        16,
-                        93,
-                        210,
-                        33,
-                        101,
-                        39,
-                        2
+                        55
                       ],
                       "randomness_obj_initial_shared_version": 1
                     }
@@ -200,22 +200,22 @@
         "auth_signature": {}
       },
       "effects": {
-        "V2": {
+        "V1": {
           "status": "Success",
-          "executed_epoch": 1,
+          "executed_epoch": 2,
           "gas_used": {
             "computationCost": "0",
             "storageCost": "0",
             "storageRebate": "0",
             "nonRefundableStorageFee": "0"
           },
-          "transaction_digest": "9DHpHwoFnZzxHuv1Gyir6YFKWS8Ku9sJiTKw4k5qpM9W",
+          "transaction_digest": "DXZzJ1raMzBmmoS3r1Qj183zfptm6CKAu9757eCfTXs6",
           "gas_object_index": null,
           "events_digest": null,
           "dependencies": [
-            "BywXXNQzNfPoqE5Uyk5GiexC4NbAsaRwYkEckTQSsheU"
+            "8VWr4hezGA89bdrsFjhiHwhH3Yb7Sgdiu7TpMF2qg6xL"
           ],
-          "lamport_version": 221,
+          "lamport_version": 329,
           "changed_objects": [
             [
               "0x0000000000000000000000000000000000000000000000000000000000000008",
@@ -223,8 +223,8 @@
                 "input_state": {
                   "Exist": [
                     [
-                      220,
-                      "7VTrWLbAFEFnNgTqjT2DJxDkztzxLtqfiYeiETG8ebaG"
+                      328,
+                      "7u3YmRT2a3owh7BP75FKfYtNNCW5sTWTLHsCcYCmRkmb"
                     ],
                     {
                       "Shared": {
@@ -235,7 +235,7 @@
                 },
                 "output_state": {
                   "ObjectWrite": [
-                    "C8Hx6y4tpctFTnLoroP6AH36ZzzJQAf5TTqHtG6DyNAm",
+                    "9W7RdccHD415DSncTEKvNirUywndbc5n5so9VQpGtVuT",
                     {
                       "Shared": {
                         "initial_shared_version": 1
@@ -247,24 +247,24 @@
               }
             ],
             [
-              "0x4d0a9bc4f3f924ec2ca5cf0a21231f9395356135046cb04479b5693adbebf5f5",
+              "0x5cd128d21b2c32cae57bcf06001d3974a7ab361a0b6d8defe085cc0b1fcfa371",
               {
                 "input_state": {
                   "Exist": [
                     [
-                      220,
-                      "9crQgJS7fJPiC7xjUDv2gNjecT95kJY8AMDGwBkGZFE5"
+                      328,
+                      "CdMjLDFMZTJhvMJFVDfppTusWSmsfYj9yEVPaZ58Ldcd"
                     ],
                     {
-                      "ObjectOwner": "0xca1970ef1eabdfedde54a846911e62209c9b48dc8b53498440bfc81ec5e0e113"
+                      "ObjectOwner": "0x401e3e380c24085ca4b94e3e96cfa8f501e112b2bfe8e8e44f9cd576bb76ff1c"
                     }
                   ]
                 },
                 "output_state": {
                   "ObjectWrite": [
-                    "6KULDLPma3WbFVNaGQLSTV2fNRsq7wcMxg4KzEiyPveY",
+                    "E9VNXVnAgiatQt1sWrm12CYwjn9Q6LuUueQ2dxF7aCTN",
                     {
-                      "ObjectOwner": "0xca1970ef1eabdfedde54a846911e62209c9b48dc8b53498440bfc81ec5e0e113"
+                      "ObjectOwner": "0x401e3e380c24085ca4b94e3e96cfa8f501e112b2bfe8e8e44f9cd576bb76ff1c"
                     }
                   ]
                 },
@@ -290,7 +290,7 @@
                 }
               },
               "has_public_transfer": false,
-              "version": 220,
+              "version": 328,
               "contents": [
                 0,
                 0,
@@ -324,38 +324,38 @@
                 0,
                 0,
                 8,
-                202,
-                25,
-                112,
-                239,
-                30,
-                171,
-                223,
-                237,
-                222,
-                84,
-                168,
-                70,
-                145,
-                30,
-                98,
-                32,
-                156,
-                155,
-                72,
-                220,
-                139,
-                83,
-                73,
-                132,
                 64,
-                191,
-                200,
                 30,
-                197,
-                224,
+                62,
+                56,
+                12,
+                36,
+                8,
+                92,
+                164,
+                185,
+                78,
+                62,
+                150,
+                207,
+                168,
+                245,
+                1,
                 225,
-                19,
+                18,
+                178,
+                191,
+                232,
+                232,
+                228,
+                79,
+                156,
+                213,
+                118,
+                187,
+                118,
+                255,
+                28,
                 1,
                 0,
                 0,
@@ -372,7 +372,7 @@
               "initial_shared_version": 1
             }
           },
-          "previous_transaction": "BywXXNQzNfPoqE5Uyk5GiexC4NbAsaRwYkEckTQSsheU",
+          "previous_transaction": "8VWr4hezGA89bdrsFjhiHwhH3Yb7Sgdiu7TpMF2qg6xL",
           "storage_rebate": 0
         },
         {
@@ -397,40 +397,40 @@
                 }
               },
               "has_public_transfer": false,
-              "version": 220,
+              "version": 328,
               "contents": [
-                77,
-                10,
-                155,
-                196,
-                243,
-                249,
-                36,
-                236,
+                92,
+                209,
+                40,
+                210,
+                27,
                 44,
-                165,
+                50,
+                202,
+                229,
+                123,
                 207,
-                10,
-                33,
-                35,
+                6,
+                0,
+                29,
+                57,
+                116,
+                167,
+                171,
+                54,
+                26,
+                11,
+                109,
+                141,
+                239,
+                224,
+                133,
+                204,
+                11,
                 31,
-                147,
-                149,
-                53,
-                97,
-                53,
-                4,
-                108,
-                176,
-                68,
-                121,
-                181,
-                105,
-                58,
-                219,
-                235,
-                245,
-                245,
+                207,
+                163,
+                113,
                 1,
                 0,
                 0,
@@ -447,7 +447,7 @@
                 0,
                 0,
                 0,
-                1,
+                2,
                 0,
                 0,
                 0,
@@ -455,7 +455,7 @@
                 0,
                 0,
                 0,
-                109,
+                108,
                 0,
                 0,
                 0,
@@ -464,61 +464,61 @@
                 0,
                 0,
                 48,
-                178,
+                164,
+                110,
+                211,
+                246,
+                211,
+                190,
+                255,
+                174,
+                222,
+                95,
+                69,
+                18,
+                72,
+                13,
+                39,
+                119,
+                147,
+                117,
+                189,
+                160,
+                110,
+                172,
+                213,
+                13,
+                0,
                 73,
-                19,
-                137,
-                216,
-                244,
-                38,
-                243,
-                68,
-                112,
-                79,
-                205,
-                70,
-                148,
-                181,
-                220,
-                242,
-                200,
-                85,
-                98,
-                114,
-                54,
-                194,
-                244,
-                118,
-                57,
-                1,
+                207,
+                170,
+                88,
+                241,
+                96,
+                229,
+                134,
+                24,
+                212,
+                132,
+                18,
+                147,
                 38,
-                169,
-                55,
-                84,
-                239,
-                1,
-                109,
-                120,
-                253,
-                167,
-                174,
-                43,
-                29,
-                43,
-                176,
+                197,
+                101,
                 22,
-                136,
-                78,
-                173,
-                74,
-                69
+                103,
+                31,
+                249,
+                151,
+                98,
+                238
               ]
             }
           },
           "owner": {
-            "ObjectOwner": "0xca1970ef1eabdfedde54a846911e62209c9b48dc8b53498440bfc81ec5e0e113"
+            "ObjectOwner": "0x401e3e380c24085ca4b94e3e96cfa8f501e112b2bfe8e8e44f9cd576bb76ff1c"
           },
-          "previous_transaction": "BywXXNQzNfPoqE5Uyk5GiexC4NbAsaRwYkEckTQSsheU",
+          "previous_transaction": "8VWr4hezGA89bdrsFjhiHwhH3Yb7Sgdiu7TpMF2qg6xL",
           "storage_rebate": 0
         }
       ],
@@ -535,7 +535,7 @@
                 }
               },
               "has_public_transfer": false,
-              "version": 221,
+              "version": 329,
               "contents": [
                 0,
                 0,
@@ -569,41 +569,41 @@
                 0,
                 0,
                 8,
-                202,
-                25,
-                112,
-                239,
-                30,
-                171,
-                223,
-                237,
-                222,
-                84,
-                168,
-                70,
-                145,
-                30,
-                98,
-                32,
-                156,
-                155,
-                72,
-                220,
-                139,
-                83,
-                73,
-                132,
                 64,
-                191,
-                200,
                 30,
-                197,
-                224,
-                225,
-                19,
-                1,
-                0,
-                0,
+                62,
+                56,
+                12,
+                36,
+                8,
+                92,
+                164,
+                185,
+                78,
+                62,
+                150,
+                207,
+                168,
+                245,
+                1,
+                225,
+                18,
+                178,
+                191,
+                232,
+                232,
+                228,
+                79,
+                156,
+                213,
+                118,
+                187,
+                118,
+                255,
+                28,
+                1,
+                0,
+                0,
                 0,
                 0,
                 0,
@@ -617,7 +617,7 @@
               "initial_shared_version": 1
             }
           },
-          "previous_transaction": "9DHpHwoFnZzxHuv1Gyir6YFKWS8Ku9sJiTKw4k5qpM9W",
+          "previous_transaction": "DXZzJ1raMzBmmoS3r1Qj183zfptm6CKAu9757eCfTXs6",
           "storage_rebate": 0
         },
         {
@@ -642,40 +642,40 @@
                 }
               },
               "has_public_transfer": false,
-              "version": 221,
+              "version": 329,
               "contents": [
-                77,
-                10,
-                155,
-                196,
-                243,
-                249,
-                36,
-                236,
+                92,
+                209,
+                40,
+                210,
+                27,
                 44,
-                165,
+                50,
+                202,
+                229,
+                123,
                 207,
-                10,
-                33,
-                35,
+                6,
+                0,
+                29,
+                57,
+                116,
+                167,
+                171,
+                54,
+                26,
+                11,
+                109,
+                141,
+                239,
+                224,
+                133,
+                204,
+                11,
                 31,
-                147,
-                149,
-                53,
-                97,
-                53,
-                4,
-                108,
-                176,
-                68,
-                121,
-                181,
-                105,
-                58,
-                219,
-                235,
-                245,
-                245,
+                207,
+                163,
+                113,
                 1,
                 0,
                 0,
@@ -692,7 +692,7 @@
                 0,
                 0,
                 0,
-                1,
+                2,
                 0,
                 0,
                 0,
@@ -700,7 +700,7 @@
                 0,
                 0,
                 0,
-                110,
+                109,
                 0,
                 0,
                 0,
@@ -709,61 +709,61 @@
                 0,
                 0,
                 48,
-                169,
-                45,
-                27,
-                184,
-                119,
-                216,
-                23,
-                247,
-                111,
-                140,
-                41,
-                202,
-                131,
-                216,
-                167,
-                51,
-                45,
-                67,
-                188,
+                143,
+                70,
+                187,
+                46,
+                201,
+                185,
+                110,
+                224,
                 52,
-                155,
-                45,
+                24,
+                25,
+                44,
+                218,
+                30,
+                83,
+                163,
+                233,
+                49,
+                75,
                 176,
-                207,
+                48,
+                0,
+                33,
+                58,
+                199,
+                58,
+                25,
+                226,
+                68,
+                103,
+                77,
+                28,
+                148,
+                250,
+                40,
+                238,
+                85,
+                78,
                 224,
-                46,
-                196,
-                218,
-                115,
-                27,
-                67,
-                60,
-                255,
+                227,
+                232,
+                247,
+                121,
+                174,
+                235,
+                58,
                 26,
-                222,
-                250,
-                81,
-                240,
-                137,
-                108,
-                88,
-                16,
-                93,
-                210,
-                33,
-                101,
-                39,
-                2
+                55
               ]
             }
           },
           "owner": {
-            "ObjectOwner": "0xca1970ef1eabdfedde54a846911e62209c9b48dc8b53498440bfc81ec5e0e113"
+            "ObjectOwner": "0x401e3e380c24085ca4b94e3e96cfa8f501e112b2bfe8e8e44f9cd576bb76ff1c"
           },
-          "previous_transaction": "9DHpHwoFnZzxHuv1Gyir6YFKWS8Ku9sJiTKw4k5qpM9W",
+          "previous_transaction": "DXZzJ1raMzBmmoS3r1Qj183zfptm6CKAu9757eCfTXs6",
           "storage_rebate": 0
         }
       ]
@@ -784,13 +784,13 @@
                     "EndOfEpochTransaction": [
                       {
                         "ChangeEpoch": {
-                          "epoch": 2,
+                          "epoch": 3,
                           "protocol_version": 1,
-                          "storage_charge": 49156800,
-                          "computation_charge": 2000000,
-                          "storage_rebate": 988000,
+                          "storage_charge": 0,
+                          "computation_charge": 0,
+                          "storage_rebate": 0,
                           "non_refundable_storage_fee": 0,
-                          "epoch_start_timestamp_ms": 1729529127725,
+                          "epoch_start_timestamp_ms": 1730201277471,
                           "system_packages": []
                         }
                       }
@@ -821,20 +821,20 @@
         "auth_signature": {}
       },
       "effects": {
-        "V2": {
+        "V1": {
           "status": "Success",
-          "executed_epoch": 1,
+          "executed_epoch": 2,
           "gas_used": {
             "computationCost": "0",
             "storageCost": "0",
             "storageRebate": "0",
             "nonRefundableStorageFee": "0"
           },
-          "transaction_digest": "Ai7U4nQvUNhzdARMaAGfisbHdNMHfRoTm1Z6xo74Q9Sr",
+          "transaction_digest": "Hero19xTN5BAmbkRVMG5HDAhrcp3ZiGiZwV2AFQSY1zX",
           "gas_object_index": null,
-          "events_digest": "CNr4zqN3Tar2Gnad3oWszg67f9yabe4ssp5761SJbBiA",
+          "events_digest": "9zGaJCuLCC2T5Ng6GQAEWzRfMSLtVkD1eByq4PNLXDXv",
           "dependencies": [
-            "CMc4L2hi22SFYwap6sHkdxoKaZp9h1q7hGfbXwyTkwsM"
+            "326n9ZcQDrJVxyFL8aWkknSmFahVxwpqZQ5q5ySmWrUy"
           ],
           "lamport_version": 4,
           "changed_objects": [
@@ -845,7 +845,7 @@
                   "Exist": [
                     [
                       3,
-                      "FTk3uefficRMCaXJsQ5rFG9KNfJk4jrq5z1pn2ekHhG1"
+                      "5KJjRy2WknTpWbU9Nr5Z9AVRyFErsJMi228npzNXksGN"
                     ],
                     {
                       "Shared": {
@@ -856,7 +856,7 @@
                 },
                 "output_state": {
                   "ObjectWrite": [
-                    "AtwD4qLHVejaPeFHhvi4LXrqzLE42JXg4JeFrP9p8xQj",
+                    "2wUUiT25J3c3kte6kKAwvBUx3S1ZfHw4EgRCtAC4LbUd",
                     {
                       "Shared": {
                         "initial_shared_version": 1
@@ -868,29 +868,14 @@
               }
             ],
             [
-              "0x228fd64cc34bce9703ab9c065757de80230e077a24ee530719e2ab5e182a5285",
-              {
-                "input_state": "NotExist",
-                "output_state": {
-                  "ObjectWrite": [
-                    "C4ZagH2ZXEKudq2rNPENMZzpSzeYKvaMaQj7wcPKpjaq",
-                    {
-                      "AddressOwner": "0xc7035483b90ae369f3ce48c3971bf58c19417997746c67320c35d154a6425ab7"
-                    }
-                  ]
-                },
-                "id_operation": "Created"
-              }
-            ],
-            [
-              "0x2d4fdbf664df716f49e8986c6445ad598c96b983f82bed3a37462b219b9e575f",
+              "0x383d6594155b73cb9e5d18e7b56964f605074e7c25b3efd71d627c6ac1210c7e",
               {
                 "input_state": "NotExist",
                 "output_state": {
                   "ObjectWrite": [
-                    "H5GAmbyesbwsxbMVDNTpUfQP2q44TB2ZFaGRcHCjqpUp",
+                    "CuwSptictsLKd3g1vHrrRziicFKo7oxKmmrMR8d71Yqc",
                     {
-                      "ObjectOwner": "0x7b94ac5bbd010c6a775455e3df1b6c9a8d24a9f6c2a9c20255b872b812fdbf87"
+                      "AddressOwner": "0x32482a229f83bace2da4c90b4dd99c8a73063a6a8ddc5bd6cc99ded87064912a"
                     }
                   ]
                 },
@@ -898,14 +883,14 @@
               }
             ],
             [
-              "0x3e2565c8c1c67806479a9104630757720e1f84e1fb32ae7aa858e9f47dbee7da",
+              "0x5a64d0121c78b4bc393c9f00707edffcb49723d54f2093a4055289ff31809456",
               {
                 "input_state": "NotExist",
                 "output_state": {
                   "ObjectWrite": [
-                    "8Fso3Xpi58J9L45Cr3J8NtfxG56KJ7X5ZLthQuf9oFcK",
+                    "FczboLsuwe8Ryc2VGPN93722u4fPiv4bH5WGb6pG3PTJ",
                     {
-                      "ObjectOwner": "0xc2c9ddd800c90e8a9f7f02f35379fdebe07532f71e953937fcd04fa84c7a24c0"
+                      "AddressOwner": "0x3bfb34ad6f452c61add36979ce9308a507f4ca7749817ba5a19a57d4ff2cd53f"
                     }
                   ]
                 },
@@ -913,14 +898,14 @@
               }
             ],
             [
-              "0x56288acf67d53b7dc2d75798e7212c4ea76c2d470822da30a32b8cbae2ff8276",
+              "0x62cc849198f570f3a5c73c230b3e853aa75b875d18ea1f6081c391499cb9d7f1",
               {
                 "input_state": "NotExist",
                 "output_state": {
                   "ObjectWrite": [
-                    "4qynmiRn3xtLn6qpQBwezRHBHWa8n5CSsisjHBmQ4diK",
+                    "HaQ2Vb5kvxSHDJw5KsuRRxESdCP5i78LHXuqGhQi4NLy",
                     {
-                      "AddressOwner": "0x98346c29a0a99b9d0a80c9ede37a77c7fd93ead295fdb01b895ef1392c5087b5"
+                      "AddressOwner": "0x2db19ce7b296633e49f48e863c2b08d5ea0a885273bfa574e2db0a85ece225e5"
                     }
                   ]
                 },
@@ -928,13 +913,13 @@
               }
             ],
             [
-              "0x5b890eaf2abcfa2ab90b77b8e6f3d5d8609586c3e583baf3dccd5af17edf48d1",
+              "0x6af2a2b7ca60bf76174adfd3e9c4957f8e937759603182f9b46c7f6c5f19c6d2",
               {
                 "input_state": {
                   "Exist": [
                     [
                       3,
-                      "9pHbG4dGV5ZcqW5xXDifYyRbmcJ1UhgXBXDssNTGU5UE"
+                      "GxfNuA2vW1Zdrj5G289Tdh6HsWdACP89oFniTQuuZfEM"
                     ],
                     {
                       "ObjectOwner": "0x0000000000000000000000000000000000000000000000000000000000000005"
@@ -943,7 +928,7 @@
                 },
                 "output_state": {
                   "ObjectWrite": [
-                    "2imNmGQQ91Pi4xfVvzJPEWfCnMwtoNDvXGQogUYBH7U2",
+                    "A7o1zRNRy3ego9n8Ug3BBi1wvDKMbMnKx4B3dgwXRtyC",
                     {
                       "ObjectOwner": "0x0000000000000000000000000000000000000000000000000000000000000005"
                     }
@@ -953,14 +938,29 @@
               }
             ],
             [
-              "0x89f2e6295f5f72668d7a6277002c2b3e06432100137163b7dbf0e9a2fef48e27",
+              "0x79535254784472b647d6df04a62c75c0660db5d569ce4650c6a874843188fff4",
+              {
+                "input_state": "NotExist",
+                "output_state": {
+                  "ObjectWrite": [
+                    "Gcteu6N6dbLaKxquYCFa7oBhALSGaPfeCTdTky8iCBWP",
+                    {
+                      "AddressOwner": "0x45e45dbd905642cc2ca9c3cfd1a0a1f9517758e5d98deb676040c49340c8b267"
+                    }
+                  ]
+                },
+                "id_operation": "Created"
+              }
+            ],
+            [
+              "0xb3c39b21e8d2c1ec5bd3bc65e3cad5bf042982d2c1970f1175f1b79123467574",
               {
                 "input_state": "NotExist",
                 "output_state": {
                   "ObjectWrite": [
-                    "7MKfZeY4tuZr5L7wRju57EAvK9rXyTeVCpnEgarqSVm1",
+                    "FsriCX8APrLJhBTEH3uRo2YJHKoxsYcL215QGGeastWu",
                     {
-                      "ObjectOwner": "0xa4c38f903d9744ca22430baeded1bc37c0ed3d75ce55683e69bd3d1fc40b6730"
+                      "ObjectOwner": "0x791f65cc868cc6ef0bc0ff4028939f10b96270274481cdebf421d647bef00b6e"
                     }
                   ]
                 },
@@ -968,14 +968,14 @@
               }
             ],
             [
-              "0xa01889812ec4f96f22525724e67f03b6b38776564a4cf22d7d6470f4388746c6",
+              "0xc7f052327e4a6cf61cbe61fe6ac46df43ecc35a0d5eb5281e07e763fd16844b9",
               {
                 "input_state": "NotExist",
                 "output_state": {
                   "ObjectWrite": [
-                    "9m7Z3SqT2ZkSCVenEXSCVqx9Y9YGmvZfoYw5fUaFsRDY",
+                    "3d4zH1TQunqSbR4nx4yuSBbcZEoLwpQwJ3W3GbUqQWbx",
                     {
-                      "AddressOwner": "0x48d90f650bf4d87ad129ec47392ec38a8c6c0bb5ea4b6dab610e3a841431ab99"
+                      "ObjectOwner": "0x3c32b42be3a2db1d7ddd51c85375127ff6aefb276834193e469e01e25d48f555"
                     }
                   ]
                 },
@@ -983,14 +983,14 @@
               }
             ],
             [
-              "0xe9a964b1b1723371ec453f21598f118456e5c939ddcc690afb624b302b6aae1d",
+              "0xd973de93992ad56b18aa6ac1e5d84f88bd5a8945ba7401b8eabe1bb146ad397c",
               {
                 "input_state": "NotExist",
                 "output_state": {
                   "ObjectWrite": [
-                    "5XMs3ivfZB1EyYAULSh2gHbXCgGDjoGtfLKv5LBrpSEY",
+                    "4ugJueQBifbvyqEcCPvrTaiG4RhCRDz2yiQSuPsma3oS",
                     {
-                      "AddressOwner": "0x3282178ff167d02a033e89d1280a1ec25f9dd069a0f1400c244192f1f75cbabc"
+                      "ObjectOwner": "0x131c437cac81c9875e4840c5265f232c2b4be1b28becda2d90e308fb722d2889"
                     }
                   ]
                 },
@@ -998,14 +998,14 @@
               }
             ],
             [
-              "0xf7511e85963352008dc8824dfd04ecc0b0e4e5c51ba04529bfb88fc5a2355dff",
+              "0xf1d4a76687efb7cac99372318b9632e10fe38eae83e572980a45732f30e7a3aa",
               {
                 "input_state": "NotExist",
                 "output_state": {
                   "ObjectWrite": [
-                    "B36V95Pu7Eq8WQhw5dpCeWiEMXNzQeDh84wDnox4UMXS",
+                    "BcJfCmzAkJC46fCsGGfbRPuCkqe1yktGfU4yHCAq3fmq",
                     {
-                      "ObjectOwner": "0x3f6b931f79fd0b2a14ed76a5b23714344c421f99a2ccd1978ef2270e167614cc"
+                      "ObjectOwner": "0x6450460d7e7be475407908e48144f095500bc73cf7254f91c182a45570d0cac6"
                     }
                   ]
                 },
@@ -1030,103 +1030,103 @@
               "type_args": []
             },
             "contents": [
-              232,
-              14,
-              72,
-              38,
-              40,
-              13,
-              121,
-              140,
-              248,
-              193,
-              87,
-              156,
-              150,
-              228,
-              154,
-              136,
-              166,
-              92,
               15,
-              240,
-              225,
-              156,
+              179,
+              7,
+              220,
+              99,
+              116,
+              11,
+              43,
+              34,
+              99,
               124,
+              173,
+              183,
+              91,
+              122,
+              153,
+              83,
               227,
-              251,
-              244,
-              22,
-              171,
-              191,
-              166,
-              19,
+              216,
               174,
-              199,
-              3,
-              84,
-              131,
-              185,
-              10,
-              227,
-              105,
-              243,
-              206,
-              72,
-              195,
-              151,
-              27,
-              245,
-              140,
-              25,
-              65,
-              121,
-              151,
-              116,
-              108,
-              103,
+              143,
+              123,
+              179,
+              93,
+              16,
+              223,
+              139,
               50,
-              12,
-              53,
-              209,
-              84,
-              166,
-              66,
-              90,
-              183,
-              199,
-              3,
-              84,
-              131,
-              185,
-              10,
-              227,
+              20,
+              184,
+              146,
+              41,
+              59,
+              251,
+              52,
+              173,
+              111,
+              69,
+              44,
+              97,
+              173,
+              211,
               105,
-              243,
+              121,
               206,
-              72,
-              195,
-              151,
-              27,
-              245,
-              140,
-              25,
-              65,
+              147,
+              8,
+              165,
+              7,
+              244,
+              202,
+              119,
+              73,
+              129,
+              123,
+              165,
+              161,
+              154,
+              87,
+              212,
+              255,
+              44,
+              213,
+              63,
+              59,
+              251,
+              52,
+              173,
+              111,
+              69,
+              44,
+              97,
+              173,
+              211,
+              105,
               121,
-              151,
-              116,
-              108,
-              103,
-              50,
-              12,
-              53,
-              209,
-              84,
-              166,
-              66,
-              90,
-              183,
-              1,
+              206,
+              147,
+              8,
+              165,
+              7,
+              244,
+              202,
+              119,
+              73,
+              129,
+              123,
+              165,
+              161,
+              154,
+              87,
+              212,
+              255,
+              44,
+              213,
+              63,
+              2,
               0,
               0,
               0,
@@ -1155,103 +1155,103 @@
               "type_args": []
             },
             "contents": [
-              251,
-              91,
-              71,
-              93,
-              58,
-              113,
-              7,
-              34,
-              32,
-              73,
-              58,
+              209,
+              123,
+              224,
+              206,
+              121,
+              241,
+              77,
+              244,
+              72,
+              86,
+              107,
+              103,
+              131,
+              192,
               239,
-              215,
-              234,
-              130,
-              32,
-              211,
-              15,
               101,
-              233,
-              95,
+              12,
+              50,
+              118,
+              14,
+              142,
               183,
-              248,
-              96,
-              141,
-              116,
-              3,
-              192,
-              80,
-              95,
-              180,
-              167,
-              152,
-              52,
-              108,
-              41,
-              160,
-              169,
-              155,
               157,
-              10,
-              128,
-              201,
-              237,
-              227,
-              122,
-              119,
-              199,
-              253,
-              147,
-              234,
-              210,
-              149,
-              253,
-              176,
-              27,
-              137,
-              94,
-              241,
-              57,
-              44,
-              80,
-              135,
-              181,
-              152,
-              52,
-              108,
-              41,
-              160,
-              169,
-              155,
               157,
+              157,
+              178,
+              187,
+              220,
+              115,
+              108,
+              181,
+              43,
+              45,
+              177,
+              156,
+              231,
+              178,
+              150,
+              99,
+              62,
+              73,
+              244,
+              142,
+              134,
+              60,
+              43,
+              8,
+              213,
+              234,
               10,
-              128,
-              201,
-              237,
-              227,
-              122,
-              119,
-              199,
-              253,
-              147,
+              136,
+              82,
+              115,
+              191,
+              165,
+              116,
+              226,
+              219,
+              10,
+              133,
+              236,
+              226,
+              37,
+              229,
+              45,
+              177,
+              156,
+              231,
+              178,
+              150,
+              99,
+              62,
+              73,
+              244,
+              142,
+              134,
+              60,
+              43,
+              8,
+              213,
               234,
-              210,
-              149,
-              253,
-              176,
-              27,
-              137,
-              94,
-              241,
-              57,
-              44,
-              80,
-              135,
-              181,
-              1,
+              10,
+              136,
+              82,
+              115,
+              191,
+              165,
+              116,
+              226,
+              219,
+              10,
+              133,
+              236,
+              226,
+              37,
+              229,
+              2,
               0,
               0,
               0,
@@ -1280,103 +1280,103 @@
               "type_args": []
             },
             "contents": [
-              87,
-              237,
-              32,
-              86,
-              222,
-              32,
-              49,
-              210,
-              53,
-              230,
-              10,
-              194,
-              125,
-              91,
-              46,
-              170,
+              242,
+              245,
+              215,
+              89,
+              82,
               128,
+              97,
               158,
-              85,
-              158,
+              1,
+              156,
+              124,
+              176,
+              4,
+              137,
+              192,
+              182,
+              113,
+              144,
+              74,
               11,
-              173,
-              248,
-              152,
-              226,
-              64,
-              231,
-              208,
-              252,
-              170,
-              26,
-              8,
               72,
-              217,
-              15,
-              101,
-              11,
-              244,
-              216,
-              122,
-              209,
-              41,
+              130,
+              17,
+              145,
+              107,
+              150,
+              212,
+              219,
               236,
-              71,
-              57,
-              46,
-              195,
-              138,
-              140,
-              108,
+              228,
+              205,
+              29,
+              50,
+              72,
+              42,
+              34,
+              159,
+              131,
+              186,
+              206,
+              45,
+              164,
+              201,
               11,
-              181,
-              234,
-              75,
-              109,
-              171,
-              97,
-              14,
+              77,
+              217,
+              156,
+              138,
+              115,
+              6,
               58,
-              132,
-              20,
-              49,
-              171,
+              106,
+              141,
+              220,
+              91,
+              214,
+              204,
               153,
-              72,
-              217,
-              15,
-              101,
-              11,
-              244,
+              222,
               216,
-              122,
-              209,
-              41,
-              236,
-              71,
-              57,
-              46,
-              195,
-              138,
-              140,
-              108,
+              112,
+              100,
+              145,
+              42,
+              50,
+              72,
+              42,
+              34,
+              159,
+              131,
+              186,
+              206,
+              45,
+              164,
+              201,
               11,
-              181,
-              234,
-              75,
-              109,
-              171,
-              97,
-              14,
+              77,
+              217,
+              156,
+              138,
+              115,
+              6,
               58,
-              132,
-              20,
-              49,
-              171,
+              106,
+              141,
+              220,
+              91,
+              214,
+              204,
               153,
-              1,
+              222,
+              216,
+              112,
+              100,
+              145,
+              42,
+              2,
               0,
               0,
               0,
@@ -1405,103 +1405,103 @@
               "type_args": []
             },
             "contents": [
-              12,
-              179,
-              128,
-              203,
-              50,
-              90,
-              131,
-              15,
-              3,
-              238,
-              75,
-              218,
+              26,
+              73,
+              49,
+              169,
+              67,
+              19,
               121,
+              35,
+              127,
+              251,
+              115,
+              102,
+              203,
               11,
+              73,
+              57,
+              227,
+              115,
               5,
-              225,
-              117,
-              83,
-              128,
-              22,
+              39,
+              92,
+              71,
+              87,
               245,
-              212,
-              124,
-              179,
-              82,
-              201,
-              60,
-              198,
-              218,
-              220,
-              19,
-              4,
-              50,
-              130,
-              23,
-              143,
-              241,
-              103,
-              208,
-              42,
-              3,
-              62,
-              137,
+              250,
+              108,
+              229,
+              163,
+              116,
+              21,
+              52,
+              122,
+              69,
+              228,
+              93,
+              189,
+              144,
+              86,
+              66,
+              204,
+              44,
+              169,
+              195,
+              207,
               209,
-              40,
-              10,
-              30,
-              194,
-              95,
-              157,
-              208,
-              105,
               160,
-              241,
+              161,
+              249,
+              81,
+              119,
+              88,
+              229,
+              217,
+              141,
+              235,
+              103,
+              96,
               64,
-              12,
-              36,
-              65,
-              146,
-              241,
-              247,
-              92,
-              186,
-              188,
-              50,
-              130,
-              23,
-              143,
-              241,
+              196,
+              147,
+              64,
+              200,
+              178,
               103,
-              208,
-              42,
-              3,
-              62,
-              137,
+              69,
+              228,
+              93,
+              189,
+              144,
+              86,
+              66,
+              204,
+              44,
+              169,
+              195,
+              207,
               209,
-              40,
-              10,
-              30,
-              194,
-              95,
-              157,
-              208,
-              105,
               160,
-              241,
+              161,
+              249,
+              81,
+              119,
+              88,
+              229,
+              217,
+              141,
+              235,
+              103,
+              96,
               64,
-              12,
-              36,
-              65,
-              146,
-              241,
-              247,
-              92,
-              186,
-              188,
-              1,
+              196,
+              147,
+              64,
+              200,
+              178,
+              103,
+              2,
               0,
               0,
               0,
@@ -1526,11 +1526,11 @@
             "type_": {
               "address": "0000000000000000000000000000000000000000000000000000000000000003",
               "module": "validator_set",
-              "name": "ValidatorEpochInfoEventV2",
+              "name": "ValidatorEpochInfoEventV1",
               "type_args": []
             },
             "contents": [
-              2,
+              3,
               0,
               0,
               0,
@@ -1538,38 +1538,38 @@
               0,
               0,
               0,
-              199,
-              3,
-              84,
-              131,
-              185,
-              10,
-              227,
+              59,
+              251,
+              52,
+              173,
+              111,
+              69,
+              44,
+              97,
+              173,
+              211,
               105,
-              243,
-              206,
-              72,
-              195,
-              151,
-              27,
-              245,
-              140,
-              25,
-              65,
               121,
-              151,
-              116,
-              108,
-              103,
-              50,
-              12,
-              53,
-              209,
-              84,
-              166,
-              66,
-              90,
-              183,
+              206,
+              147,
+              8,
+              165,
+              7,
+              244,
+              202,
+              119,
+              73,
+              129,
+              123,
+              165,
+              161,
+              154,
+              87,
+              212,
+              255,
+              44,
+              213,
+              63,
               232,
               3,
               0,
@@ -1579,12 +1579,12 @@
               0,
               0,
               0,
-              56,
-              111,
-              132,
-              8,
-              177,
-              6,
+              244,
+              17,
+              203,
+              109,
+              95,
+              7,
               0,
               196,
               9,
@@ -1611,19 +1611,19 @@
               0,
               0,
               0,
-              56,
-              111,
-              132,
-              8,
-              177,
-              6,
+              244,
+              17,
+              203,
+              109,
+              95,
+              7,
               0,
-              161,
-              32,
-              121,
-              162,
-              33,
-              90,
+              73,
+              5,
+              86,
+              4,
+              171,
+              92,
               5,
               0,
               0,
@@ -1644,11 +1644,11 @@
             "type_": {
               "address": "0000000000000000000000000000000000000000000000000000000000000003",
               "module": "validator_set",
-              "name": "ValidatorEpochInfoEventV2",
+              "name": "ValidatorEpochInfoEventV1",
               "type_args": []
             },
             "contents": [
-              2,
+              3,
               0,
               0,
               0,
@@ -1656,38 +1656,38 @@
               0,
               0,
               0,
-              152,
-              52,
-              108,
-              41,
-              160,
-              169,
-              155,
-              157,
-              10,
-              128,
-              201,
-              237,
-              227,
-              122,
-              119,
-              199,
-              253,
-              147,
+              45,
+              177,
+              156,
+              231,
+              178,
+              150,
+              99,
+              62,
+              73,
+              244,
+              142,
+              134,
+              60,
+              43,
+              8,
+              213,
               234,
-              210,
-              149,
-              253,
-              176,
-              27,
-              137,
-              94,
-              241,
-              57,
-              44,
-              80,
-              135,
-              181,
+              10,
+              136,
+              82,
+              115,
+              191,
+              165,
+              116,
+              226,
+              219,
+              10,
+              133,
+              236,
+              226,
+              37,
+              229,
               232,
               3,
               0,
@@ -1697,12 +1697,12 @@
               0,
               0,
               0,
-              56,
-              111,
-              132,
-              8,
-              177,
-              6,
+              244,
+              17,
+              203,
+              109,
+              95,
+              7,
               0,
               196,
               9,
@@ -1729,19 +1729,19 @@
               0,
               0,
               0,
-              56,
-              111,
-              132,
-              8,
-              177,
-              6,
+              244,
+              17,
+              203,
+              109,
+              95,
+              7,
               0,
-              161,
-              32,
-              121,
-              162,
-              33,
-              90,
+              73,
+              5,
+              86,
+              4,
+              171,
+              92,
               5,
               0,
               0,
@@ -1762,11 +1762,11 @@
             "type_": {
               "address": "0000000000000000000000000000000000000000000000000000000000000003",
               "module": "validator_set",
-              "name": "ValidatorEpochInfoEventV2",
+              "name": "ValidatorEpochInfoEventV1",
               "type_args": []
             },
             "contents": [
-              2,
+              3,
               0,
               0,
               0,
@@ -1774,38 +1774,38 @@
               0,
               0,
               0,
+              50,
               72,
-              217,
-              15,
-              101,
+              42,
+              34,
+              159,
+              131,
+              186,
+              206,
+              45,
+              164,
+              201,
               11,
-              244,
-              216,
-              122,
-              209,
-              41,
-              236,
-              71,
-              57,
-              46,
-              195,
+              77,
+              217,
+              156,
               138,
-              140,
-              108,
-              11,
-              181,
-              234,
-              75,
-              109,
-              171,
-              97,
-              14,
+              115,
+              6,
               58,
-              132,
-              20,
-              49,
-              171,
+              106,
+              141,
+              220,
+              91,
+              214,
+              204,
               153,
+              222,
+              216,
+              112,
+              100,
+              145,
+              42,
               232,
               3,
               0,
@@ -1815,12 +1815,12 @@
               0,
               0,
               0,
-              56,
-              111,
-              132,
-              8,
-              177,
-              6,
+              244,
+              17,
+              203,
+              109,
+              95,
+              7,
               0,
               196,
               9,
@@ -1847,19 +1847,19 @@
               0,
               0,
               0,
-              56,
-              111,
-              132,
-              8,
-              177,
-              6,
+              244,
+              17,
+              203,
+              109,
+              95,
+              7,
               0,
-              161,
-              32,
-              121,
-              162,
-              33,
-              90,
+              73,
+              5,
+              86,
+              4,
+              171,
+              92,
               5,
               0,
               0,
@@ -1880,11 +1880,11 @@
             "type_": {
               "address": "0000000000000000000000000000000000000000000000000000000000000003",
               "module": "validator_set",
-              "name": "ValidatorEpochInfoEventV2",
+              "name": "ValidatorEpochInfoEventV1",
               "type_args": []
             },
             "contents": [
-              2,
+              3,
               0,
               0,
               0,
@@ -1892,38 +1892,38 @@
               0,
               0,
               0,
-              50,
-              130,
-              23,
-              143,
-              241,
-              103,
-              208,
-              42,
-              3,
-              62,
-              137,
+              69,
+              228,
+              93,
+              189,
+              144,
+              86,
+              66,
+              204,
+              44,
+              169,
+              195,
+              207,
               209,
-              40,
-              10,
-              30,
-              194,
-              95,
-              157,
-              208,
-              105,
               160,
-              241,
+              161,
+              249,
+              81,
+              119,
+              88,
+              229,
+              217,
+              141,
+              235,
+              103,
+              96,
               64,
-              12,
-              36,
-              65,
-              146,
-              241,
-              247,
-              92,
-              186,
-              188,
+              196,
+              147,
+              64,
+              200,
+              178,
+              103,
               232,
               3,
               0,
@@ -1933,12 +1933,12 @@
               0,
               0,
               0,
-              56,
-              111,
-              132,
-              8,
-              177,
-              6,
+              244,
+              17,
+              203,
+              109,
+              95,
+              7,
               0,
               196,
               9,
@@ -1965,19 +1965,19 @@
               0,
               0,
               0,
-              56,
-              111,
-              132,
-              8,
-              177,
-              6,
+              244,
+              17,
+              203,
+              109,
+              95,
+              7,
               0,
-              161,
-              32,
-              121,
-              162,
-              33,
-              90,
+              73,
+              5,
+              86,
+              4,
+              171,
+              92,
               5,
               0,
               0,
@@ -1998,11 +1998,11 @@
             "type_": {
               "address": "0000000000000000000000000000000000000000000000000000000000000003",
               "module": "iota_system_state_inner",
-              "name": "SystemEpochInfoEvent",
+              "name": "SystemEpochInfoEventV1",
               "type_args": []
             },
             "contents": [
-              2,
+              3,
               0,
               0,
               0,
@@ -2027,40 +2027,40 @@
               0,
               0,
               0,
-              224,
-              188,
-              17,
-              34,
-              196,
-              26,
+              208,
+              71,
+              44,
+              183,
+              125,
+              29,
+              0,
+              0,
+              0,
+              0,
+              0,
+              0,
+              0,
+              0,
+              0,
+              0,
+              0,
+              0,
+              0,
+              0,
               0,
-              192,
-              18,
-              238,
-              2,
               0,
               0,
               0,
               0,
-              96,
-              19,
-              15,
               0,
               0,
               0,
               0,
               0,
-              96,
-              255,
-              222,
-              2,
               0,
               0,
               0,
               0,
-              128,
-              132,
-              30,
               0,
               0,
               0,
@@ -2082,9 +2082,9 @@
               0,
               0,
               0,
-              128,
-              107,
-              108,
+              0,
+              240,
+              138,
               26,
               149,
               185,
@@ -2141,7 +2141,7 @@
                 0,
                 0,
                 5,
-                2,
+                1,
                 0,
                 0,
                 0,
@@ -2157,8 +2157,8 @@
               "initial_shared_version": 1
             }
           },
-          "previous_transaction": "CMc4L2hi22SFYwap6sHkdxoKaZp9h1q7hGfbXwyTkwsM",
-          "storage_rebate": 1451600
+          "previous_transaction": "326n9ZcQDrJVxyFL8aWkknSmFahVxwpqZQ5q5ySmWrUy",
+          "storage_rebate": 0
         },
         {
           "data": {
@@ -2174,7 +2174,7 @@
                       "struct": {
                         "address": "0000000000000000000000000000000000000000000000000000000000000003",
                         "module": "iota_system_state_inner",
-                        "name": "IotaSystemStateInnerV2",
+                        "name": "IotaSystemStateV1",
                         "type_args": []
                       }
                     }
@@ -2184,39 +2184,39 @@
               "has_public_transfer": false,
               "version": 3,
               "contents": [
-                91,
-                137,
-                14,
-                175,
-                42,
-                188,
-                250,
-                42,
-                185,
-                11,
-                119,
-                184,
-                230,
-                243,
-                213,
-                216,
+                106,
+                242,
+                162,
+                183,
+                202,
                 96,
-                149,
-                134,
-                195,
-                229,
-                131,
-                186,
-                243,
-                220,
-                205,
-                90,
-                241,
-                126,
+                191,
+                118,
+                23,
+                74,
                 223,
-                72,
-                209,
-                2,
+                211,
+                233,
+                196,
+                149,
+                127,
+                142,
+                147,
+                119,
+                89,
+                96,
+                49,
+                130,
+                249,
+                180,
+                108,
+                127,
+                108,
+                95,
+                25,
+                198,
+                210,
+                1,
                 0,
                 0,
                 0,
@@ -2224,7 +2224,7 @@
                 0,
                 0,
                 0,
-                1,
+                2,
                 0,
                 0,
                 0,
@@ -2240,7 +2240,7 @@
                 0,
                 0,
                 0,
-                2,
+                1,
                 0,
                 0,
                 0,
@@ -2248,87 +2248,87 @@
                 0,
                 0,
                 0,
-                79,
-                119,
-                144,
-                163,
-                247,
-                191,
-                45,
-                221,
-                234,
-                6,
-                103,
-                112,
-                156,
-                173,
-                41,
-                65,
-                7,
-                198,
-                139,
-                39,
-                85,
-                185,
-                144,
-                234,
-                233,
-                27,
-                255,
-                32,
-                224,
-                150,
+                57,
+                250,
                 115,
+                22,
+                182,
+                11,
+                178,
+                229,
+                253,
                 205,
-                0,
-                240,
-                105,
-                42,
+                92,
+                179,
+                236,
+                134,
+                160,
+                75,
+                54,
+                44,
+                186,
+                33,
+                145,
+                160,
+                137,
+                160,
+                136,
                 5,
-                130,
-                100,
+                12,
+                185,
+                38,
+                134,
+                120,
+                155,
+                0,
+                224,
+                244,
+                68,
+                154,
+                59,
+                103,
                 43,
                 0,
-                240,
-                49,
-                247,
-                140,
-                10,
-                24,
+                224,
+                188,
+                17,
+                34,
+                196,
+                26,
                 0,
                 4,
-                199,
-                3,
-                84,
-                131,
-                185,
-                10,
-                227,
+                59,
+                251,
+                52,
+                173,
+                111,
+                69,
+                44,
+                97,
+                173,
+                211,
                 105,
-                243,
-                206,
-                72,
-                195,
-                151,
-                27,
-                245,
-                140,
-                25,
-                65,
                 121,
-                151,
-                116,
-                108,
-                103,
-                50,
-                12,
-                53,
-                209,
-                84,
-                166,
-                66,
-                90,
-                183,
+                206,
+                147,
+                8,
+                165,
+                7,
+                244,
+                202,
+                119,
+                73,
+                129,
+                123,
+                165,
+                161,
+                154,
+                87,
+                212,
+                255,
+                44,
+                213,
+                63,
                 96,
                 141,
                 207,
@@ -2427,120 +2427,120 @@
                 56,
                 212,
                 32,
+                32,
+                38,
+                163,
+                54,
+                223,
+                222,
+                200,
+                16,
+                231,
+                136,
+                101,
+                109,
+                60,
+                170,
                 54,
-                229,
-                149,
-                160,
-                153,
-                0,
-                149,
-                41,
-                2,
-                12,
-                159,
-                11,
-                237,
                 183,
+                183,
+                132,
                 232,
-                172,
-                239,
-                21,
+                253,
+                218,
+                17,
+                151,
+                230,
+                164,
                 94,
-                208,
-                184,
-                219,
-                158,
-                170,
-                43,
-                150,
-                93,
-                242,
+                212,
+                132,
+                90,
+                230,
+                7,
+                98,
                 32,
-                222,
-                246,
-                207,
+                217,
+                53,
+                60,
+                49,
+                54,
+                152,
+                131,
+                119,
+                1,
                 32,
-                245,
-                64,
-                76,
-                18,
-                227,
-                129,
-                141,
-                164,
-                251,
-                225,
-                193,
-                225,
-                255,
-                222,
-                40,
-                239,
-                108,
-                248,
-                77,
-                176,
-                165,
-                136,
+                5,
+                215,
+                206,
+                234,
+                120,
+                214,
+                210,
                 148,
+                142,
+                129,
+                161,
+                106,
+                254,
+                253,
+                73,
+                188,
+                78,
+                237,
+                59,
+                75,
+                133,
+                63,
+                48,
+                175,
+                52,
+                76,
+                124,
                 156,
+                164,
+                117,
+                75,
+                204,
+                212,
+                49,
+                8,
+                33,
+                96,
+                102,
+                254,
+                60,
                 113,
-                25,
-                160,
-                250,
-                14,
-                98,
-                198,
-                178,
-                48,
-                148,
-                81,
-                45,
-                99,
-                42,
-                80,
-                47,
-                61,
-                69,
-                193,
-                153,
-                23,
-                69,
-                77,
-                65,
-                148,
+                252,
+                79,
+                3,
+                66,
+                110,
+                30,
+                211,
+                234,
+                248,
+                46,
+                26,
                 12,
-                218,
-                166,
+                142,
                 136,
-                89,
+                104,
+                199,
+                247,
+                129,
+                48,
+                228,
                 61,
-                102,
-                137,
                 39,
-                225,
-                90,
-                67,
-                159,
-                177,
-                77,
-                46,
-                144,
-                186,
-                192,
-                151,
-                223,
-                1,
-                151,
-                220,
-                117,
-                33,
-                235,
-                142,
+                13,
+                72,
                 101,
-                76,
-                246,
-                207,
+                101,
+                199,
+                19,
+                109,
+                21,
                 11,
                 118,
                 97,
@@ -2576,11 +2576,11 @@
                 99,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                48,
-                49,
+                52,
+                52,
+                54,
                 47,
                 104,
                 116,
@@ -2606,11 +2606,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                48,
-                51,
+                52,
+                52,
+                56,
                 24,
                 47,
                 105,
@@ -2631,37 +2631,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                48,
-                57,
-                24,
-                47,
-                105,
-                112,
                 52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
                 53,
-                50,
-                49,
-                49,
-                49,
-                0,
+                52,
                 0,
                 0,
                 0,
@@ -2669,38 +2643,38 @@
                 0,
                 0,
                 0,
-                158,
-                21,
-                4,
-                132,
-                147,
-                197,
-                55,
-                157,
-                104,
-                199,
-                11,
+                237,
+                202,
+                141,
                 82,
-                210,
-                44,
-                230,
-                232,
-                51,
-                81,
-                13,
+                243,
+                82,
+                185,
+                130,
+                172,
+                46,
+                92,
+                14,
+                227,
+                72,
+                139,
+                162,
+                213,
+                206,
                 89,
-                112,
-                234,
-                251,
-                255,
-                56,
-                23,
-                190,
-                253,
-                67,
-                99,
-                84,
-                234,
+                121,
+                179,
+                214,
+                64,
+                241,
+                40,
+                30,
+                200,
+                224,
+                136,
+                215,
+                39,
+                57,
                 0,
                 0,
                 0,
@@ -2717,38 +2691,38 @@
                 0,
                 0,
                 0,
-                58,
-                173,
-                132,
-                75,
-                224,
-                93,
-                90,
-                60,
-                253,
-                176,
-                39,
-                11,
-                172,
+                74,
+                247,
                 153,
-                12,
-                113,
-                237,
-                20,
-                103,
-                149,
-                114,
-                8,
-                32,
-                12,
-                59,
-                244,
-                40,
-                38,
-                44,
-                61,
-                175,
-                1,
+                224,
+                143,
+                124,
+                199,
+                167,
+                208,
+                50,
+                229,
+                166,
+                53,
+                141,
+                230,
+                155,
+                237,
+                8,
+                69,
+                247,
+                162,
+                221,
+                120,
+                65,
+                215,
+                137,
+                47,
+                111,
+                156,
+                51,
+                80,
+                173,
                 232,
                 3,
                 0,
@@ -2757,38 +2731,38 @@
                 0,
                 0,
                 0,
-                232,
-                14,
-                72,
-                38,
-                40,
-                13,
-                121,
-                140,
-                248,
-                193,
-                87,
-                156,
-                150,
-                228,
-                154,
-                136,
-                166,
-                92,
                 15,
-                240,
-                225,
-                156,
+                179,
+                7,
+                220,
+                99,
+                116,
+                11,
+                43,
+                34,
+                99,
                 124,
+                173,
+                183,
+                91,
+                122,
+                153,
+                83,
                 227,
-                251,
-                244,
-                22,
-                171,
-                191,
-                166,
-                19,
+                216,
                 174,
+                143,
+                123,
+                179,
+                93,
+                16,
+                223,
+                139,
+                50,
+                20,
+                184,
+                146,
+                41,
                 1,
                 0,
                 0,
@@ -2800,62 +2774,62 @@
                 0,
                 0,
                 0,
-                124,
-                204,
-                61,
-                163,
-                2,
+                56,
+                111,
+                132,
+                8,
+                177,
                 6,
                 0,
                 0,
-                174,
-                210,
-                94,
-                232,
-                170,
-                0,
+                92,
+                165,
+                189,
+                208,
+                85,
+                1,
                 0,
-                145,
-                108,
-                209,
-                118,
-                87,
-                87,
+                161,
+                32,
+                121,
+                162,
+                33,
+                90,
                 5,
                 0,
-                194,
-                201,
-                221,
-                216,
-                0,
-                201,
-                14,
-                138,
-                159,
-                127,
-                2,
-                243,
-                83,
-                121,
-                253,
-                235,
-                224,
+                100,
+                80,
+                70,
+                13,
+                126,
+                123,
+                228,
                 117,
-                50,
-                247,
-                30,
+                64,
+                121,
+                8,
+                228,
+                129,
+                68,
+                240,
                 149,
-                57,
-                55,
-                252,
-                208,
+                80,
+                11,
+                199,
+                60,
+                247,
+                37,
                 79,
-                168,
-                76,
-                122,
-                36,
-                192,
-                2,
+                145,
+                193,
+                130,
+                164,
+                85,
+                112,
+                208,
+                202,
+                198,
+                3,
                 0,
                 0,
                 0,
@@ -2887,38 +2861,38 @@
                 0,
                 0,
                 0,
-                28,
-                3,
+                66,
+                171,
+                40,
+                184,
+                198,
+                248,
+                37,
+                80,
+                178,
+                91,
                 133,
-                57,
-                100,
-                73,
-                32,
-                113,
-                183,
-                112,
-                201,
-                166,
+                208,
+                36,
+                170,
+                67,
+                205,
                 191,
-                35,
-                47,
-                34,
-                32,
-                159,
-                48,
-                137,
-                3,
-                222,
-                105,
-                110,
-                220,
-                204,
-                41,
-                226,
-                63,
-                78,
-                18,
-                254,
+                10,
+                49,
+                13,
+                172,
+                27,
+                248,
+                33,
+                15,
+                228,
+                163,
+                61,
+                156,
+                207,
+                73,
+                153,
                 0,
                 0,
                 0,
@@ -2936,14 +2910,14 @@
                 0,
                 0,
                 0,
-                124,
-                204,
-                61,
-                163,
-                2,
-                6,
-                0,
-                232,
+                56,
+                111,
+                132,
+                8,
+                177,
+                6,
+                0,
+                232,
                 3,
                 0,
                 0,
@@ -2959,38 +2933,38 @@
                 0,
                 0,
                 0,
-                215,
-                233,
-                197,
-                73,
-                0,
-                103,
-                112,
-                32,
-                41,
-                241,
+                154,
+                63,
+                153,
+                219,
+                190,
                 60,
-                231,
-                183,
-                150,
+                107,
+                172,
+                161,
                 128,
-                181,
-                240,
+                223,
+                192,
+                219,
+                114,
+                132,
+                40,
+                213,
+                246,
+                227,
+                9,
+                177,
                 93,
-                160,
-                34,
-                202,
-                137,
-                79,
-                180,
-                142,
-                204,
-                252,
-                45,
-                63,
-                115,
-                54,
-                18,
+                243,
+                81,
+                126,
+                145,
+                127,
+                241,
+                139,
+                224,
+                194,
+                8,
                 0,
                 0,
                 0,
@@ -2999,38 +2973,38 @@
                 0,
                 0,
                 0,
-                152,
-                52,
-                108,
-                41,
-                160,
-                169,
-                155,
-                157,
-                10,
-                128,
-                201,
-                237,
-                227,
-                122,
-                119,
-                199,
-                253,
-                147,
+                45,
+                177,
+                156,
+                231,
+                178,
+                150,
+                99,
+                62,
+                73,
+                244,
+                142,
+                134,
+                60,
+                43,
+                8,
+                213,
                 234,
-                210,
-                149,
-                253,
-                176,
-                27,
-                137,
-                94,
-                241,
-                57,
-                44,
-                80,
-                135,
-                181,
+                10,
+                136,
+                82,
+                115,
+                191,
+                165,
+                116,
+                226,
+                219,
+                10,
+                133,
+                236,
+                226,
+                37,
+                229,
                 96,
                 153,
                 242,
@@ -3129,120 +3103,120 @@
                 26,
                 16,
                 32,
-                203,
-                102,
-                81,
-                231,
-                227,
-                62,
-                133,
-                128,
-                82,
-                172,
-                128,
+                122,
+                3,
+                30,
+                157,
+                52,
+                195,
+                36,
                 160,
-                66,
-                220,
-                100,
-                44,
                 76,
-                81,
-                90,
-                157,
-                141,
-                9,
-                51,
-                103,
-                152,
-                49,
-                100,
-                219,
-                11,
-                122,
-                111,
-                172,
-                32,
-                207,
-                136,
-                11,
-                207,
-                233,
-                27,
-                111,
-                229,
-                25,
-                40,
-                88,
-                39,
-                71,
-                22,
-                200,
+                194,
+                183,
                 16,
-                132,
-                203,
-                110,
-                41,
-                43,
-                82,
-                213,
-                213,
-                214,
-                217,
                 106,
-                48,
-                242,
-                227,
+                36,
+                32,
+                2,
+                216,
+                206,
+                21,
+                7,
+                4,
+                151,
+                70,
+                39,
                 234,
-                136,
-                48,
+                215,
+                20,
+                41,
+                150,
+                113,
+                224,
+                91,
+                32,
+                3,
+                60,
+                195,
+                7,
+                177,
+                11,
+                189,
+                198,
+                69,
+                193,
+                118,
+                101,
                 132,
-                51,
-                104,
-                180,
-                35,
-                134,
-                184,
-                250,
-                233,
-                184,
+                133,
+                243,
+                255,
+                102,
+                108,
+                2,
+                133,
+                7,
+                68,
+                189,
+                150,
+                46,
+                93,
+                146,
+                0,
+                141,
+                222,
+                107,
                 252,
-                132,
-                203,
-                143,
+                48,
+                173,
+                72,
+                33,
+                196,
+                123,
+                102,
+                115,
+                188,
+                207,
+                117,
+                48,
+                189,
+                20,
+                63,
+                36,
+                94,
+                101,
+                110,
+                96,
+                96,
+                218,
+                135,
+                207,
                 130,
-                190,
-                89,
-                79,
-                35,
-                164,
-                172,
-                124,
-                161,
-                131,
+                60,
+                108,
+                28,
+                33,
+                226,
+                4,
+                178,
+                120,
+                120,
+                61,
+                127,
+                163,
+                62,
                 231,
-                233,
-                47,
-                142,
-                173,
-                185,
-                209,
-                100,
-                170,
-                167,
+                69,
+                205,
+                199,
+                183,
                 145,
-                170,
-                117,
-                169,
-                65,
-                129,
-                197,
-                80,
-                165,
-                227,
-                124,
-                52,
-                71,
-                172,
+                196,
+                92,
+                33,
+                251,
+                211,
                 11,
                 118,
                 97,
@@ -3278,11 +3252,11 @@
                 99,
                 112,
                 47,
+                54,
                 53,
-                50,
-                48,
-                56,
-                55,
+                52,
+                51,
+                54,
                 47,
                 104,
                 116,
@@ -3308,11 +3282,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                48,
+                52,
+                51,
                 56,
-                57,
                 24,
                 47,
                 105,
@@ -3333,76 +3307,50 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                48,
-                57,
-                53,
-                24,
-                47,
-                105,
-                112,
                 52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
-                53,
-                50,
-                48,
-                57,
-                55,
-                0,
-                0,
+                52,
+                52,
                 0,
                 0,
                 0,
                 0,
                 0,
                 0,
-                111,
-                108,
-                251,
-                55,
-                106,
-                70,
                 0,
-                83,
-                166,
-                65,
-                77,
-                255,
-                24,
+                139,
+                224,
+                68,
+                32,
+                91,
+                176,
+                203,
+                154,
+                171,
+                120,
                 35,
-                226,
-                124,
-                182,
-                112,
-                225,
-                195,
-                108,
-                2,
-                145,
-                10,
-                215,
-                79,
-                160,
+                40,
+                91,
+                57,
                 179,
+                164,
+                23,
                 110,
-                91,
-                27,
-                7,
+                253,
+                173,
+                253,
+                143,
+                209,
+                90,
+                0,
+                61,
+                90,
+                186,
+                109,
+                177,
+                59,
+                90,
                 0,
                 0,
                 0,
@@ -3419,38 +3367,38 @@
                 0,
                 0,
                 0,
-                182,
-                37,
-                132,
-                69,
-                191,
-                87,
-                35,
-                192,
-                23,
-                153,
-                64,
-                68,
-                151,
-                249,
-                39,
-                198,
-                66,
-                80,
-                154,
-                234,
-                83,
-                180,
-                249,
-                23,
-                44,
-                27,
-                124,
-                233,
-                248,
-                200,
+                18,
+                5,
+                29,
+                220,
+                228,
+                186,
                 162,
-                175,
+                227,
+                204,
+                127,
+                217,
+                247,
+                93,
+                81,
+                88,
+                63,
+                196,
+                75,
+                65,
+                142,
+                11,
+                57,
+                159,
+                31,
+                113,
+                251,
+                185,
+                116,
+                209,
+                4,
+                123,
+                14,
                 232,
                 3,
                 0,
@@ -3459,38 +3407,38 @@
                 0,
                 0,
                 0,
-                251,
-                91,
-                71,
-                93,
-                58,
-                113,
-                7,
-                34,
-                32,
-                73,
-                58,
+                209,
+                123,
+                224,
+                206,
+                121,
+                241,
+                77,
+                244,
+                72,
+                86,
+                107,
+                103,
+                131,
+                192,
                 239,
-                215,
-                234,
-                130,
-                32,
-                211,
-                15,
                 101,
-                233,
-                95,
+                12,
+                50,
+                118,
+                14,
+                142,
                 183,
-                248,
-                96,
-                141,
-                116,
-                3,
-                192,
-                80,
-                95,
-                180,
-                167,
+                157,
+                157,
+                157,
+                178,
+                187,
+                220,
+                115,
+                108,
+                181,
+                43,
                 1,
                 0,
                 0,
@@ -3502,62 +3450,62 @@
                 0,
                 0,
                 0,
-                124,
-                204,
-                61,
-                163,
-                2,
+                56,
+                111,
+                132,
+                8,
+                177,
                 6,
                 0,
                 0,
-                174,
-                210,
-                94,
-                232,
-                170,
-                0,
+                92,
+                165,
+                189,
+                208,
+                85,
+                1,
                 0,
-                145,
-                108,
-                209,
-                118,
-                87,
-                87,
+                161,
+                32,
+                121,
+                162,
+                33,
+                90,
                 5,
                 0,
-                164,
-                195,
-                143,
-                144,
-                61,
-                151,
-                68,
-                202,
-                34,
-                67,
+                121,
+                31,
+                101,
+                204,
+                134,
+                140,
+                198,
+                239,
                 11,
-                174,
-                222,
-                209,
-                188,
-                55,
                 192,
-                237,
-                61,
-                117,
-                206,
-                85,
-                104,
-                62,
-                105,
-                189,
-                61,
-                31,
-                196,
+                255,
+                64,
+                40,
+                147,
+                159,
+                16,
+                185,
+                98,
+                112,
+                39,
+                68,
+                129,
+                205,
+                235,
+                244,
+                33,
+                214,
+                71,
+                190,
+                240,
                 11,
-                103,
-                48,
-                2,
+                110,
+                3,
                 0,
                 0,
                 0,
@@ -3589,38 +3537,38 @@
                 0,
                 0,
                 0,
-                86,
-                11,
-                133,
-                42,
-                34,
-                128,
+                162,
+                2,
                 46,
-                144,
-                245,
-                237,
-                103,
-                194,
-                141,
-                145,
-                70,
-                227,
-                187,
+                57,
+                140,
+                215,
+                171,
+                207,
+                199,
+                51,
+                119,
                 103,
-                72,
-                225,
-                126,
-                12,
-                195,
-                94,
-                216,
-                109,
-                11,
-                185,
+                99,
+                159,
                 136,
-                231,
-                209,
-                101,
+                104,
+                178,
+                52,
+                54,
+                253,
+                140,
+                74,
+                230,
+                132,
+                248,
+                104,
+                75,
+                249,
+                252,
+                181,
+                229,
+                232,
                 0,
                 0,
                 0,
@@ -3638,11 +3586,11 @@
                 0,
                 0,
                 0,
-                124,
-                204,
-                61,
-                163,
-                2,
+                56,
+                111,
+                132,
+                8,
+                177,
                 6,
                 0,
                 232,
@@ -3661,78 +3609,78 @@
                 0,
                 0,
                 0,
-                48,
-                196,
-                28,
-                202,
-                166,
-                13,
-                73,
-                199,
-                135,
-                166,
+                251,
+                213,
+                102,
                 25,
-                93,
-                219,
-                125,
-                63,
-                116,
-                202,
-                177,
-                217,
-                91,
-                147,
-                64,
-                31,
-                161,
-                218,
-                162,
-                170,
-                69,
-                161,
-                76,
-                100,
-                232,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                72,
-                217,
-                15,
-                101,
+                149,
+                159,
+                37,
+                192,
+                210,
+                95,
+                204,
+                21,
+                18,
+                42,
+                226,
+                5,
+                226,
+                152,
+                81,
+                144,
+                191,
+                110,
+                76,
+                51,
+                233,
+                213,
+                87,
+                45,
+                246,
+                101,
+                58,
+                130,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                50,
+                72,
+                42,
+                34,
+                159,
+                131,
+                186,
+                206,
+                45,
+                164,
+                201,
                 11,
-                244,
-                216,
-                122,
-                209,
-                41,
-                236,
-                71,
-                57,
-                46,
-                195,
+                77,
+                217,
+                156,
                 138,
-                140,
-                108,
-                11,
-                181,
-                234,
-                75,
-                109,
-                171,
-                97,
-                14,
+                115,
+                6,
                 58,
-                132,
-                20,
-                49,
-                171,
+                106,
+                141,
+                220,
+                91,
+                214,
+                204,
                 153,
+                222,
+                216,
+                112,
+                100,
+                145,
+                42,
                 96,
                 173,
                 222,
@@ -3831,120 +3779,120 @@
                 88,
                 242,
                 32,
-                157,
-                111,
-                65,
+                97,
+                138,
+                198,
+                62,
+                136,
+                198,
+                103,
+                175,
+                249,
                 91,
-                154,
-                116,
-                26,
+                77,
+                120,
+                56,
+                146,
+                191,
+                105,
+                25,
+                87,
+                27,
+                118,
+                59,
+                62,
+                33,
+                84,
+                159,
+                132,
+                242,
+                67,
+                253,
+                50,
+                9,
+                132,
                 32,
-                81,
-                165,
-                157,
-                125,
-                130,
-                182,
-                69,
+                211,
                 127,
-                200,
-                123,
-                212,
-                219,
-                165,
-                4,
-                238,
-                15,
+                23,
+                124,
                 68,
+                158,
+                122,
+                141,
+                69,
+                188,
+                41,
+                144,
+                117,
+                211,
                 169,
-                73,
-                115,
-                59,
-                197,
-                138,
-                254,
-                32,
-                72,
-                185,
-                38,
-                230,
-                150,
-                233,
+                65,
+                239,
+                69,
                 38,
-                148,
-                165,
-                17,
-                3,
-                58,
-                186,
-                78,
-                49,
-                172,
-                39,
-                198,
-                43,
-                231,
-                128,
-                216,
-                233,
-                5,
+                170,
+                84,
                 174,
-                222,
-                133,
-                66,
+                198,
+                7,
+                179,
+                110,
+                215,
+                182,
+                252,
+                113,
                 72,
-                216,
-                253,
-                39,
+                226,
                 48,
-                179,
-                18,
-                62,
-                181,
-                29,
-                193,
-                154,
+                133,
+                8,
                 105,
-                231,
-                94,
-                0,
-                253,
-                147,
-                164,
-                152,
-                191,
-                209,
-                90,
-                200,
-                210,
-                59,
-                88,
-                101,
-                171,
-                112,
-                145,
-                55,
-                221,
-                230,
+                153,
+                110,
+                47,
+                196,
+                176,
+                44,
+                252,
                 140,
-                56,
-                240,
-                86,
-                84,
-                193,
-                49,
-                6,
-                45,
-                237,
-                198,
-                215,
-                147,
-                111,
-                94,
-                143,
-                129,
-                109,
-                183,
+                171,
+                99,
+                25,
+                5,
+                109,
+                170,
+                61,
+                34,
+                234,
+                19,
+                78,
+                134,
+                220,
+                12,
+                12,
+                146,
+                181,
+                134,
+                46,
+                50,
+                246,
+                204,
+                83,
+                195,
+                216,
+                58,
+                47,
+                246,
+                133,
+                52,
+                153,
+                89,
+                95,
+                128,
+                57,
+                13,
+                156,
                 11,
                 118,
                 97,
@@ -3980,11 +3928,11 @@
                 99,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                49,
+                52,
                 53,
+                54,
                 47,
                 104,
                 116,
@@ -4010,36 +3958,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                49,
-                55,
-                24,
-                47,
-                105,
-                112,
                 52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
                 53,
-                50,
-                49,
-                50,
-                51,
+                56,
                 24,
                 47,
                 105,
@@ -4060,12 +3983,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                50,
-                53,
-                0,
+                52,
+                54,
+                52,
                 0,
                 0,
                 0,
@@ -4073,38 +3995,38 @@
                 0,
                 0,
                 0,
+                121,
                 245,
-                129,
-                174,
-                94,
-                253,
-                236,
-                254,
-                169,
+                173,
+                214,
+                62,
+                45,
+                78,
+                231,
+                42,
+                141,
+                80,
+                70,
+                101,
                 210,
+                114,
+                51,
+                185,
+                135,
+                223,
                 13,
-                151,
-                145,
-                128,
                 169,
-                56,
-                66,
-                49,
-                90,
-                127,
+                239,
+                245,
+                68,
                 254,
-                26,
-                181,
-                229,
-                54,
-                109,
-                20,
-                56,
-                103,
-                14,
-                16,
-                207,
-                50,
+                122,
+                133,
+                237,
+                80,
+                108,
+                161,
+                30,
                 0,
                 0,
                 0,
@@ -4121,38 +4043,38 @@
                 0,
                 0,
                 0,
-                53,
-                11,
+                164,
+                51,
+                96,
+                252,
+                84,
+                166,
+                231,
+                126,
+                125,
+                69,
                 141,
-                159,
-                199,
-                174,
-                192,
-                150,
+                222,
+                212,
+                230,
+                206,
+                158,
+                145,
+                216,
+                89,
+                46,
+                224,
+                195,
+                37,
+                168,
+                53,
+                214,
+                209,
+                133,
                 68,
-                81,
-                180,
-                184,
-                90,
-                118,
+                191,
                 142,
-                78,
-                57,
-                233,
-                107,
-                245,
-                123,
-                23,
-                55,
-                108,
-                96,
-                29,
-                244,
-                253,
-                107,
-                49,
-                76,
-                18,
+                226,
                 232,
                 3,
                 0,
@@ -4161,38 +4083,38 @@
                 0,
                 0,
                 0,
-                87,
-                237,
-                32,
-                86,
-                222,
-                32,
-                49,
-                210,
-                53,
-                230,
-                10,
-                194,
-                125,
-                91,
-                46,
-                170,
+                242,
+                245,
+                215,
+                89,
+                82,
                 128,
+                97,
                 158,
-                85,
-                158,
+                1,
+                156,
+                124,
+                176,
+                4,
+                137,
+                192,
+                182,
+                113,
+                144,
+                74,
                 11,
-                173,
-                248,
-                152,
-                226,
-                64,
-                231,
-                208,
-                252,
-                170,
-                26,
-                8,
+                72,
+                130,
+                17,
+                145,
+                107,
+                150,
+                212,
+                219,
+                236,
+                228,
+                205,
+                29,
                 1,
                 0,
                 0,
@@ -4204,62 +4126,62 @@
                 0,
                 0,
                 0,
-                124,
-                204,
-                61,
-                163,
-                2,
+                56,
+                111,
+                132,
+                8,
+                177,
                 6,
                 0,
                 0,
-                174,
-                210,
-                94,
-                232,
-                170,
-                0,
+                92,
+                165,
+                189,
+                208,
+                85,
+                1,
                 0,
-                145,
-                108,
-                209,
-                118,
-                87,
-                87,
+                161,
+                32,
+                121,
+                162,
+                33,
+                90,
                 5,
                 0,
-                63,
-                107,
-                147,
-                31,
-                121,
-                253,
-                11,
-                42,
-                20,
-                237,
-                118,
-                165,
-                178,
-                55,
-                20,
-                52,
-                76,
-                66,
-                31,
-                153,
+                60,
+                50,
+                180,
+                43,
+                227,
                 162,
-                204,
-                209,
-                151,
-                142,
-                242,
+                219,
+                29,
+                125,
+                221,
+                81,
+                200,
+                83,
+                117,
+                18,
+                127,
+                246,
+                174,
+                251,
                 39,
-                14,
-                22,
-                118,
-                20,
-                204,
-                2,
+                104,
+                52,
+                25,
+                62,
+                70,
+                158,
+                1,
+                226,
+                93,
+                72,
+                245,
+                85,
+                3,
                 0,
                 0,
                 0,
@@ -4291,38 +4213,38 @@
                 0,
                 0,
                 0,
-                13,
-                83,
-                208,
-                2,
-                216,
-                71,
-                135,
-                76,
-                196,
-                240,
-                55,
-                169,
-                172,
-                163,
-                129,
-                77,
-                167,
-                141,
-                222,
-                234,
-                139,
-                250,
+                81,
                 125,
-                75,
-                145,
+                125,
+                70,
+                103,
+                63,
+                184,
+                12,
+                3,
+                228,
+                100,
+                158,
+                86,
+                236,
+                215,
+                25,
                 233,
-                139,
-                57,
-                119,
-                196,
-                24,
-                85,
+                65,
+                9,
+                225,
+                127,
+                207,
+                98,
+                242,
+                200,
+                41,
+                56,
+                223,
+                20,
+                82,
+                36,
+                144,
                 0,
                 0,
                 0,
@@ -4340,11 +4262,11 @@
                 0,
                 0,
                 0,
-                124,
-                204,
-                61,
-                163,
-                2,
+                56,
+                111,
+                132,
+                8,
+                177,
                 6,
                 0,
                 232,
@@ -4363,38 +4285,38 @@
                 0,
                 0,
                 0,
-                219,
-                119,
-                163,
-                77,
-                109,
-                87,
+                49,
+                246,
+                218,
+                38,
+                205,
+                194,
+                217,
+                99,
+                178,
+                200,
+                79,
+                165,
+                209,
                 164,
-                155,
-                190,
-                236,
+                114,
+                99,
+                171,
+                118,
+                230,
+                130,
+                90,
+                255,
+                202,
+                41,
+                223,
                 145,
-                24,
-                50,
-                181,
-                141,
-                163,
+                76,
                 62,
-                29,
-                37,
-                149,
-                161,
-                187,
-                246,
-                10,
-                50,
-                162,
-                143,
-                252,
-                237,
-                179,
-                142,
-                209,
+                88,
+                164,
+                241,
+                120,
                 0,
                 0,
                 0,
@@ -4403,38 +4325,38 @@
                 0,
                 0,
                 0,
-                50,
-                130,
-                23,
-                143,
-                241,
-                103,
-                208,
-                42,
-                3,
-                62,
-                137,
+                69,
+                228,
+                93,
+                189,
+                144,
+                86,
+                66,
+                204,
+                44,
+                169,
+                195,
+                207,
                 209,
-                40,
-                10,
-                30,
-                194,
-                95,
-                157,
-                208,
-                105,
                 160,
-                241,
-                64,
-                12,
-                36,
-                65,
-                146,
-                241,
-                247,
-                92,
-                186,
-                188,
+                161,
+                249,
+                81,
+                119,
+                88,
+                229,
+                217,
+                141,
+                235,
+                103,
+                96,
+                64,
+                196,
+                147,
+                64,
+                200,
+                178,
+                103,
                 96,
                 179,
                 253,
@@ -4533,120 +4455,120 @@
                 116,
                 244,
                 32,
-                186,
+                44,
+                195,
+                142,
+                100,
+                204,
+                221,
+                210,
+                56,
+                220,
+                159,
+                252,
+                43,
+                109,
+                45,
+                129,
+                212,
+                168,
+                89,
+                191,
+                44,
+                18,
+                142,
+                55,
+                166,
+                147,
+                169,
+                39,
+                81,
+                113,
+                109,
+                74,
+                111,
+                32,
+                67,
+                83,
+                247,
+                195,
+                31,
+                24,
+                188,
+                165,
+                86,
+                175,
+                68,
+                17,
+                34,
+                236,
+                33,
+                55,
+                120,
                 104,
-                213,
-                91,
-                218,
-                163,
-                181,
-                223,
-                208,
-                177,
-                219,
-                199,
-                179,
+                114,
+                61,
+                167,
+                69,
+                129,
+                149,
+                36,
+                40,
+                216,
                 145,
-                245,
-                154,
-                172,
-                70,
-                98,
+                186,
+                240,
+                203,
+                190,
                 48,
-                93,
-                0,
-                253,
-                230,
-                76,
+                181,
+                111,
+                79,
+                167,
+                197,
+                9,
                 154,
-                76,
-                110,
-                236,
-                134,
-                14,
-                117,
-                32,
-                7,
-                134,
-                124,
-                99,
-                82,
-                250,
+                150,
                 224,
-                138,
-                194,
-                105,
-                98,
-                161,
-                155,
-                103,
-                211,
-                145,
+                28,
+                60,
+                46,
+                8,
+                148,
+                63,
+                84,
+                203,
+                153,
                 87,
-                27,
-                138,
-                230,
-                219,
-                213,
-                59,
-                58,
-                230,
+                15,
+                26,
+                86,
+                208,
+                145,
+                204,
+                145,
+                25,
+                124,
                 35,
+                62,
+                14,
+                136,
+                91,
+                231,
+                161,
+                80,
+                201,
+                205,
+                64,
+                58,
+                13,
+                96,
+                245,
+                185,
+                36,
+                46,
                 134,
-                160,
-                69,
-                70,
-                5,
-                103,
-                48,
-                144,
-                238,
-                206,
-                27,
-                158,
-                108,
-                237,
-                242,
-                132,
-                172,
-                88,
-                33,
-                180,
-                55,
-                105,
-                22,
-                117,
-                124,
-                154,
-                184,
-                220,
-                33,
-                23,
-                196,
-                29,
-                87,
-                181,
-                60,
-                222,
-                146,
-                252,
-                251,
-                23,
-                170,
-                22,
-                100,
-                150,
-                209,
-                54,
-                177,
-                108,
-                181,
-                12,
-                50,
-                42,
-                25,
-                133,
-                43,
+                189,
                 11,
                 118,
                 97,
@@ -4682,11 +4604,11 @@
                 99,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                50,
-                57,
+                52,
+                54,
+                54,
                 47,
                 104,
                 116,
@@ -4712,11 +4634,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                51,
-                49,
+                52,
+                54,
+                56,
                 24,
                 47,
                 105,
@@ -4737,37 +4659,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                51,
-                55,
-                24,
-                47,
-                105,
-                112,
                 52,
-                47,
-                49,
-                50,
                 55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
-                53,
-                50,
-                49,
-                51,
-                57,
-                0,
+                52,
                 0,
                 0,
                 0,
@@ -4775,38 +4671,38 @@
                 0,
                 0,
                 0,
-                167,
-                69,
-                231,
-                171,
-                22,
-                87,
-                230,
-                137,
-                122,
-                155,
-                115,
+                209,
+                199,
+                154,
+                78,
+                21,
+                110,
+                135,
+                195,
                 67,
-                34,
-                144,
-                147,
-                123,
-                26,
-                4,
-                108,
-                11,
-                211,
-                40,
                 136,
-                229,
-                98,
-                147,
-                57,
-                133,
+                35,
+                94,
+                39,
+                97,
+                239,
+                158,
+                2,
+                153,
+                53,
+                161,
+                61,
+                9,
+                6,
+                74,
+                159,
+                148,
+                70,
+                72,
+                180,
                 122,
-                176,
-                98,
-                125,
+                44,
+                178,
                 0,
                 0,
                 0,
@@ -4823,38 +4719,38 @@
                 0,
                 0,
                 0,
-                98,
-                84,
-                73,
-                35,
-                238,
-                36,
-                120,
-                182,
-                53,
-                204,
-                253,
-                142,
-                197,
-                168,
-                56,
-                27,
-                133,
-                121,
-                187,
-                11,
-                224,
-                185,
-                166,
-                209,
-                34,
+                38,
+                175,
+                8,
+                245,
+                39,
+                20,
+                18,
+                239,
+                5,
+                160,
+                19,
+                43,
+                237,
+                138,
+                215,
+                107,
+                149,
+                49,
+                242,
+                105,
+                61,
                 6,
-                52,
-                1,
-                193,
-                148,
-                253,
-                48,
+                20,
+                174,
+                86,
+                220,
+                229,
+                145,
+                50,
+                170,
+                76,
+                138,
                 232,
                 3,
                 0,
@@ -4863,38 +4759,38 @@
                 0,
                 0,
                 0,
-                12,
-                179,
-                128,
-                203,
-                50,
-                90,
-                131,
-                15,
-                3,
-                238,
-                75,
-                218,
+                26,
+                73,
+                49,
+                169,
+                67,
+                19,
                 121,
+                35,
+                127,
+                251,
+                115,
+                102,
+                203,
                 11,
+                73,
+                57,
+                227,
+                115,
                 5,
-                225,
-                117,
-                83,
-                128,
-                22,
+                39,
+                92,
+                71,
+                87,
                 245,
-                212,
-                124,
-                179,
-                82,
-                201,
-                60,
-                198,
-                218,
-                220,
-                19,
-                4,
+                250,
+                108,
+                229,
+                163,
+                116,
+                21,
+                52,
+                122,
                 1,
                 0,
                 0,
@@ -4906,62 +4802,62 @@
                 0,
                 0,
                 0,
-                124,
-                204,
-                61,
-                163,
-                2,
+                56,
+                111,
+                132,
+                8,
+                177,
                 6,
                 0,
                 0,
-                174,
-                210,
-                94,
-                232,
-                170,
-                0,
+                92,
+                165,
+                189,
+                208,
+                85,
+                1,
                 0,
-                145,
-                108,
-                209,
-                118,
-                87,
-                87,
+                161,
+                32,
+                121,
+                162,
+                33,
+                90,
                 5,
                 0,
-                123,
-                148,
+                19,
+                28,
+                67,
+                124,
                 172,
-                91,
-                189,
-                1,
-                12,
-                106,
-                119,
-                84,
-                85,
-                227,
-                223,
-                27,
-                108,
-                154,
-                141,
-                36,
-                169,
-                246,
-                194,
-                169,
-                194,
-                2,
-                85,
-                184,
-                114,
-                184,
-                18,
-                253,
-                191,
+                129,
+                201,
                 135,
-                2,
+                94,
+                72,
+                64,
+                197,
+                38,
+                95,
+                35,
+                44,
+                43,
+                75,
+                225,
+                178,
+                139,
+                236,
+                218,
+                45,
+                144,
+                227,
+                8,
+                251,
+                114,
+                45,
+                40,
+                137,
+                3,
                 0,
                 0,
                 0,
@@ -4993,38 +4889,38 @@
                 0,
                 0,
                 0,
-                120,
-                242,
-                231,
-                14,
+                225,
+                151,
+                122,
+                183,
+                140,
+                80,
+                88,
                 134,
-                130,
-                104,
-                11,
                 103,
-                210,
-                189,
-                19,
-                28,
-                11,
-                147,
-                107,
-                81,
-                11,
-                11,
-                65,
-                86,
-                11,
-                202,
-                206,
-                15,
-                46,
-                158,
-                1,
-                100,
-                197,
-                160,
-                6,
+                4,
+                35,
+                29,
+                155,
+                30,
+                74,
+                213,
+                228,
+                35,
+                178,
+                125,
+                105,
+                167,
+                234,
+                254,
+                209,
+                95,
+                150,
+                138,
+                239,
+                111,
+                38,
+                232,
                 0,
                 0,
                 0,
@@ -5042,11 +4938,11 @@
                 0,
                 0,
                 0,
-                124,
-                204,
-                61,
-                163,
-                2,
+                56,
+                111,
+                132,
+                8,
+                177,
                 6,
                 0,
                 232,
@@ -5065,78 +4961,78 @@
                 0,
                 0,
                 0,
-                211,
-                120,
-                82,
-                183,
-                112,
-                80,
-                203,
-                13,
-                147,
-                76,
-                148,
+                119,
                 115,
-                172,
-                242,
-                93,
-                194,
-                226,
-                79,
+                238,
+                13,
+                243,
+                22,
+                28,
+                78,
+                108,
+                60,
+                101,
+                25,
+                123,
+                138,
                 116,
-                169,
-                48,
-                72,
-                230,
-                175,
-                70,
-                79,
-                244,
-                144,
-                173,
-                213,
-                121,
-                156,
-                0,
-                0,
+                103,
+                87,
+                57,
+                235,
+                83,
+                123,
+                185,
+                5,
+                43,
+                108,
+                250,
+                199,
+                194,
+                8,
+                58,
+                14,
+                13,
                 0,
                 0,
                 0,
                 0,
                 0,
                 0,
-                89,
                 0,
-                134,
-                29,
-                192,
-                94,
-                22,
-                228,
-                35,
-                15,
-                103,
-                223,
-                102,
-                125,
-                164,
                 0,
-                182,
-                241,
-                173,
-                148,
-                115,
-                76,
-                12,
-                134,
                 255,
-                200,
-                115,
-                21,
-                201,
-                216,
+                42,
+                54,
+                155,
+                16,
+                100,
+                224,
+                39,
+                217,
+                65,
+                114,
+                0,
+                139,
+                225,
+                83,
+                252,
+                84,
+                75,
+                243,
+                235,
+                17,
+                199,
+                41,
+                252,
+                146,
+                124,
+                26,
+                180,
+                181,
+                181,
                 29,
-                213,
+                244,
                 0,
                 0,
                 0,
@@ -5146,39 +5042,39 @@
                 0,
                 0,
                 0,
-                116,
-                140,
+                245,
+                64,
+                131,
+                228,
+                230,
+                202,
+                193,
+                136,
+                58,
+                201,
+                134,
+                167,
+                174,
+                61,
+                63,
+                171,
                 27,
-                170,
-                209,
                 171,
-                17,
-                61,
-                7,
-                56,
-                218,
-                138,
-                21,
+                150,
+                193,
+                39,
+                53,
+                93,
+                49,
+                184,
+                198,
+                180,
+                117,
+                20,
+                160,
+                225,
+                139,
                 4,
-                220,
-                241,
-                80,
-                162,
-                255,
-                203,
-                11,
-                22,
-                170,
-                48,
-                59,
-                7,
-                101,
-                161,
-                69,
-                24,
-                201,
-                112,
-                5,
                 0,
                 0,
                 0,
@@ -5186,38 +5082,38 @@
                 0,
                 0,
                 0,
-                247,
-                48,
-                198,
-                197,
-                187,
-                95,
-                147,
-                209,
-                15,
-                245,
-                38,
-                60,
-                142,
-                201,
-                225,
-                91,
-                113,
-                53,
+                100,
+                96,
+                140,
+                115,
+                178,
+                133,
+                212,
+                21,
+                85,
                 180,
-                225,
-                99,
-                175,
-                83,
-                223,
-                59,
-                116,
-                194,
-                11,
-                151,
-                235,
+                158,
+                44,
                 146,
-                196,
+                235,
+                132,
+                110,
+                13,
+                239,
+                115,
+                223,
+                110,
+                114,
+                226,
+                165,
+                144,
+                102,
+                85,
+                239,
+                12,
+                249,
+                109,
+                45,
                 0,
                 0,
                 0,
@@ -5226,39 +5122,39 @@
                 0,
                 0,
                 0,
-                80,
-                80,
-                142,
-                127,
-                158,
-                232,
-                36,
-                13,
-                132,
+                171,
+                39,
+                109,
+                25,
+                86,
+                101,
+                155,
+                65,
                 21,
-                170,
-                224,
+                200,
+                37,
+                226,
+                115,
+                169,
+                182,
+                74,
+                60,
+                111,
+                254,
+                140,
+                247,
                 230,
-                25,
-                125,
-                12,
-                24,
-                68,
-                177,
-                231,
-                44,
-                91,
-                31,
-                217,
-                105,
-                9,
-                198,
-                144,
-                96,
+                222,
+                63,
+                45,
+                45,
+                35,
+                196,
                 16,
-                146,
-                139,
-                1,
+                111,
+                145,
+                85,
+                0,
                 0,
                 0,
                 0,
@@ -5267,38 +5163,38 @@
                 0,
                 0,
                 0,
-                117,
                 254,
-                42,
-                52,
-                238,
-                250,
-                101,
-                84,
-                49,
-                145,
-                237,
-                191,
-                142,
-                110,
-                6,
-                188,
-                55,
-                241,
+                222,
+                88,
+                194,
+                222,
+                164,
+                236,
+                45,
+                117,
+                125,
+                80,
+                122,
                 1,
-                107,
-                182,
-                234,
-                227,
-                213,
-                34,
-                177,
-                229,
-                70,
-                184,
-                220,
-                217,
-                51,
+                119,
+                21,
+                186,
+                58,
+                42,
+                210,
+                122,
+                75,
+                254,
+                158,
+                92,
+                161,
+                201,
+                100,
+                39,
+                218,
+                24,
+                41,
+                151,
                 0,
                 0,
                 0,
@@ -5379,38 +5275,38 @@
                 0,
                 0,
                 0,
-                153,
-                48,
-                123,
-                170,
-                237,
+                166,
+                4,
+                47,
+                112,
+                189,
+                16,
+                209,
+                252,
+                102,
+                57,
+                148,
+                80,
+                98,
+                167,
+                43,
+                219,
+                234,
+                27,
+                136,
+                160,
+                254,
+                187,
                 150,
-                85,
-                58,
-                253,
-                170,
-                119,
-                84,
-                156,
-                116,
-                215,
-                211,
-                179,
-                29,
-                196,
-                212,
-                126,
-                30,
-                21,
-                144,
-                136,
-                246,
-                168,
-                36,
-                73,
-                149,
-                230,
-                173,
+                197,
+                7,
+                70,
+                7,
+                202,
+                220,
+                47,
+                159,
+                89,
                 0,
                 0,
                 0,
@@ -5461,46 +5357,46 @@
                 0,
                 0,
                 0,
-                130,
-                55,
-                247,
-                175,
+                210,
+                104,
+                7,
+                216,
                 146,
                 1,
                 0,
                 0,
-                141,
-                159,
-                48,
-                47,
-                164,
-                128,
-                59,
-                91,
-                130,
-                122,
-                142,
-                115,
-                144,
+                36,
+                82,
+                30,
+                65,
+                183,
+                192,
                 23,
-                163,
-                64,
-                108,
-                107,
                 72,
-                181,
-                174,
-                239,
-                219,
-                205,
-                93,
-                109,
-                38,
-                203,
-                113,
-                12,
-                216,
-                183,
+                123,
+                231,
+                100,
+                128,
+                86,
+                159,
+                136,
+                163,
+                24,
+                82,
+                67,
+                139,
+                141,
+                248,
+                200,
+                171,
+                163,
+                5,
+                98,
+                244,
+                137,
+                223,
+                150,
+                206,
                 0,
                 0,
                 0,
@@ -5515,8 +5411,8 @@
           "owner": {
             "ObjectOwner": "0x0000000000000000000000000000000000000000000000000000000000000005"
           },
-          "previous_transaction": "CMc4L2hi22SFYwap6sHkdxoKaZp9h1q7hGfbXwyTkwsM",
-          "storage_rebate": 26980000
+          "previous_transaction": "326n9ZcQDrJVxyFL8aWkknSmFahVxwpqZQ5q5ySmWrUy",
+          "storage_rebate": 0
         }
       ],
       "output_objects": [
@@ -5566,7 +5462,7 @@
                 0,
                 0,
                 5,
-                2,
+                1,
                 0,
                 0,
                 0,
@@ -5582,8 +5478,8 @@
               "initial_shared_version": 1
             }
           },
-          "previous_transaction": "Ai7U4nQvUNhzdARMaAGfisbHdNMHfRoTm1Z6xo74Q9Sr",
-          "storage_rebate": 28431600
+          "previous_transaction": "Hero19xTN5BAmbkRVMG5HDAhrcp3ZiGiZwV2AFQSY1zX",
+          "storage_rebate": 0
         },
         {
           "data": {
@@ -5599,7 +5495,7 @@
                       "struct": {
                         "address": "0000000000000000000000000000000000000000000000000000000000000003",
                         "module": "iota_system_state_inner",
-                        "name": "IotaSystemStateInnerV2",
+                        "name": "IotaSystemStateV1",
                         "type_args": []
                       }
                     }
@@ -5609,39 +5505,39 @@
               "has_public_transfer": false,
               "version": 4,
               "contents": [
-                91,
-                137,
-                14,
-                175,
-                42,
-                188,
-                250,
-                42,
-                185,
-                11,
-                119,
-                184,
-                230,
-                243,
-                213,
-                216,
+                106,
+                242,
+                162,
+                183,
+                202,
                 96,
-                149,
-                134,
-                195,
-                229,
-                131,
-                186,
-                243,
-                220,
-                205,
-                90,
-                241,
-                126,
+                191,
+                118,
+                23,
+                74,
                 223,
-                72,
-                209,
-                2,
+                211,
+                233,
+                196,
+                149,
+                127,
+                142,
+                147,
+                119,
+                89,
+                96,
+                49,
+                130,
+                249,
+                180,
+                108,
+                127,
+                108,
+                95,
+                25,
+                198,
+                210,
+                1,
                 0,
                 0,
                 0,
@@ -5649,7 +5545,7 @@
                 0,
                 0,
                 0,
-                2,
+                3,
                 0,
                 0,
                 0,
@@ -5665,7 +5561,7 @@
                 0,
                 0,
                 0,
-                2,
+                1,
                 0,
                 0,
                 0,
@@ -5673,87 +5569,87 @@
                 0,
                 0,
                 0,
-                79,
-                119,
-                144,
-                163,
-                247,
-                191,
-                45,
-                221,
-                234,
-                6,
-                103,
-                112,
-                156,
-                173,
-                41,
-                65,
-                7,
-                198,
-                139,
-                39,
-                85,
-                185,
-                144,
-                234,
-                233,
-                27,
-                255,
-                32,
-                224,
-                150,
+                57,
+                250,
                 115,
+                22,
+                182,
+                11,
+                178,
+                229,
+                253,
                 205,
-                128,
-                91,
-                214,
-                68,
-                154,
-                59,
-                103,
+                92,
+                179,
+                236,
+                134,
+                160,
+                75,
+                54,
+                44,
+                186,
+                33,
+                145,
+                160,
+                137,
+                160,
+                136,
+                5,
+                12,
+                185,
+                38,
+                134,
+                120,
+                155,
+                0,
+                208,
+                127,
+                95,
+                47,
+                245,
+                105,
                 43,
                 0,
-                224,
-                188,
-                17,
-                34,
-                196,
-                26,
+                208,
+                71,
+                44,
+                183,
+                125,
+                29,
                 0,
                 4,
-                199,
-                3,
-                84,
-                131,
-                185,
-                10,
-                227,
-                105,
-                243,
-                206,
-                72,
-                195,
-                151,
-                27,
-                245,
-                140,
-                25,
-                65,
+                59,
+                251,
+                52,
+                173,
+                111,
+                69,
+                44,
+                97,
+                173,
+                211,
+                105,
                 121,
-                151,
-                116,
-                108,
-                103,
-                50,
-                12,
-                53,
-                209,
-                84,
-                166,
-                66,
-                90,
-                183,
+                206,
+                147,
+                8,
+                165,
+                7,
+                244,
+                202,
+                119,
+                73,
+                129,
+                123,
+                165,
+                161,
+                154,
+                87,
+                212,
+                255,
+                44,
+                213,
+                63,
                 96,
                 141,
                 207,
@@ -5852,120 +5748,120 @@
                 56,
                 212,
                 32,
+                32,
+                38,
+                163,
+                54,
+                223,
+                222,
+                200,
+                16,
+                231,
+                136,
+                101,
+                109,
+                60,
+                170,
                 54,
-                229,
-                149,
-                160,
-                153,
-                0,
-                149,
-                41,
-                2,
-                12,
-                159,
-                11,
-                237,
                 183,
+                183,
+                132,
                 232,
-                172,
-                239,
-                21,
+                253,
+                218,
+                17,
+                151,
+                230,
+                164,
                 94,
-                208,
-                184,
-                219,
-                158,
-                170,
-                43,
-                150,
-                93,
-                242,
+                212,
+                132,
+                90,
+                230,
+                7,
+                98,
                 32,
-                222,
-                246,
-                207,
+                217,
+                53,
+                60,
+                49,
+                54,
+                152,
+                131,
+                119,
+                1,
                 32,
-                245,
-                64,
-                76,
-                18,
-                227,
-                129,
-                141,
-                164,
-                251,
-                225,
-                193,
-                225,
-                255,
-                222,
-                40,
-                239,
-                108,
-                248,
-                77,
-                176,
-                165,
-                136,
+                5,
+                215,
+                206,
+                234,
+                120,
+                214,
+                210,
                 148,
+                142,
+                129,
+                161,
+                106,
+                254,
+                253,
+                73,
+                188,
+                78,
+                237,
+                59,
+                75,
+                133,
+                63,
+                48,
+                175,
+                52,
+                76,
+                124,
                 156,
+                164,
+                117,
+                75,
+                204,
+                212,
+                49,
+                8,
+                33,
+                96,
+                102,
+                254,
+                60,
                 113,
-                25,
-                160,
-                250,
-                14,
-                98,
-                198,
-                178,
-                48,
-                148,
-                81,
-                45,
-                99,
-                42,
-                80,
-                47,
-                61,
-                69,
-                193,
-                153,
-                23,
-                69,
-                77,
-                65,
-                148,
+                252,
+                79,
+                3,
+                66,
+                110,
+                30,
+                211,
+                234,
+                248,
+                46,
+                26,
                 12,
-                218,
-                166,
+                142,
                 136,
-                89,
+                104,
+                199,
+                247,
+                129,
+                48,
+                228,
                 61,
-                102,
-                137,
                 39,
-                225,
-                90,
-                67,
-                159,
-                177,
-                77,
-                46,
-                144,
-                186,
-                192,
-                151,
-                223,
-                1,
-                151,
-                220,
-                117,
-                33,
-                235,
-                142,
+                13,
+                72,
                 101,
-                76,
-                246,
-                207,
+                101,
+                199,
+                19,
+                109,
+                21,
                 11,
                 118,
                 97,
@@ -6001,11 +5897,11 @@
                 99,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                48,
-                49,
+                52,
+                52,
+                54,
                 47,
                 104,
                 116,
@@ -6031,11 +5927,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                48,
-                51,
+                52,
+                52,
+                56,
                 24,
                 47,
                 105,
@@ -6056,37 +5952,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                48,
-                57,
-                24,
-                47,
-                105,
-                112,
                 52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
                 53,
-                50,
-                49,
-                49,
-                49,
-                0,
+                52,
                 0,
                 0,
                 0,
@@ -6094,38 +5964,38 @@
                 0,
                 0,
                 0,
-                158,
-                21,
-                4,
-                132,
-                147,
-                197,
-                55,
-                157,
-                104,
-                199,
-                11,
+                237,
+                202,
+                141,
                 82,
-                210,
-                44,
-                230,
-                232,
-                51,
-                81,
-                13,
+                243,
+                82,
+                185,
+                130,
+                172,
+                46,
+                92,
+                14,
+                227,
+                72,
+                139,
+                162,
+                213,
+                206,
                 89,
-                112,
-                234,
-                251,
-                255,
-                56,
-                23,
-                190,
-                253,
-                67,
-                99,
-                84,
-                234,
+                121,
+                179,
+                214,
+                64,
+                241,
+                40,
+                30,
+                200,
+                224,
+                136,
+                215,
+                39,
+                57,
                 0,
                 0,
                 0,
@@ -6142,38 +6012,38 @@
                 0,
                 0,
                 0,
-                58,
-                173,
-                132,
-                75,
-                224,
-                93,
-                90,
-                60,
-                253,
-                176,
-                39,
-                11,
-                172,
+                74,
+                247,
                 153,
-                12,
-                113,
+                224,
+                143,
+                124,
+                199,
+                167,
+                208,
+                50,
+                229,
+                166,
+                53,
+                141,
+                230,
+                155,
                 237,
-                20,
-                103,
-                149,
-                114,
                 8,
-                32,
-                12,
-                59,
-                244,
-                40,
-                38,
-                44,
-                61,
-                175,
-                1,
+                69,
+                247,
+                162,
+                221,
+                120,
+                65,
+                215,
+                137,
+                47,
+                111,
+                156,
+                51,
+                80,
+                173,
                 232,
                 3,
                 0,
@@ -6182,38 +6052,38 @@
                 0,
                 0,
                 0,
-                232,
-                14,
-                72,
-                38,
-                40,
-                13,
-                121,
-                140,
-                248,
-                193,
-                87,
-                156,
-                150,
-                228,
-                154,
-                136,
-                166,
-                92,
                 15,
-                240,
-                225,
-                156,
+                179,
+                7,
+                220,
+                99,
+                116,
+                11,
+                43,
+                34,
+                99,
                 124,
+                173,
+                183,
+                91,
+                122,
+                153,
+                83,
                 227,
-                251,
-                244,
-                22,
-                171,
-                191,
-                166,
-                19,
+                216,
                 174,
+                143,
+                123,
+                179,
+                93,
+                16,
+                223,
+                139,
+                50,
+                20,
+                184,
+                146,
+                41,
                 1,
                 0,
                 0,
@@ -6225,62 +6095,62 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
-                6,
+                244,
+                17,
+                203,
+                109,
+                95,
+                7,
                 0,
                 0,
-                92,
-                165,
-                189,
-                208,
-                85,
-                1,
+                10,
+                120,
+                28,
+                185,
                 0,
-                161,
-                32,
-                121,
-                162,
-                33,
-                90,
+                2,
+                0,
+                73,
+                5,
+                86,
+                4,
+                171,
+                92,
                 5,
                 0,
-                194,
-                201,
-                221,
-                216,
-                0,
-                201,
-                14,
-                138,
-                159,
-                127,
-                2,
-                243,
-                83,
-                121,
-                253,
-                235,
-                224,
+                100,
+                80,
+                70,
+                13,
+                126,
+                123,
+                228,
                 117,
-                50,
-                247,
-                30,
+                64,
+                121,
+                8,
+                228,
+                129,
+                68,
+                240,
                 149,
-                57,
-                55,
-                252,
-                208,
+                80,
+                11,
+                199,
+                60,
+                247,
+                37,
                 79,
-                168,
-                76,
-                122,
-                36,
-                192,
-                3,
+                145,
+                193,
+                130,
+                164,
+                85,
+                112,
+                208,
+                202,
+                198,
+                4,
                 0,
                 0,
                 0,
@@ -6312,38 +6182,38 @@
                 0,
                 0,
                 0,
-                28,
-                3,
+                66,
+                171,
+                40,
+                184,
+                198,
+                248,
+                37,
+                80,
+                178,
+                91,
                 133,
-                57,
-                100,
-                73,
-                32,
-                113,
-                183,
-                112,
-                201,
-                166,
+                208,
+                36,
+                170,
+                67,
+                205,
                 191,
-                35,
-                47,
-                34,
-                32,
-                159,
-                48,
-                137,
-                3,
-                222,
-                105,
-                110,
-                220,
-                204,
-                41,
-                226,
-                63,
-                78,
-                18,
-                254,
+                10,
+                49,
+                13,
+                172,
+                27,
+                248,
+                33,
+                15,
+                228,
+                163,
+                61,
+                156,
+                207,
+                73,
+                153,
                 0,
                 0,
                 0,
@@ -6361,12 +6231,12 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
-                6,
+                244,
+                17,
+                203,
+                109,
+                95,
+                7,
                 0,
                 232,
                 3,
@@ -6384,38 +6254,38 @@
                 0,
                 0,
                 0,
-                215,
-                233,
-                197,
-                73,
-                0,
-                103,
-                112,
-                32,
-                41,
-                241,
+                154,
+                63,
+                153,
+                219,
+                190,
                 60,
-                231,
-                183,
-                150,
+                107,
+                172,
+                161,
                 128,
-                181,
-                240,
+                223,
+                192,
+                219,
+                114,
+                132,
+                40,
+                213,
+                246,
+                227,
+                9,
+                177,
                 93,
-                160,
-                34,
-                202,
-                137,
-                79,
-                180,
-                142,
-                204,
-                252,
-                45,
-                63,
-                115,
-                54,
-                18,
+                243,
+                81,
+                126,
+                145,
+                127,
+                241,
+                139,
+                224,
+                194,
+                8,
                 0,
                 0,
                 0,
@@ -6424,38 +6294,38 @@
                 0,
                 0,
                 0,
-                152,
-                52,
-                108,
-                41,
-                160,
-                169,
-                155,
-                157,
-                10,
-                128,
-                201,
-                237,
-                227,
-                122,
-                119,
-                199,
-                253,
-                147,
+                45,
+                177,
+                156,
+                231,
+                178,
+                150,
+                99,
+                62,
+                73,
+                244,
+                142,
+                134,
+                60,
+                43,
+                8,
+                213,
                 234,
-                210,
-                149,
-                253,
-                176,
-                27,
-                137,
-                94,
-                241,
-                57,
-                44,
-                80,
-                135,
-                181,
+                10,
+                136,
+                82,
+                115,
+                191,
+                165,
+                116,
+                226,
+                219,
+                10,
+                133,
+                236,
+                226,
+                37,
+                229,
                 96,
                 153,
                 242,
@@ -6554,120 +6424,120 @@
                 26,
                 16,
                 32,
-                203,
-                102,
-                81,
-                231,
-                227,
-                62,
-                133,
-                128,
-                82,
-                172,
-                128,
+                122,
+                3,
+                30,
+                157,
+                52,
+                195,
+                36,
                 160,
-                66,
-                220,
-                100,
-                44,
                 76,
-                81,
-                90,
-                157,
-                141,
-                9,
-                51,
-                103,
-                152,
-                49,
-                100,
-                219,
-                11,
-                122,
-                111,
-                172,
-                32,
-                207,
-                136,
-                11,
-                207,
-                233,
-                27,
-                111,
-                229,
-                25,
-                40,
-                88,
-                39,
-                71,
-                22,
-                200,
+                194,
+                183,
                 16,
-                132,
-                203,
-                110,
-                41,
-                43,
-                82,
-                213,
-                213,
-                214,
-                217,
                 106,
-                48,
-                242,
-                227,
+                36,
+                32,
+                2,
+                216,
+                206,
+                21,
+                7,
+                4,
+                151,
+                70,
+                39,
                 234,
-                136,
-                48,
+                215,
+                20,
+                41,
+                150,
+                113,
+                224,
+                91,
+                32,
+                3,
+                60,
+                195,
+                7,
+                177,
+                11,
+                189,
+                198,
+                69,
+                193,
+                118,
+                101,
                 132,
-                51,
-                104,
-                180,
-                35,
-                134,
-                184,
-                250,
-                233,
-                184,
+                133,
+                243,
+                255,
+                102,
+                108,
+                2,
+                133,
+                7,
+                68,
+                189,
+                150,
+                46,
+                93,
+                146,
+                0,
+                141,
+                222,
+                107,
                 252,
-                132,
-                203,
-                143,
+                48,
+                173,
+                72,
+                33,
+                196,
+                123,
+                102,
+                115,
+                188,
+                207,
+                117,
+                48,
+                189,
+                20,
+                63,
+                36,
+                94,
+                101,
+                110,
+                96,
+                96,
+                218,
+                135,
+                207,
                 130,
-                190,
-                89,
-                79,
-                35,
-                164,
-                172,
-                124,
-                161,
-                131,
+                60,
+                108,
+                28,
+                33,
+                226,
+                4,
+                178,
+                120,
+                120,
+                61,
+                127,
+                163,
+                62,
                 231,
-                233,
-                47,
-                142,
-                173,
-                185,
-                209,
-                100,
-                170,
-                167,
+                69,
+                205,
+                199,
+                183,
                 145,
-                170,
-                117,
-                169,
-                65,
-                129,
-                197,
-                80,
-                165,
-                227,
-                124,
-                52,
-                71,
-                172,
+                196,
+                92,
+                33,
+                251,
+                211,
                 11,
                 118,
                 97,
@@ -6703,11 +6573,11 @@
                 99,
                 112,
                 47,
+                54,
                 53,
-                50,
-                48,
-                56,
-                55,
+                52,
+                51,
+                54,
                 47,
                 104,
                 116,
@@ -6733,11 +6603,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                48,
+                52,
+                51,
                 56,
-                57,
                 24,
                 47,
                 105,
@@ -6758,76 +6628,50 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                48,
-                57,
-                53,
-                24,
-                47,
-                105,
-                112,
                 52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
-                53,
-                50,
-                48,
-                57,
-                55,
-                0,
-                0,
+                52,
+                52,
                 0,
                 0,
                 0,
                 0,
                 0,
                 0,
-                111,
-                108,
-                251,
-                55,
-                106,
-                70,
                 0,
-                83,
-                166,
-                65,
-                77,
-                255,
-                24,
+                139,
+                224,
+                68,
+                32,
+                91,
+                176,
+                203,
+                154,
+                171,
+                120,
                 35,
-                226,
-                124,
-                182,
-                112,
-                225,
-                195,
-                108,
-                2,
-                145,
-                10,
-                215,
-                79,
-                160,
+                40,
+                91,
+                57,
                 179,
+                164,
+                23,
                 110,
-                91,
-                27,
-                7,
+                253,
+                173,
+                253,
+                143,
+                209,
+                90,
+                0,
+                61,
+                90,
+                186,
+                109,
+                177,
+                59,
+                90,
                 0,
                 0,
                 0,
@@ -6844,38 +6688,38 @@
                 0,
                 0,
                 0,
-                182,
-                37,
-                132,
-                69,
-                191,
-                87,
-                35,
-                192,
-                23,
-                153,
-                64,
-                68,
-                151,
-                249,
-                39,
-                198,
-                66,
-                80,
-                154,
-                234,
-                83,
-                180,
-                249,
-                23,
-                44,
-                27,
-                124,
-                233,
-                248,
-                200,
+                18,
+                5,
+                29,
+                220,
+                228,
+                186,
                 162,
-                175,
+                227,
+                204,
+                127,
+                217,
+                247,
+                93,
+                81,
+                88,
+                63,
+                196,
+                75,
+                65,
+                142,
+                11,
+                57,
+                159,
+                31,
+                113,
+                251,
+                185,
+                116,
+                209,
+                4,
+                123,
+                14,
                 232,
                 3,
                 0,
@@ -6884,38 +6728,38 @@
                 0,
                 0,
                 0,
-                251,
-                91,
-                71,
-                93,
-                58,
-                113,
-                7,
-                34,
-                32,
-                73,
-                58,
+                209,
+                123,
+                224,
+                206,
+                121,
+                241,
+                77,
+                244,
+                72,
+                86,
+                107,
+                103,
+                131,
+                192,
                 239,
-                215,
-                234,
-                130,
-                32,
-                211,
-                15,
                 101,
-                233,
-                95,
+                12,
+                50,
+                118,
+                14,
+                142,
                 183,
-                248,
-                96,
-                141,
-                116,
-                3,
-                192,
-                80,
-                95,
-                180,
-                167,
+                157,
+                157,
+                157,
+                178,
+                187,
+                220,
+                115,
+                108,
+                181,
+                43,
                 1,
                 0,
                 0,
@@ -6927,76 +6771,62 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
-                6,
+                244,
+                17,
+                203,
+                109,
+                95,
+                7,
                 0,
                 0,
-                92,
-                165,
-                189,
-                208,
-                85,
-                1,
+                10,
+                120,
+                28,
+                185,
                 0,
-                161,
-                32,
-                121,
-                162,
-                33,
-                90,
+                2,
+                0,
+                73,
+                5,
+                86,
+                4,
+                171,
+                92,
                 5,
                 0,
-                164,
-                195,
-                143,
-                144,
-                61,
-                151,
-                68,
-                202,
-                34,
-                67,
-                11,
-                174,
-                222,
-                209,
-                188,
-                55,
-                192,
-                237,
-                61,
-                117,
-                206,
-                85,
-                104,
-                62,
-                105,
-                189,
-                61,
+                121,
                 31,
-                196,
+                101,
+                204,
+                134,
+                140,
+                198,
+                239,
                 11,
-                103,
-                48,
-                3,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
+                192,
+                255,
+                64,
+                40,
+                147,
+                159,
+                16,
+                185,
+                98,
+                112,
+                39,
+                68,
+                129,
+                205,
+                235,
+                244,
+                33,
+                214,
+                71,
+                190,
+                240,
+                11,
+                110,
+                4,
                 0,
                 0,
                 0,
@@ -7014,38 +6844,52 @@
                 0,
                 0,
                 0,
-                86,
-                11,
-                133,
-                42,
-                34,
-                128,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                162,
+                2,
                 46,
-                144,
-                245,
-                237,
-                103,
-                194,
-                141,
-                145,
-                70,
-                227,
-                187,
+                57,
+                140,
+                215,
+                171,
+                207,
+                199,
+                51,
+                119,
                 103,
-                72,
-                225,
-                126,
-                12,
-                195,
-                94,
-                216,
-                109,
-                11,
-                185,
+                99,
+                159,
                 136,
-                231,
-                209,
-                101,
+                104,
+                178,
+                52,
+                54,
+                253,
+                140,
+                74,
+                230,
+                132,
+                248,
+                104,
+                75,
+                249,
+                252,
+                181,
+                229,
+                232,
                 0,
                 0,
                 0,
@@ -7063,12 +6907,12 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
-                6,
+                244,
+                17,
+                203,
+                109,
+                95,
+                7,
                 0,
                 232,
                 3,
@@ -7086,38 +6930,38 @@
                 0,
                 0,
                 0,
-                48,
-                196,
-                28,
-                202,
-                166,
-                13,
-                73,
-                199,
-                135,
-                166,
+                251,
+                213,
+                102,
                 25,
-                93,
-                219,
-                125,
-                63,
-                116,
-                202,
-                177,
-                217,
-                91,
-                147,
-                64,
-                31,
-                161,
-                218,
-                162,
-                170,
-                69,
-                161,
+                149,
+                159,
+                37,
+                192,
+                210,
+                95,
+                204,
+                21,
+                18,
+                42,
+                226,
+                5,
+                226,
+                152,
+                81,
+                144,
+                191,
+                110,
                 76,
-                100,
-                232,
+                51,
+                233,
+                213,
+                87,
+                45,
+                246,
+                101,
+                58,
+                130,
                 0,
                 0,
                 0,
@@ -7126,38 +6970,38 @@
                 0,
                 0,
                 0,
+                50,
                 72,
-                217,
-                15,
-                101,
+                42,
+                34,
+                159,
+                131,
+                186,
+                206,
+                45,
+                164,
+                201,
                 11,
-                244,
-                216,
-                122,
-                209,
-                41,
-                236,
-                71,
-                57,
-                46,
-                195,
+                77,
+                217,
+                156,
                 138,
-                140,
-                108,
-                11,
-                181,
-                234,
-                75,
-                109,
-                171,
-                97,
-                14,
+                115,
+                6,
                 58,
-                132,
-                20,
-                49,
-                171,
+                106,
+                141,
+                220,
+                91,
+                214,
+                204,
                 153,
+                222,
+                216,
+                112,
+                100,
+                145,
+                42,
                 96,
                 173,
                 222,
@@ -7256,120 +7100,120 @@
                 88,
                 242,
                 32,
-                157,
-                111,
-                65,
-                91,
-                154,
-                116,
-                26,
-                32,
-                81,
-                165,
-                157,
-                125,
-                130,
-                182,
-                69,
-                127,
-                200,
-                123,
-                212,
-                219,
-                165,
-                4,
-                238,
-                15,
-                68,
-                169,
-                73,
-                115,
-                59,
-                197,
+                97,
                 138,
-                254,
-                32,
-                72,
-                185,
-                38,
-                230,
-                150,
-                233,
-                38,
-                148,
-                165,
-                17,
-                3,
-                58,
-                186,
-                78,
-                49,
-                172,
-                39,
                 198,
-                43,
-                231,
-                128,
-                216,
-                233,
-                5,
-                174,
-                222,
-                133,
-                66,
-                72,
-                216,
-                253,
-                39,
-                48,
-                179,
-                18,
                 62,
-                181,
-                29,
-                193,
-                154,
-                105,
-                231,
-                94,
-                0,
-                253,
-                147,
-                164,
-                152,
+                136,
+                198,
+                103,
+                175,
+                249,
+                91,
+                77,
+                120,
+                56,
+                146,
                 191,
-                209,
-                90,
-                200,
-                210,
+                105,
+                25,
+                87,
+                27,
+                118,
                 59,
-                88,
-                101,
-                171,
-                112,
-                145,
-                55,
-                221,
-                230,
-                140,
-                56,
-                240,
-                86,
+                62,
+                33,
                 84,
-                193,
-                49,
-                6,
-                45,
-                237,
+                159,
+                132,
+                242,
+                67,
+                253,
+                50,
+                9,
+                132,
+                32,
+                211,
+                127,
+                23,
+                124,
+                68,
+                158,
+                122,
+                141,
+                69,
+                188,
+                41,
+                144,
+                117,
+                211,
+                169,
+                65,
+                239,
+                69,
+                38,
+                170,
+                84,
+                174,
                 198,
+                7,
+                179,
+                110,
                 215,
-                147,
-                111,
-                94,
-                143,
-                129,
+                182,
+                252,
+                113,
+                72,
+                226,
+                48,
+                133,
+                8,
+                105,
+                153,
+                110,
+                47,
+                196,
+                176,
+                44,
+                252,
+                140,
+                171,
+                99,
+                25,
+                5,
                 109,
-                183,
+                170,
+                61,
+                34,
+                234,
+                19,
+                78,
+                134,
+                220,
+                12,
+                12,
+                146,
+                181,
+                134,
+                46,
+                50,
+                246,
+                204,
+                83,
+                195,
+                216,
+                58,
+                47,
+                246,
+                133,
+                52,
+                153,
+                89,
+                95,
+                128,
+                57,
+                13,
+                156,
                 11,
                 118,
                 97,
@@ -7405,11 +7249,11 @@
                 99,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                49,
+                52,
                 53,
+                54,
                 47,
                 104,
                 116,
@@ -7435,36 +7279,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                49,
-                55,
-                24,
-                47,
-                105,
-                112,
                 52,
-                47,
-                49,
-                50,
-                55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
                 53,
-                50,
-                49,
-                50,
-                51,
+                56,
                 24,
                 47,
                 105,
@@ -7485,12 +7304,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                50,
-                53,
-                0,
+                52,
+                54,
+                52,
                 0,
                 0,
                 0,
@@ -7498,38 +7316,38 @@
                 0,
                 0,
                 0,
+                121,
                 245,
-                129,
-                174,
-                94,
-                253,
-                236,
-                254,
-                169,
+                173,
+                214,
+                62,
+                45,
+                78,
+                231,
+                42,
+                141,
+                80,
+                70,
+                101,
                 210,
+                114,
+                51,
+                185,
+                135,
+                223,
                 13,
-                151,
-                145,
-                128,
                 169,
-                56,
-                66,
-                49,
-                90,
-                127,
+                239,
+                245,
+                68,
                 254,
-                26,
-                181,
-                229,
-                54,
-                109,
-                20,
-                56,
-                103,
-                14,
-                16,
-                207,
-                50,
+                122,
+                133,
+                237,
+                80,
+                108,
+                161,
+                30,
                 0,
                 0,
                 0,
@@ -7546,38 +7364,38 @@
                 0,
                 0,
                 0,
-                53,
-                11,
+                164,
+                51,
+                96,
+                252,
+                84,
+                166,
+                231,
+                126,
+                125,
+                69,
                 141,
-                159,
-                199,
-                174,
-                192,
-                150,
+                222,
+                212,
+                230,
+                206,
+                158,
+                145,
+                216,
+                89,
+                46,
+                224,
+                195,
+                37,
+                168,
+                53,
+                214,
+                209,
+                133,
                 68,
-                81,
-                180,
-                184,
-                90,
-                118,
+                191,
                 142,
-                78,
-                57,
-                233,
-                107,
-                245,
-                123,
-                23,
-                55,
-                108,
-                96,
-                29,
-                244,
-                253,
-                107,
-                49,
-                76,
-                18,
+                226,
                 232,
                 3,
                 0,
@@ -7586,38 +7404,38 @@
                 0,
                 0,
                 0,
-                87,
-                237,
-                32,
-                86,
-                222,
-                32,
-                49,
-                210,
-                53,
-                230,
-                10,
-                194,
-                125,
-                91,
-                46,
-                170,
+                242,
+                245,
+                215,
+                89,
+                82,
                 128,
+                97,
                 158,
-                85,
-                158,
+                1,
+                156,
+                124,
+                176,
+                4,
+                137,
+                192,
+                182,
+                113,
+                144,
+                74,
                 11,
-                173,
-                248,
-                152,
-                226,
-                64,
-                231,
-                208,
-                252,
-                170,
-                26,
-                8,
+                72,
+                130,
+                17,
+                145,
+                107,
+                150,
+                212,
+                219,
+                236,
+                228,
+                205,
+                29,
                 1,
                 0,
                 0,
@@ -7629,62 +7447,62 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
-                6,
+                244,
+                17,
+                203,
+                109,
+                95,
+                7,
                 0,
                 0,
-                92,
-                165,
-                189,
-                208,
-                85,
-                1,
+                10,
+                120,
+                28,
+                185,
                 0,
-                161,
-                32,
-                121,
-                162,
-                33,
-                90,
+                2,
+                0,
+                73,
+                5,
+                86,
+                4,
+                171,
+                92,
                 5,
                 0,
-                63,
-                107,
-                147,
-                31,
-                121,
-                253,
-                11,
-                42,
-                20,
-                237,
-                118,
-                165,
-                178,
-                55,
-                20,
-                52,
-                76,
-                66,
-                31,
-                153,
+                60,
+                50,
+                180,
+                43,
+                227,
                 162,
-                204,
-                209,
-                151,
-                142,
-                242,
+                219,
+                29,
+                125,
+                221,
+                81,
+                200,
+                83,
+                117,
+                18,
+                127,
+                246,
+                174,
+                251,
                 39,
-                14,
-                22,
-                118,
-                20,
-                204,
-                3,
+                104,
+                52,
+                25,
+                62,
+                70,
+                158,
+                1,
+                226,
+                93,
+                72,
+                245,
+                85,
+                4,
                 0,
                 0,
                 0,
@@ -7716,38 +7534,38 @@
                 0,
                 0,
                 0,
-                13,
-                83,
-                208,
-                2,
-                216,
-                71,
-                135,
-                76,
-                196,
-                240,
-                55,
-                169,
-                172,
-                163,
-                129,
-                77,
-                167,
-                141,
-                222,
-                234,
-                139,
-                250,
+                81,
                 125,
-                75,
-                145,
+                125,
+                70,
+                103,
+                63,
+                184,
+                12,
+                3,
+                228,
+                100,
+                158,
+                86,
+                236,
+                215,
+                25,
                 233,
-                139,
-                57,
-                119,
-                196,
-                24,
-                85,
+                65,
+                9,
+                225,
+                127,
+                207,
+                98,
+                242,
+                200,
+                41,
+                56,
+                223,
+                20,
+                82,
+                36,
+                144,
                 0,
                 0,
                 0,
@@ -7765,12 +7583,12 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
-                6,
+                244,
+                17,
+                203,
+                109,
+                95,
+                7,
                 0,
                 232,
                 3,
@@ -7788,38 +7606,38 @@
                 0,
                 0,
                 0,
-                219,
-                119,
-                163,
-                77,
-                109,
-                87,
+                49,
+                246,
+                218,
+                38,
+                205,
+                194,
+                217,
+                99,
+                178,
+                200,
+                79,
+                165,
+                209,
                 164,
-                155,
-                190,
-                236,
+                114,
+                99,
+                171,
+                118,
+                230,
+                130,
+                90,
+                255,
+                202,
+                41,
+                223,
                 145,
-                24,
-                50,
-                181,
-                141,
-                163,
+                76,
                 62,
-                29,
-                37,
-                149,
-                161,
-                187,
-                246,
-                10,
-                50,
-                162,
-                143,
-                252,
-                237,
-                179,
-                142,
-                209,
+                88,
+                164,
+                241,
+                120,
                 0,
                 0,
                 0,
@@ -7828,38 +7646,38 @@
                 0,
                 0,
                 0,
-                50,
-                130,
-                23,
-                143,
-                241,
-                103,
-                208,
-                42,
-                3,
-                62,
-                137,
+                69,
+                228,
+                93,
+                189,
+                144,
+                86,
+                66,
+                204,
+                44,
+                169,
+                195,
+                207,
                 209,
-                40,
-                10,
-                30,
-                194,
-                95,
-                157,
-                208,
-                105,
                 160,
-                241,
+                161,
+                249,
+                81,
+                119,
+                88,
+                229,
+                217,
+                141,
+                235,
+                103,
+                96,
                 64,
-                12,
-                36,
-                65,
-                146,
-                241,
-                247,
-                92,
-                186,
-                188,
+                196,
+                147,
+                64,
+                200,
+                178,
+                103,
                 96,
                 179,
                 253,
@@ -7958,120 +7776,120 @@
                 116,
                 244,
                 32,
-                186,
+                44,
+                195,
+                142,
+                100,
+                204,
+                221,
+                210,
+                56,
+                220,
+                159,
+                252,
+                43,
+                109,
+                45,
+                129,
+                212,
+                168,
+                89,
+                191,
+                44,
+                18,
+                142,
+                55,
+                166,
+                147,
+                169,
+                39,
+                81,
+                113,
+                109,
+                74,
+                111,
+                32,
+                67,
+                83,
+                247,
+                195,
+                31,
+                24,
+                188,
+                165,
+                86,
+                175,
+                68,
+                17,
+                34,
+                236,
+                33,
+                55,
+                120,
                 104,
-                213,
-                91,
-                218,
-                163,
-                181,
-                223,
-                208,
-                177,
-                219,
-                199,
-                179,
+                114,
+                61,
+                167,
+                69,
+                129,
+                149,
+                36,
+                40,
+                216,
                 145,
-                245,
-                154,
-                172,
-                70,
-                98,
+                186,
+                240,
+                203,
+                190,
                 48,
-                93,
-                0,
-                253,
-                230,
-                76,
+                181,
+                111,
+                79,
+                167,
+                197,
+                9,
                 154,
-                76,
-                110,
-                236,
-                134,
-                14,
-                117,
-                32,
-                7,
-                134,
-                124,
-                99,
-                82,
-                250,
+                150,
                 224,
-                138,
-                194,
-                105,
-                98,
-                161,
-                155,
-                103,
-                211,
-                145,
+                28,
+                60,
+                46,
+                8,
+                148,
+                63,
+                84,
+                203,
+                153,
                 87,
-                27,
-                138,
-                230,
-                219,
-                213,
-                59,
-                58,
-                230,
+                15,
+                26,
+                86,
+                208,
+                145,
+                204,
+                145,
+                25,
+                124,
                 35,
+                62,
+                14,
+                136,
+                91,
+                231,
+                161,
+                80,
+                201,
+                205,
+                64,
+                58,
+                13,
+                96,
+                245,
+                185,
+                36,
+                46,
                 134,
-                160,
-                69,
-                70,
-                5,
-                103,
-                48,
-                144,
-                238,
-                206,
-                27,
-                158,
-                108,
-                237,
-                242,
-                132,
-                172,
-                88,
-                33,
-                180,
-                55,
-                105,
-                22,
-                117,
-                124,
-                154,
-                184,
-                220,
-                33,
-                23,
-                196,
-                29,
-                87,
-                181,
-                60,
-                222,
-                146,
-                252,
-                251,
-                23,
-                170,
-                22,
-                100,
-                150,
-                209,
-                54,
-                177,
-                108,
-                181,
-                12,
-                50,
-                42,
-                25,
-                133,
-                43,
+                189,
                 11,
                 118,
                 97,
@@ -8107,11 +7925,11 @@
                 99,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                50,
-                57,
+                52,
+                54,
+                54,
                 47,
                 104,
                 116,
@@ -8137,11 +7955,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                51,
-                49,
+                52,
+                54,
+                56,
                 24,
                 47,
                 105,
@@ -8162,37 +7980,11 @@
                 100,
                 112,
                 47,
+                54,
                 53,
-                50,
-                49,
-                51,
-                55,
-                24,
-                47,
-                105,
-                112,
                 52,
-                47,
-                49,
-                50,
                 55,
-                46,
-                48,
-                46,
-                48,
-                46,
-                49,
-                47,
-                117,
-                100,
-                112,
-                47,
-                53,
-                50,
-                49,
-                51,
-                57,
-                0,
+                52,
                 0,
                 0,
                 0,
@@ -8200,38 +7992,38 @@
                 0,
                 0,
                 0,
-                167,
-                69,
-                231,
-                171,
-                22,
-                87,
-                230,
-                137,
-                122,
-                155,
-                115,
+                209,
+                199,
+                154,
+                78,
+                21,
+                110,
+                135,
+                195,
                 67,
-                34,
-                144,
-                147,
-                123,
-                26,
-                4,
-                108,
-                11,
-                211,
-                40,
                 136,
-                229,
-                98,
-                147,
-                57,
-                133,
+                35,
+                94,
+                39,
+                97,
+                239,
+                158,
+                2,
+                153,
+                53,
+                161,
+                61,
+                9,
+                6,
+                74,
+                159,
+                148,
+                70,
+                72,
+                180,
                 122,
-                176,
-                98,
-                125,
+                44,
+                178,
                 0,
                 0,
                 0,
@@ -8248,38 +8040,38 @@
                 0,
                 0,
                 0,
-                98,
-                84,
-                73,
-                35,
-                238,
-                36,
-                120,
-                182,
-                53,
-                204,
-                253,
-                142,
-                197,
-                168,
-                56,
-                27,
-                133,
-                121,
-                187,
-                11,
-                224,
-                185,
-                166,
-                209,
-                34,
-                6,
-                52,
-                1,
-                193,
-                148,
-                253,
-                48,
+                38,
+                175,
+                8,
+                245,
+                39,
+                20,
+                18,
+                239,
+                5,
+                160,
+                19,
+                43,
+                237,
+                138,
+                215,
+                107,
+                149,
+                49,
+                242,
+                105,
+                61,
+                6,
+                20,
+                174,
+                86,
+                220,
+                229,
+                145,
+                50,
+                170,
+                76,
+                138,
                 232,
                 3,
                 0,
@@ -8288,38 +8080,38 @@
                 0,
                 0,
                 0,
-                12,
-                179,
-                128,
-                203,
-                50,
-                90,
-                131,
-                15,
-                3,
-                238,
-                75,
-                218,
+                26,
+                73,
+                49,
+                169,
+                67,
+                19,
                 121,
+                35,
+                127,
+                251,
+                115,
+                102,
+                203,
                 11,
+                73,
+                57,
+                227,
+                115,
                 5,
-                225,
-                117,
-                83,
-                128,
-                22,
+                39,
+                92,
+                71,
+                87,
                 245,
-                212,
-                124,
-                179,
-                82,
-                201,
-                60,
-                198,
-                218,
-                220,
-                19,
-                4,
+                250,
+                108,
+                229,
+                163,
+                116,
+                21,
+                52,
+                122,
                 1,
                 0,
                 0,
@@ -8331,62 +8123,62 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
-                6,
+                244,
+                17,
+                203,
+                109,
+                95,
+                7,
                 0,
                 0,
-                92,
-                165,
-                189,
-                208,
-                85,
-                1,
+                10,
+                120,
+                28,
+                185,
                 0,
-                161,
-                32,
-                121,
-                162,
-                33,
-                90,
+                2,
+                0,
+                73,
+                5,
+                86,
+                4,
+                171,
+                92,
                 5,
                 0,
-                123,
-                148,
+                19,
+                28,
+                67,
+                124,
                 172,
-                91,
-                189,
-                1,
-                12,
-                106,
-                119,
-                84,
-                85,
+                129,
+                201,
+                135,
+                94,
+                72,
+                64,
+                197,
+                38,
+                95,
+                35,
+                44,
+                43,
+                75,
+                225,
+                178,
+                139,
+                236,
+                218,
+                45,
+                144,
                 227,
-                223,
-                27,
-                108,
-                154,
-                141,
-                36,
-                169,
-                246,
-                194,
-                169,
-                194,
-                2,
-                85,
-                184,
+                8,
+                251,
                 114,
-                184,
-                18,
-                253,
-                191,
-                135,
-                3,
+                45,
+                40,
+                137,
+                4,
                 0,
                 0,
                 0,
@@ -8418,38 +8210,38 @@
                 0,
                 0,
                 0,
-                120,
-                242,
-                231,
-                14,
+                225,
+                151,
+                122,
+                183,
+                140,
+                80,
+                88,
                 134,
-                130,
-                104,
-                11,
                 103,
-                210,
-                189,
-                19,
-                28,
-                11,
-                147,
-                107,
-                81,
-                11,
-                11,
-                65,
-                86,
-                11,
-                202,
-                206,
-                15,
-                46,
-                158,
-                1,
-                100,
-                197,
-                160,
-                6,
+                4,
+                35,
+                29,
+                155,
+                30,
+                74,
+                213,
+                228,
+                35,
+                178,
+                125,
+                105,
+                167,
+                234,
+                254,
+                209,
+                95,
+                150,
+                138,
+                239,
+                111,
+                38,
+                232,
                 0,
                 0,
                 0,
@@ -8467,12 +8259,12 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
-                6,
+                244,
+                17,
+                203,
+                109,
+                95,
+                7,
                 0,
                 232,
                 3,
@@ -8490,78 +8282,78 @@
                 0,
                 0,
                 0,
-                211,
-                120,
-                82,
-                183,
-                112,
-                80,
-                203,
-                13,
-                147,
-                76,
-                148,
+                119,
                 115,
-                172,
-                242,
-                93,
-                194,
-                226,
-                79,
+                238,
+                13,
+                243,
+                22,
+                28,
+                78,
+                108,
+                60,
+                101,
+                25,
+                123,
+                138,
                 116,
-                169,
-                48,
-                72,
-                230,
-                175,
-                70,
-                79,
-                244,
-                144,
-                173,
-                213,
-                121,
-                156,
-                0,
-                0,
+                103,
+                87,
+                57,
+                235,
+                83,
+                123,
+                185,
+                5,
+                43,
+                108,
+                250,
+                199,
+                194,
+                8,
+                58,
+                14,
+                13,
                 0,
                 0,
                 0,
                 0,
                 0,
                 0,
-                89,
                 0,
-                134,
-                29,
-                192,
-                94,
-                22,
-                228,
-                35,
-                15,
-                103,
-                223,
-                102,
-                125,
-                164,
                 0,
-                182,
-                241,
-                173,
-                148,
-                115,
-                76,
-                12,
-                134,
                 255,
-                200,
-                115,
-                21,
-                201,
-                216,
+                42,
+                54,
+                155,
+                16,
+                100,
+                224,
+                39,
+                217,
+                65,
+                114,
+                0,
+                139,
+                225,
+                83,
+                252,
+                84,
+                75,
+                243,
+                235,
+                17,
+                199,
+                41,
+                252,
+                146,
+                124,
+                26,
+                180,
+                181,
+                181,
                 29,
-                213,
+                244,
                 0,
                 0,
                 0,
@@ -8571,39 +8363,39 @@
                 0,
                 0,
                 0,
-                116,
-                140,
+                245,
+                64,
+                131,
+                228,
+                230,
+                202,
+                193,
+                136,
+                58,
+                201,
+                134,
+                167,
+                174,
+                61,
+                63,
+                171,
                 27,
-                170,
-                209,
                 171,
-                17,
-                61,
-                7,
-                56,
-                218,
-                138,
-                21,
+                150,
+                193,
+                39,
+                53,
+                93,
+                49,
+                184,
+                198,
+                180,
+                117,
+                20,
+                160,
+                225,
+                139,
                 4,
-                220,
-                241,
-                80,
-                162,
-                255,
-                203,
-                11,
-                22,
-                170,
-                48,
-                59,
-                7,
-                101,
-                161,
-                69,
-                24,
-                201,
-                112,
-                5,
                 0,
                 0,
                 0,
@@ -8611,38 +8403,38 @@
                 0,
                 0,
                 0,
-                247,
-                48,
-                198,
-                197,
-                187,
-                95,
-                147,
-                209,
-                15,
-                245,
-                38,
-                60,
-                142,
-                201,
-                225,
-                91,
-                113,
-                53,
+                100,
+                96,
+                140,
+                115,
+                178,
+                133,
+                212,
+                21,
+                85,
                 180,
-                225,
-                99,
-                175,
-                83,
-                223,
-                59,
-                116,
-                194,
-                11,
-                151,
-                235,
+                158,
+                44,
                 146,
-                196,
+                235,
+                132,
+                110,
+                13,
+                239,
+                115,
+                223,
+                110,
+                114,
+                226,
+                165,
+                144,
+                102,
+                85,
+                239,
+                12,
+                249,
+                109,
+                45,
                 0,
                 0,
                 0,
@@ -8651,39 +8443,39 @@
                 0,
                 0,
                 0,
-                80,
-                80,
-                142,
-                127,
-                158,
-                232,
-                36,
-                13,
-                132,
+                171,
+                39,
+                109,
+                25,
+                86,
+                101,
+                155,
+                65,
                 21,
-                170,
-                224,
+                200,
+                37,
+                226,
+                115,
+                169,
+                182,
+                74,
+                60,
+                111,
+                254,
+                140,
+                247,
                 230,
-                25,
-                125,
-                12,
-                24,
-                68,
-                177,
-                231,
-                44,
-                91,
-                31,
-                217,
-                105,
-                9,
-                198,
-                144,
-                96,
+                222,
+                63,
+                45,
+                45,
+                35,
+                196,
                 16,
-                146,
-                139,
-                1,
+                111,
+                145,
+                85,
+                0,
                 0,
                 0,
                 0,
@@ -8692,38 +8484,42 @@
                 0,
                 0,
                 0,
-                117,
                 254,
-                42,
-                52,
-                238,
-                250,
-                101,
-                84,
-                49,
-                145,
-                237,
-                191,
-                142,
-                110,
-                6,
-                188,
-                55,
-                241,
+                222,
+                88,
+                194,
+                222,
+                164,
+                236,
+                45,
+                117,
+                125,
+                80,
+                122,
                 1,
-                107,
-                182,
-                234,
-                227,
-                213,
-                34,
-                177,
-                229,
-                70,
-                184,
-                220,
-                217,
-                51,
+                119,
+                21,
+                186,
+                58,
+                42,
+                210,
+                122,
+                75,
+                254,
+                158,
+                92,
+                161,
+                201,
+                100,
+                39,
+                218,
+                24,
+                41,
+                151,
+                0,
+                0,
+                0,
+                0,
                 0,
                 0,
                 0,
@@ -8732,10 +8528,6 @@
                 0,
                 0,
                 0,
-                96,
-                255,
-                222,
-                2,
                 0,
                 0,
                 0,
@@ -8804,38 +8596,38 @@
                 0,
                 0,
                 0,
-                153,
-                48,
-                123,
-                170,
-                237,
-                150,
-                85,
-                58,
-                253,
-                170,
-                119,
-                84,
-                156,
-                116,
-                215,
-                211,
-                179,
-                29,
-                196,
-                212,
-                126,
-                30,
-                21,
-                144,
+                166,
+                4,
+                47,
+                112,
+                189,
+                16,
+                209,
+                252,
+                102,
+                57,
+                148,
+                80,
+                98,
+                167,
+                43,
+                219,
+                234,
+                27,
                 136,
-                246,
-                168,
-                36,
-                73,
-                149,
-                230,
-                173,
+                160,
+                254,
+                187,
+                150,
+                197,
+                7,
+                70,
+                7,
+                202,
+                220,
+                47,
+                159,
+                89,
                 0,
                 0,
                 0,
@@ -8886,46 +8678,135 @@
                 0,
                 0,
                 0,
-                45,
-                35,
-                248,
-                175,
-                146,
-                1,
+                31,
+                84,
+                8,
+                216,
+                146,
+                1,
+                0,
+                0,
+                36,
+                82,
+                30,
+                65,
+                183,
+                192,
+                23,
+                72,
+                123,
+                231,
+                100,
+                128,
+                86,
+                159,
+                136,
+                163,
+                24,
+                82,
+                67,
+                139,
+                141,
+                248,
+                200,
+                171,
+                163,
+                5,
+                98,
+                244,
+                137,
+                223,
+                150,
+                206,
+                0,
+                0,
+                0,
+                0,
+                0,
                 0,
                 0,
-                141,
-                159,
-                48,
-                47,
-                164,
-                128,
-                59,
+                0
+              ]
+            }
+          },
+          "owner": {
+            "ObjectOwner": "0x0000000000000000000000000000000000000000000000000000000000000005"
+          },
+          "previous_transaction": "Hero19xTN5BAmbkRVMG5HDAhrcp3ZiGiZwV2AFQSY1zX",
+          "storage_rebate": 0
+        },
+        {
+          "data": {
+            "Move": {
+              "type_": "StakedIota",
+              "has_public_transfer": true,
+              "version": 4,
+              "contents": [
+                56,
+                61,
+                101,
+                148,
+                21,
                 91,
-                130,
-                122,
-                142,
                 115,
-                144,
-                23,
-                163,
-                64,
-                108,
-                107,
-                72,
+                203,
+                158,
+                93,
+                24,
+                231,
                 181,
-                174,
+                105,
+                100,
+                246,
+                5,
+                7,
+                78,
+                124,
+                37,
+                179,
                 239,
+                215,
+                29,
+                98,
+                124,
+                106,
+                193,
+                33,
+                12,
+                126,
+                242,
+                245,
+                215,
+                89,
+                82,
+                128,
+                97,
+                158,
+                1,
+                156,
+                124,
+                176,
+                4,
+                137,
+                192,
+                182,
+                113,
+                144,
+                74,
+                11,
+                72,
+                130,
+                17,
+                145,
+                107,
+                150,
+                212,
                 219,
+                236,
+                228,
                 205,
-                93,
-                109,
-                38,
-                203,
-                113,
-                12,
-                216,
-                183,
+                29,
+                3,
                 0,
                 0,
                 0,
@@ -8933,14 +8814,21 @@
                 0,
                 0,
                 0,
+                0,
+                14,
+                208,
+                231,
+                124,
+                3,
+                0,
                 0
               ]
             }
           },
           "owner": {
-            "ObjectOwner": "0x0000000000000000000000000000000000000000000000000000000000000005"
+            "AddressOwner": "0x32482a229f83bace2da4c90b4dd99c8a73063a6a8ddc5bd6cc99ded87064912a"
           },
-          "previous_transaction": "Ai7U4nQvUNhzdARMaAGfisbHdNMHfRoTm1Z6xo74Q9Sr",
+          "previous_transaction": "Hero19xTN5BAmbkRVMG5HDAhrcp3ZiGiZwV2AFQSY1zX",
           "storage_rebate": 0
         },
         {
@@ -8950,71 +8838,71 @@
               "has_public_transfer": true,
               "version": 4,
               "contents": [
-                34,
-                143,
-                214,
-                76,
-                195,
-                75,
-                206,
+                90,
+                100,
+                208,
+                18,
+                28,
+                120,
+                180,
+                188,
+                57,
+                60,
+                159,
+                0,
+                112,
+                126,
+                223,
+                252,
+                180,
                 151,
-                3,
-                171,
-                156,
-                6,
-                87,
-                87,
-                222,
-                128,
                 35,
-                14,
-                7,
-                122,
-                36,
-                238,
-                83,
-                7,
-                25,
-                226,
-                171,
-                94,
-                24,
-                42,
+                213,
+                79,
+                32,
+                147,
+                164,
+                5,
                 82,
-                133,
-                232,
-                14,
-                72,
-                38,
-                40,
-                13,
-                121,
-                140,
-                248,
-                193,
-                87,
-                156,
-                150,
-                228,
-                154,
-                136,
-                166,
-                92,
+                137,
+                255,
+                49,
+                128,
+                148,
+                86,
                 15,
-                240,
-                225,
-                156,
+                179,
+                7,
+                220,
+                99,
+                116,
+                11,
+                43,
+                34,
+                99,
                 124,
+                173,
+                183,
+                91,
+                122,
+                153,
+                83,
                 227,
-                251,
-                244,
-                22,
-                171,
-                191,
-                166,
-                19,
+                216,
                 174,
-                2,
+                143,
+                123,
+                179,
+                93,
+                16,
+                223,
+                139,
+                50,
+                20,
+                184,
+                146,
+                41,
+                3,
                 0,
                 0,
                 0,
@@ -9034,69 +8922,83 @@
             }
           },
           "owner": {
-            "AddressOwner": "0xc7035483b90ae369f3ce48c3971bf58c19417997746c67320c35d154a6425ab7"
+            "AddressOwner": "0x3bfb34ad6f452c61add36979ce9308a507f4ca7749817ba5a19a57d4ff2cd53f"
           },
-          "previous_transaction": "Ai7U4nQvUNhzdARMaAGfisbHdNMHfRoTm1Z6xo74Q9Sr",
+          "previous_transaction": "Hero19xTN5BAmbkRVMG5HDAhrcp3ZiGiZwV2AFQSY1zX",
           "storage_rebate": 0
         },
         {
           "data": {
             "Move": {
-              "type_": {
-                "Other": {
-                  "address": "0000000000000000000000000000000000000000000000000000000000000002",
-                  "module": "dynamic_field",
-                  "name": "Field",
-                  "type_args": [
-                    "u64",
-                    {
-                      "struct": {
-                        "address": "0000000000000000000000000000000000000000000000000000000000000003",
-                        "module": "staking_pool",
-                        "name": "PoolTokenExchangeRate",
-                        "type_args": []
-                      }
-                    }
-                  ]
-                }
-              },
-              "has_public_transfer": false,
+              "type_": "StakedIota",
+              "has_public_transfer": true,
               "version": 4,
               "contents": [
-                45,
-                79,
-                219,
-                246,
-                100,
-                223,
-                113,
-                111,
-                73,
-                232,
+                98,
+                204,
+                132,
+                145,
                 152,
-                108,
-                100,
-                69,
-                173,
-                89,
-                140,
-                150,
+                245,
+                112,
+                243,
+                165,
+                199,
+                60,
+                35,
+                11,
+                62,
+                133,
+                58,
+                167,
+                91,
+                135,
+                93,
+                24,
+                234,
+                31,
+                96,
+                129,
+                195,
+                145,
+                73,
+                156,
                 185,
+                215,
+                241,
+                209,
+                123,
+                224,
+                206,
+                121,
+                241,
+                77,
+                244,
+                72,
+                86,
+                107,
+                103,
                 131,
-                248,
-                43,
-                237,
-                58,
-                55,
-                70,
+                192,
+                239,
+                101,
+                12,
+                50,
+                118,
+                14,
+                142,
+                183,
+                157,
+                157,
+                157,
+                178,
+                187,
+                220,
+                115,
+                108,
+                181,
                 43,
-                33,
-                155,
-                158,
-                87,
-                95,
-                2,
-                0,
+                3,
                 0,
                 0,
                 0,
@@ -9104,117 +9006,21 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
-                6,
                 0,
-                161,
-                32,
-                121,
-                162,
-                33,
-                90,
-                5,
-                0
-              ]
-            }
-          },
-          "owner": {
-            "ObjectOwner": "0x7b94ac5bbd010c6a775455e3df1b6c9a8d24a9f6c2a9c20255b872b812fdbf87"
-          },
-          "previous_transaction": "Ai7U4nQvUNhzdARMaAGfisbHdNMHfRoTm1Z6xo74Q9Sr",
-          "storage_rebate": 0
-        },
-        {
-          "data": {
-            "Move": {
-              "type_": {
-                "Other": {
-                  "address": "0000000000000000000000000000000000000000000000000000000000000002",
-                  "module": "dynamic_field",
-                  "name": "Field",
-                  "type_args": [
-                    "u64",
-                    {
-                      "struct": {
-                        "address": "0000000000000000000000000000000000000000000000000000000000000003",
-                        "module": "staking_pool",
-                        "name": "PoolTokenExchangeRate",
-                        "type_args": []
-                      }
-                    }
-                  ]
-                }
-              },
-              "has_public_transfer": false,
-              "version": 4,
-              "contents": [
-                62,
-                37,
-                101,
-                200,
-                193,
-                198,
-                120,
-                6,
-                71,
-                154,
-                145,
-                4,
-                99,
-                7,
-                87,
-                114,
                 14,
-                31,
-                132,
-                225,
-                251,
-                50,
-                174,
-                122,
-                168,
-                88,
-                233,
-                244,
-                125,
-                190,
+                208,
                 231,
-                218,
-                2,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                56,
-                111,
-                132,
-                8,
-                177,
-                6,
+                124,
+                3,
                 0,
-                161,
-                32,
-                121,
-                162,
-                33,
-                90,
-                5,
                 0
               ]
             }
           },
           "owner": {
-            "ObjectOwner": "0xc2c9ddd800c90e8a9f7f02f35379fdebe07532f71e953937fcd04fa84c7a24c0"
+            "AddressOwner": "0x2db19ce7b296633e49f48e863c2b08d5ea0a885273bfa574e2db0a85ece225e5"
           },
-          "previous_transaction": "Ai7U4nQvUNhzdARMaAGfisbHdNMHfRoTm1Z6xo74Q9Sr",
+          "previous_transaction": "Hero19xTN5BAmbkRVMG5HDAhrcp3ZiGiZwV2AFQSY1zX",
           "storage_rebate": 0
         },
         {
@@ -9224,71 +9030,71 @@
               "has_public_transfer": true,
               "version": 4,
               "contents": [
-                86,
-                40,
-                138,
-                207,
-                103,
-                213,
-                59,
-                125,
-                194,
-                215,
-                87,
-                152,
-                231,
-                33,
-                44,
-                78,
-                167,
-                108,
-                45,
+                121,
+                83,
+                82,
+                84,
+                120,
+                68,
+                114,
+                182,
                 71,
-                8,
-                34,
-                218,
-                48,
-                163,
-                43,
-                140,
-                186,
-                226,
+                214,
+                223,
+                4,
+                166,
+                44,
+                117,
+                192,
+                102,
+                13,
+                181,
+                213,
+                105,
+                206,
+                70,
+                80,
+                198,
+                168,
+                116,
+                132,
+                49,
+                136,
                 255,
-                130,
-                118,
+                244,
+                26,
+                73,
+                49,
+                169,
+                67,
+                19,
+                121,
+                35,
+                127,
                 251,
-                91,
-                71,
-                93,
-                58,
-                113,
-                7,
-                34,
-                32,
+                115,
+                102,
+                203,
+                11,
                 73,
-                58,
-                239,
-                215,
-                234,
-                130,
-                32,
-                211,
-                15,
-                101,
-                233,
-                95,
-                183,
-                248,
-                96,
-                141,
+                57,
+                227,
+                115,
+                5,
+                39,
+                92,
+                71,
+                87,
+                245,
+                250,
+                108,
+                229,
+                163,
                 116,
+                21,
+                52,
+                122,
                 3,
-                192,
-                80,
-                95,
-                180,
-                167,
-                2,
                 0,
                 0,
                 0,
@@ -9308,9 +9114,9 @@
             }
           },
           "owner": {
-            "AddressOwner": "0x98346c29a0a99b9d0a80c9ede37a77c7fd93ead295fdb01b895ef1392c5087b5"
+            "AddressOwner": "0x45e45dbd905642cc2ca9c3cfd1a0a1f9517758e5d98deb676040c49340c8b267"
           },
-          "previous_transaction": "Ai7U4nQvUNhzdARMaAGfisbHdNMHfRoTm1Z6xo74Q9Sr",
+          "previous_transaction": "Hero19xTN5BAmbkRVMG5HDAhrcp3ZiGiZwV2AFQSY1zX",
           "storage_rebate": 0
         },
         {
@@ -9337,39 +9143,39 @@
               "has_public_transfer": false,
               "version": 4,
               "contents": [
-                137,
-                242,
-                230,
-                41,
-                95,
-                95,
-                114,
-                102,
-                141,
-                122,
-                98,
-                119,
-                0,
-                44,
-                43,
-                62,
-                6,
-                67,
+                179,
+                195,
+                155,
                 33,
-                0,
-                19,
-                113,
-                99,
+                232,
+                210,
+                193,
+                236,
+                91,
+                211,
+                188,
+                101,
+                227,
+                202,
+                213,
+                191,
+                4,
+                41,
+                130,
+                210,
+                193,
+                151,
+                15,
+                17,
+                117,
+                241,
                 183,
-                219,
-                240,
-                233,
-                162,
-                254,
-                244,
-                142,
-                39,
-                2,
+                145,
+                35,
+                70,
+                117,
+                116,
+                3,
                 0,
                 0,
                 0,
@@ -9378,102 +9184,87 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
-                6,
+                244,
+                17,
+                203,
+                109,
+                95,
+                7,
                 0,
-                161,
-                32,
-                121,
-                162,
-                33,
-                90,
+                73,
+                5,
+                86,
+                4,
+                171,
+                92,
                 5,
                 0
               ]
             }
           },
           "owner": {
-            "ObjectOwner": "0xa4c38f903d9744ca22430baeded1bc37c0ed3d75ce55683e69bd3d1fc40b6730"
+            "ObjectOwner": "0x791f65cc868cc6ef0bc0ff4028939f10b96270274481cdebf421d647bef00b6e"
           },
-          "previous_transaction": "Ai7U4nQvUNhzdARMaAGfisbHdNMHfRoTm1Z6xo74Q9Sr",
+          "previous_transaction": "Hero19xTN5BAmbkRVMG5HDAhrcp3ZiGiZwV2AFQSY1zX",
           "storage_rebate": 0
         },
         {
           "data": {
             "Move": {
-              "type_": "StakedIota",
-              "has_public_transfer": true,
+              "type_": {
+                "Other": {
+                  "address": "0000000000000000000000000000000000000000000000000000000000000002",
+                  "module": "dynamic_field",
+                  "name": "Field",
+                  "type_args": [
+                    "u64",
+                    {
+                      "struct": {
+                        "address": "0000000000000000000000000000000000000000000000000000000000000003",
+                        "module": "staking_pool",
+                        "name": "PoolTokenExchangeRate",
+                        "type_args": []
+                      }
+                    }
+                  ]
+                }
+              },
+              "has_public_transfer": false,
               "version": 4,
               "contents": [
-                160,
-                24,
-                137,
-                129,
-                46,
-                196,
-                249,
-                111,
-                34,
+                199,
+                240,
                 82,
-                87,
-                36,
-                230,
-                127,
-                3,
-                182,
-                179,
-                135,
-                118,
-                86,
+                50,
+                126,
                 74,
-                76,
-                242,
-                45,
-                125,
-                100,
-                112,
-                244,
-                56,
-                135,
-                70,
-                198,
-                87,
-                237,
-                32,
-                86,
-                222,
-                32,
-                49,
-                210,
-                53,
-                230,
-                10,
-                194,
-                125,
-                91,
-                46,
-                170,
-                128,
-                158,
-                85,
-                158,
-                11,
-                173,
-                248,
-                152,
-                226,
-                64,
-                231,
-                208,
-                252,
-                170,
-                26,
-                8,
-                2,
+                108,
+                246,
+                28,
+                190,
+                97,
+                254,
+                106,
+                196,
+                109,
+                244,
+                62,
+                204,
+                53,
+                160,
+                213,
+                235,
+                82,
+                129,
+                224,
+                126,
+                118,
+                63,
+                209,
+                104,
+                68,
+                185,
+                3,
                 0,
                 0,
                 0,
@@ -9482,94 +9273,87 @@
                 0,
                 0,
                 0,
-                14,
-                208,
-                231,
-                124,
-                3,
+                244,
+                17,
+                203,
+                109,
+                95,
+                7,
                 0,
+                73,
+                5,
+                86,
+                4,
+                171,
+                92,
+                5,
                 0
               ]
             }
           },
           "owner": {
-            "AddressOwner": "0x48d90f650bf4d87ad129ec47392ec38a8c6c0bb5ea4b6dab610e3a841431ab99"
+            "ObjectOwner": "0x3c32b42be3a2db1d7ddd51c85375127ff6aefb276834193e469e01e25d48f555"
           },
-          "previous_transaction": "Ai7U4nQvUNhzdARMaAGfisbHdNMHfRoTm1Z6xo74Q9Sr",
+          "previous_transaction": "Hero19xTN5BAmbkRVMG5HDAhrcp3ZiGiZwV2AFQSY1zX",
           "storage_rebate": 0
         },
         {
           "data": {
             "Move": {
-              "type_": "StakedIota",
-              "has_public_transfer": true,
+              "type_": {
+                "Other": {
+                  "address": "0000000000000000000000000000000000000000000000000000000000000002",
+                  "module": "dynamic_field",
+                  "name": "Field",
+                  "type_args": [
+                    "u64",
+                    {
+                      "struct": {
+                        "address": "0000000000000000000000000000000000000000000000000000000000000003",
+                        "module": "staking_pool",
+                        "name": "PoolTokenExchangeRate",
+                        "type_args": []
+                      }
+                    }
+                  ]
+                }
+              },
+              "has_public_transfer": false,
               "version": 4,
               "contents": [
-                233,
-                169,
-                100,
-                177,
-                177,
-                114,
-                51,
-                113,
-                236,
-                69,
-                63,
-                33,
-                89,
-                143,
-                17,
-                132,
-                86,
-                229,
-                201,
-                57,
-                221,
-                204,
-                105,
-                10,
-                251,
-                98,
-                75,
-                48,
-                43,
+                217,
+                115,
+                222,
+                147,
+                153,
+                42,
+                213,
+                107,
+                24,
+                170,
                 106,
-                174,
-                29,
-                12,
-                179,
-                128,
-                203,
-                50,
+                193,
+                229,
+                216,
+                79,
+                136,
+                189,
                 90,
-                131,
-                15,
-                3,
-                238,
-                75,
-                218,
-                121,
-                11,
-                5,
-                225,
-                117,
-                83,
-                128,
-                22,
-                245,
-                212,
+                137,
+                69,
+                186,
+                116,
+                1,
+                184,
+                234,
+                190,
+                27,
+                177,
+                70,
+                173,
+                57,
                 124,
-                179,
-                82,
-                201,
-                60,
-                198,
-                218,
-                220,
-                19,
-                4,
-                2,
+                3,
                 0,
                 0,
                 0,
@@ -9578,20 +9362,28 @@
                 0,
                 0,
                 0,
-                14,
-                208,
-                231,
-                124,
-                3,
+                244,
+                17,
+                203,
+                109,
+                95,
+                7,
                 0,
+                73,
+                5,
+                86,
+                4,
+                171,
+                92,
+                5,
                 0
               ]
             }
           },
           "owner": {
-            "AddressOwner": "0x3282178ff167d02a033e89d1280a1ec25f9dd069a0f1400c244192f1f75cbabc"
+            "ObjectOwner": "0x131c437cac81c9875e4840c5265f232c2b4be1b28becda2d90e308fb722d2889"
           },
-          "previous_transaction": "Ai7U4nQvUNhzdARMaAGfisbHdNMHfRoTm1Z6xo74Q9Sr",
+          "previous_transaction": "Hero19xTN5BAmbkRVMG5HDAhrcp3ZiGiZwV2AFQSY1zX",
           "storage_rebate": 0
         },
         {
@@ -9618,39 +9410,39 @@
               "has_public_transfer": false,
               "version": 4,
               "contents": [
-                247,
-                81,
-                30,
-                133,
+                241,
+                212,
+                167,
+                102,
+                135,
+                239,
+                183,
+                202,
+                201,
+                147,
+                114,
+                49,
+                139,
                 150,
-                51,
-                82,
-                0,
-                141,
-                200,
-                130,
-                77,
-                253,
-                4,
-                236,
-                192,
-                176,
-                228,
+                50,
+                225,
+                15,
+                227,
+                142,
+                174,
+                131,
                 229,
-                197,
-                27,
-                160,
+                114,
+                152,
+                10,
                 69,
-                41,
-                191,
-                184,
-                143,
-                197,
-                162,
-                53,
-                93,
-                255,
-                2,
+                115,
+                47,
+                48,
+                231,
+                163,
+                170,
+                3,
                 0,
                 0,
                 0,
@@ -9659,28 +9451,28 @@
                 0,
                 0,
                 0,
-                56,
-                111,
-                132,
-                8,
-                177,
-                6,
+                244,
+                17,
+                203,
+                109,
+                95,
+                7,
                 0,
-                161,
-                32,
-                121,
-                162,
-                33,
-                90,
+                73,
+                5,
+                86,
+                4,
+                171,
+                92,
                 5,
                 0
               ]
             }
           },
           "owner": {
-            "ObjectOwner": "0x3f6b931f79fd0b2a14ed76a5b23714344c421f99a2ccd1978ef2270e167614cc"
+            "ObjectOwner": "0x6450460d7e7be475407908e48144f095500bc73cf7254f91c182a45570d0cac6"
           },
-          "previous_transaction": "Ai7U4nQvUNhzdARMaAGfisbHdNMHfRoTm1Z6xo74Q9Sr",
+          "previous_transaction": "Hero19xTN5BAmbkRVMG5HDAhrcp3ZiGiZwV2AFQSY1zX",
           "storage_rebate": 0
         }
       ]
diff --git a/crates/iota-light-client/example_config/checkpoints.yaml b/crates/iota-light-client/example_config/checkpoints.yaml
index 1afb0b7b2cd..5f8a341f905 100644
--- a/crates/iota-light-client/example_config/checkpoints.yaml
+++ b/crates/iota-light-client/example_config/checkpoints.yaml
@@ -1,4 +1,4 @@
 ---
 checkpoints:
-  - 528
-  - 794
+  - 532
+  - 801
diff --git a/crates/iota-light-client/src/bin/generate_chk_snapshots.rs b/crates/iota-light-client/src/bin/generate_chk_snapshots.rs
new file mode 100644
index 00000000000..e67d759f1d9
--- /dev/null
+++ b/crates/iota-light-client/src/bin/generate_chk_snapshots.rs
@@ -0,0 +1,56 @@
+// Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+use std::fs;
+
+use iota_light_client::utils::{
+    CheckpointsList, Config, read_checkpoint_list, sync_checkpoint_list_to_latest,
+};
+use iota_rest_api::Client;
+
+#[tokio::main]
+pub async fn main() {
+    let config: Config = serde_yaml::from_reader(
+        &fs::File::open(format!(
+            "{}/example_config/light_client.yaml",
+            env!("CARGO_MANIFEST_DIR")
+        ))
+        .unwrap(),
+    )
+    .unwrap();
+    sync_checkpoint_list_to_latest(&config).await.unwrap();
+    let checkpoints_list: CheckpointsList = read_checkpoint_list(&config).unwrap();
+
+    let client = Client::new(format!("{}/rest", config.full_node_url()));
+    for ckp in checkpoints_list.checkpoints {
+        let summary = client.get_checkpoint_summary(ckp).await.unwrap();
+        serde_json::to_writer_pretty(
+            &mut fs::File::create(format!(
+                "{}/example_config/{ckp}.json",
+                env!("CARGO_MANIFEST_DIR")
+            ))
+            .unwrap(),
+            &summary,
+        )
+        .unwrap();
+        let full = client.get_full_checkpoint(ckp).await.unwrap();
+        serde_json::to_writer_pretty(
+            &mut fs::File::create(format!(
+                "{}/example_config/{ckp}_full.json",
+                env!("CARGO_MANIFEST_DIR")
+            ))
+            .unwrap(),
+            &full,
+        )
+        .unwrap();
+        bcs::serialize_into(
+            &mut fs::File::create(format!(
+                "{}/example_config/{ckp}.chk",
+                env!("CARGO_MANIFEST_DIR")
+            ))
+            .unwrap(),
+            &full,
+        )
+        .unwrap();
+    }
+}
diff --git a/crates/iota-light-client/src/bin/light_client.rs b/crates/iota-light-client/src/bin/light_client.rs
new file mode 100644
index 00000000000..bbfbfaee721
--- /dev/null
+++ b/crates/iota-light-client/src/bin/light_client.rs
@@ -0,0 +1,275 @@
+// Copyright (c) Mysten Labs, Inc.
+// Modifications Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{fs, path::PathBuf, str::FromStr};
+
+use clap::Parser;
+use iota_json::IotaJsonValue;
+use iota_light_client::utils::{
+    Config, RemotePackageStore, SCommands, check_and_sync_checkpoints,
+    get_verified_effects_and_events, get_verified_object,
+};
+use iota_package_resolver::Resolver;
+use iota_types::{base_types::ObjectID, digests::TransactionDigest, object::Data};
+
+/// A light client for the Iota blockchain
+#[derive(Parser, Debug)]
+#[command(author, version, about, long_about = None)]
+struct Args {
+    /// Sets a custom config file
+    #[arg(short, long, value_name = "FILE")]
+    config: Option<PathBuf>,
+
+    #[command(subcommand)]
+    command: Option<SCommands>,
+}
+
+#[tokio::main]
+pub async fn main() {
+    // Command line arguments and config loading
+    let args = Args::parse();
+    let path = args
+        .config
+        .unwrap_or_else(|| panic!("Need a config file path"));
+
+    let reader = fs::File::open(path.clone())
+        .unwrap_or_else(|_| panic!("Unable to load config from {}", path.display()));
+    let config: Config = serde_yaml::from_reader(reader).unwrap();
+
+    // Print config parameters
+    println!(
+        "Checkpoint Dir: {}",
+        config.checkpoint_summary_dir().display()
+    );
+
+    let remote_package_store = RemotePackageStore::new(config.clone());
+    let resolver = Resolver::new(remote_package_store);
+
+    match args.command {
+        Some(SCommands::Transaction { tid }) => {
+            let (effects, events) = get_verified_effects_and_events(
+                &config,
+                TransactionDigest::from_str(&tid).unwrap(),
+            )
+            .await
+            .unwrap();
+
+            let exec_digests = effects.execution_digests();
+            println!(
+                "Executed TID: {} Effects: {}",
+                exec_digests.transaction, exec_digests.effects
+            );
+
+            for event in events.as_ref().unwrap().data.iter() {
+                let type_layout = resolver
+                    .type_layout(event.type_.clone().into())
+                    .await
+                    .unwrap();
+
+                let json_val =
+                    IotaJsonValue::from_bcs_bytes(Some(&type_layout), &event.contents).unwrap();
+
+                println!(
+                    "Event:\n - Package: {}\n - Module: {}\n - Sender: {}\n - Type: {}\n{}",
+                    event.package_id,
+                    event.transaction_module,
+                    event.sender,
+                    event.type_,
+                    serde_json::to_string_pretty(&json_val.to_json_value()).unwrap()
+                );
+            }
+        }
+        Some(SCommands::Object { oid }) => {
+            let oid = ObjectID::from_str(&oid).unwrap();
+            let object = get_verified_object(&config, oid).await.unwrap();
+
+            if let Data::Move(move_object) = &object.data {
+                let object_type = move_object.type_().clone();
+
+                let type_layout = resolver
+                    .type_layout(object_type.clone().into())
+                    .await
+                    .unwrap();
+
+                let json_val =
+                    IotaJsonValue::from_bcs_bytes(Some(&type_layout), move_object.contents())
+                        .unwrap();
+
+                let (oid, version, hash) = object.compute_object_reference();
+                println!(
+                    "OID: {}\n - Version: {}\n - Hash: {}\n - Owner: {}\n - Type: {}\n{}",
+                    oid,
+                    version,
+                    hash,
+                    object.owner,
+                    object_type,
+                    serde_json::to_string_pretty(&json_val.to_json_value()).unwrap()
+                );
+            }
+        }
+
+        Some(SCommands::Sync {}) => {
+            check_and_sync_checkpoints(&config)
+                .await
+                .expect("Failed to sync checkpoints");
+        }
+        _ => {}
+    };
+}
+
+// Make a test namespace
+#[cfg(test)]
+mod tests {
+    use std::path::{Path, PathBuf};
+
+    use anyhow::anyhow;
+    use iota_light_client::utils::extract_verified_effects_and_events;
+    use iota_rest_api::CheckpointData;
+    use iota_types::{
+        committee::Committee,
+        crypto::AuthorityQuorumSignInfo,
+        message_envelope::Envelope,
+        messages_checkpoint::{CheckpointSummary, FullCheckpointContents},
+    };
+
+    use super::*;
+
+    async fn read_full_checkpoint(checkpoint_path: &PathBuf) -> anyhow::Result<CheckpointData> {
+        Ok(bcs::from_reader(fs::File::open(checkpoint_path)?)?)
+    }
+
+    // clippy ignore dead-code
+    #[allow(dead_code)]
+    async fn write_full_checkpoint(
+        checkpoint_path: &Path,
+        checkpoint: &CheckpointData,
+    ) -> anyhow::Result<()> {
+        bcs::serialize_into(&mut fs::File::create(checkpoint_path)?, &checkpoint)?;
+        Ok(())
+    }
+
+    async fn read_data() -> (Committee, CheckpointData) {
+        let mut d = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+        d.push("example_config/532.json");
+
+        let checkpoint: Envelope<CheckpointSummary, AuthorityQuorumSignInfo<true>> =
+            serde_json::from_reader(&fs::File::open(&d).unwrap())
+                .map_err(|_| anyhow!("Unable to parse checkpoint summary file"))
+                .unwrap();
+
+        let prev_committee = checkpoint
+            .end_of_epoch_data
+            .as_ref()
+            .ok_or(anyhow!(
+                "Expected all checkpoints to be end-of-epoch checkpoints"
+            ))
+            .unwrap()
+            .next_epoch_committee
+            .iter()
+            .cloned()
+            .collect();
+
+        // Make a committee object using this
+        let committee = Committee::new(checkpoint.epoch().checked_add(1).unwrap(), prev_committee);
+
+        let mut d = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+        d.push("example_config/801.chk");
+
+        let full_checkpoint = read_full_checkpoint(&d).await.unwrap();
+
+        (committee, full_checkpoint)
+    }
+
+    #[tokio::test]
+    async fn test_checkpoint_all_good() {
+        let (committee, full_checkpoint) = read_data().await;
+
+        extract_verified_effects_and_events(
+            &full_checkpoint,
+            &committee,
+            TransactionDigest::from_str("Hero19xTN5BAmbkRVMG5HDAhrcp3ZiGiZwV2AFQSY1zX").unwrap(),
+        )
+        .unwrap();
+    }
+
+    #[tokio::test]
+    async fn test_checkpoint_bad_committee() {
+        let (mut committee, full_checkpoint) = read_data().await;
+
+        // Change committee
+        committee.epoch += 10;
+
+        assert!(
+            extract_verified_effects_and_events(
+                &full_checkpoint,
+                &committee,
+                TransactionDigest::from_str("DpSZVwqohRzF7ASz7PMM8xL1ZkMnNvWMLJfjadt9ybE9")
+                    .unwrap(),
+            )
+            .is_err()
+        );
+    }
+
+    #[tokio::test]
+    async fn test_checkpoint_no_transaction() {
+        let (committee, full_checkpoint) = read_data().await;
+
+        assert!(
+            extract_verified_effects_and_events(
+                &full_checkpoint,
+                &committee,
+                TransactionDigest::from_str("6ciKBJF3gZ2zNNKLqwRMBL4ftZRGL2kHPgKepWP2thbs")
+                    .unwrap(),
+            )
+            .is_err()
+        );
+    }
+
+    #[tokio::test]
+    async fn test_checkpoint_bad_contents() {
+        let (committee, mut full_checkpoint) = read_data().await;
+
+        // Change contents
+        let random_contents = FullCheckpointContents::random_for_testing();
+        full_checkpoint.checkpoint_contents = random_contents.checkpoint_contents();
+
+        assert!(
+            extract_verified_effects_and_events(
+                &full_checkpoint,
+                &committee,
+                TransactionDigest::from_str("9AoR24Tcmss7K3DgBZYiUZNxHFuk8kdAbZEMcFe9mcAi")
+                    .unwrap(),
+            )
+            .is_err()
+        );
+    }
+
+    #[tokio::test]
+    async fn test_checkpoint_bad_events() {
+        let (committee, mut full_checkpoint) = read_data().await;
+
+        let event = full_checkpoint.transactions[1]
+            .events
+            .as_ref()
+            .unwrap()
+            .data[0]
+            .clone();
+
+        for t in &mut full_checkpoint.transactions {
+            if let Some(events) = &mut t.events {
+                events.data.push(event.clone());
+            }
+        }
+
+        assert!(
+            extract_verified_effects_and_events(
+                &full_checkpoint,
+                &committee,
+                TransactionDigest::from_str("Hj7mZdET3fKqxbSnbdcVbx9N2pqvHtkoKbPy6MEeFsfB")
+                    .unwrap(),
+            )
+            .is_err()
+        );
+    }
+}
diff --git a/crates/iota-light-client/src/lib.rs b/crates/iota-light-client/src/lib.rs
index 001821ea031..9cbb0a13111 100644
--- a/crates/iota-light-client/src/lib.rs
+++ b/crates/iota-light-client/src/lib.rs
@@ -4,6 +4,7 @@
 
 pub mod construct;
 pub mod proof;
+pub mod utils;
 
 #[doc(inline)]
 pub use construct::*;
diff --git a/crates/iota-light-client/src/main.rs b/crates/iota-light-client/src/utils.rs
similarity index 60%
rename from crates/iota-light-client/src/main.rs
rename to crates/iota-light-client/src/utils.rs
index 61578963f8d..80d1845f959 100644
--- a/crates/iota-light-client/src/main.rs
+++ b/crates/iota-light-client/src/utils.rs
@@ -1,22 +1,19 @@
 // Copyright (c) Mysten Labs, Inc.
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
-
 use std::{
     fs,
     io::{Read, Write},
     path::PathBuf,
-    str::FromStr,
     sync::Arc,
 };
 
 use anyhow::anyhow;
 use async_trait::async_trait;
-use clap::{Parser, Subcommand};
+use clap::Subcommand;
 use iota_config::genesis::Genesis;
-use iota_json::IotaJsonValue;
 use iota_json_rpc_types::IotaTransactionBlockResponseOptions;
-use iota_package_resolver::{Package, PackageStore, Resolver, Result as ResolverResult};
+use iota_package_resolver::{Package, PackageStore, Result as ResolverResult};
 use iota_rest_api::{CheckpointData, Client};
 use iota_sdk::IotaClientBuilder;
 use iota_types::{
@@ -27,131 +24,76 @@ use iota_types::{
     effects::{TransactionEffects, TransactionEffectsAPI, TransactionEvents},
     message_envelope::Envelope,
     messages_checkpoint::{CertifiedCheckpointSummary, CheckpointSummary, EndOfEpochData},
-    object::{Data, Object},
+    object::Object,
 };
 use move_core_types::account_address::AccountAddress;
 
-/// A light client for the Iota blockchain
-#[derive(Parser, Debug)]
-#[command(author, version, about, long_about = None)]
-struct Args {
-    /// Sets a custom config file
-    #[arg(short, long, value_name = "FILE")]
-    config: Option<PathBuf>,
-
-    #[command(subcommand)]
-    command: Option<SCommands>,
-}
-
-struct RemotePackageStore {
-    config: Config,
-}
-
-impl RemotePackageStore {
-    pub fn new(config: Config) -> Self {
-        Self { config }
-    }
-}
-
-#[async_trait]
-impl PackageStore for RemotePackageStore {
-    /// Read package contents. Fails if `id` is not an object, not a package, or
-    /// is malformed in some way.
-    async fn fetch(&self, id: AccountAddress) -> ResolverResult<Arc<Package>> {
-        let object = get_verified_object(&self.config, id.into()).await.unwrap();
-        let package = Package::read_from_object(&object).unwrap();
-        Ok(Arc::new(package))
-    }
-}
-
-#[derive(Subcommand, Debug)]
-enum SCommands {
-    /// Sync all end-of-epoch checkpoints
-    Sync {},
+pub async fn check_and_sync_checkpoints(config: &Config) -> anyhow::Result<()> {
+    sync_checkpoint_list_to_latest(config).await?;
 
-    /// Checks a specific transaction using the light client
-    Transaction {
-        /// Transaction hash
-        #[arg(short, long, value_name = "TID")]
-        tid: String,
-    },
+    // Get the local checkpoint list
+    let checkpoints_list: CheckpointsList = read_checkpoint_list(config)?;
 
-    /// Checks a specific object using the light client
-    Object {
-        /// Transaction hash
-        #[arg(short, long, value_name = "OID")]
-        oid: String,
-    },
-}
+    // Load the genesis committee
+    let mut genesis_path = config.checkpoint_summary_dir.clone();
+    genesis_path.push(&config.genesis_filename);
+    let genesis_committee = Genesis::load(&genesis_path)?.committee()?;
 
-// The config file for the light client including the root of trust genesis
-// digest
-#[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
-struct Config {
-    /// Full node url
-    full_node_url: String,
+    // Check the signatures of all checkpoints
+    // And download any missing ones
 
-    /// Checkpoint summary directory
-    checkpoint_summary_dir: PathBuf,
+    let mut prev_committee = genesis_committee;
+    for ckp_id in &checkpoints_list.checkpoints {
+        // check if there is a file with this name ckp_id.yaml in the
+        // checkpoint_summary_dir
+        let mut checkpoint_path = config.checkpoint_summary_dir.clone();
+        checkpoint_path.push(format!("{}.json", ckp_id));
+        // If file exists read the file otherwise download it from the server
+        let summary = if checkpoint_path.exists() {
+            read_checkpoint(config, *ckp_id)?
+        } else {
+            // Download the checkpoint from the server
+            let summary = download_checkpoint_summary(config, *ckp_id).await?;
+            summary.clone().try_into_verified(&prev_committee)?;
+            // Write the checkpoint summary to a file
+            write_checkpoint(config, &summary)?;
+            summary
+        };
 
-    //  Genesis file name
-    genesis_filename: PathBuf,
-}
+        // Print the id of the checkpoint and the epoch number
+        println!(
+            "Epoch: {} Checkpoint ID: {}",
+            summary.epoch(),
+            summary.digest()
+        );
 
-impl Config {
-    pub fn rest_url(&self) -> &str {
-        &self.full_node_url
+        // Extract the new committee information
+        if let Some(EndOfEpochData {
+            next_epoch_committee,
+            ..
+        }) = &summary.end_of_epoch_data
+        {
+            let next_committee = next_epoch_committee.iter().cloned().collect();
+            prev_committee =
+                Committee::new(summary.epoch().checked_add(1).unwrap(), next_committee);
+        } else {
+            return Err(anyhow!(
+                "Expected all checkpoints to be end-of-epoch checkpoints"
+            ));
+        }
     }
-}
-
-// The list of checkpoints at the end of each epoch
-#[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
-struct CheckpointsList {
-    // List of end of epoch checkpoints
-    checkpoints: Vec<u64>,
-}
-
-fn read_checkpoint_list(config: &Config) -> anyhow::Result<CheckpointsList> {
-    let mut checkpoints_path = config.checkpoint_summary_dir.clone();
-    checkpoints_path.push("checkpoints.yaml");
-    // Read the resulting file and parse the yaml checkpoint list
-    let reader = fs::File::open(&checkpoints_path)?;
-    Ok(serde_yaml::from_reader(reader)?)
-}
-
-fn read_checkpoint(
-    config: &Config,
-    seq: u64,
-) -> anyhow::Result<Envelope<CheckpointSummary, AuthorityQuorumSignInfo<true>>> {
-    read_checkpoint_general(config, seq, None)
-}
 
-fn read_checkpoint_general(
-    config: &Config,
-    seq: u64,
-    path: Option<&str>,
-) -> anyhow::Result<Envelope<CheckpointSummary, AuthorityQuorumSignInfo<true>>> {
-    // Read the resulting file and parse the yaml checkpoint list
-    let mut checkpoint_path = config.checkpoint_summary_dir.clone();
-    if let Some(path) = path {
-        checkpoint_path.push(path);
-    }
-    checkpoint_path.push(format!("{}.chk", seq));
-    let mut reader = fs::File::open(checkpoint_path.clone())?;
-    let metadata = fs::metadata(&checkpoint_path)?;
-    let mut buffer = vec![0; metadata.len() as usize];
-    reader.read_exact(&mut buffer)?;
-    bcs::from_bytes(&buffer).map_err(|_| anyhow!("Unable to parse checkpoint file"))
+    Ok(())
 }
 
-fn write_checkpoint(
+pub fn write_checkpoint(
     config: &Config,
     summary: &Envelope<CheckpointSummary, AuthorityQuorumSignInfo<true>>,
 ) -> anyhow::Result<()> {
     write_checkpoint_general(config, summary, None)
 }
 
-fn write_checkpoint_general(
+pub fn write_checkpoint_general(
     config: &Config,
     summary: &Envelope<CheckpointSummary, AuthorityQuorumSignInfo<true>>,
     path: Option<&str>,
@@ -168,7 +110,7 @@ fn write_checkpoint_general(
     Ok(())
 }
 
-fn write_checkpoint_list(
+pub fn write_checkpoint_list(
     config: &Config,
     checkpoints_list: &CheckpointsList,
 ) -> anyhow::Result<()> {
@@ -183,7 +125,7 @@ fn write_checkpoint_list(
         .map_err(|_| anyhow!("Unable to serialize checkpoint list"))
 }
 
-async fn download_checkpoint_summary(
+pub async fn download_checkpoint_summary(
     config: &Config,
     seq: u64,
 ) -> anyhow::Result<CertifiedCheckpointSummary> {
@@ -194,7 +136,7 @@ async fn download_checkpoint_summary(
 
 /// Run binary search to for each end of epoch checkpoint that is missing
 /// between the latest on the list and the latest checkpoint.
-async fn sync_checkpoint_list_to_latest(config: &Config) -> anyhow::Result<()> {
+pub async fn sync_checkpoint_list_to_latest(config: &Config) -> anyhow::Result<()> {
     // Get the local checkpoint list
     let mut checkpoints_list: CheckpointsList = read_checkpoint_list(config)?;
     let mut last_epoch = 0;
@@ -262,66 +204,7 @@ async fn sync_checkpoint_list_to_latest(config: &Config) -> anyhow::Result<()> {
     Ok(())
 }
 
-async fn check_and_sync_checkpoints(config: &Config) -> anyhow::Result<()> {
-    sync_checkpoint_list_to_latest(config).await?;
-
-    // Get the local checkpoint list
-    let checkpoints_list: CheckpointsList = read_checkpoint_list(config)?;
-
-    // Load the genesis committee
-    let mut genesis_path = config.checkpoint_summary_dir.clone();
-    genesis_path.push(&config.genesis_filename);
-    let genesis_committee = Genesis::load(&genesis_path)?.committee()?;
-
-    // Check the signatures of all checkpoints
-    // And download any missing ones
-
-    let mut prev_committee = genesis_committee;
-    for ckp_id in &checkpoints_list.checkpoints {
-        // check if there is a file with this name ckp_id.yaml in the
-        // checkpoint_summary_dir
-        let mut checkpoint_path = config.checkpoint_summary_dir.clone();
-        checkpoint_path.push(format!("{}.json", ckp_id));
-
-        // If file exists read the file otherwise download it from the server
-        let summary = if checkpoint_path.exists() {
-            read_checkpoint(config, *ckp_id)?
-        } else {
-            // Download the checkpoint from the server
-            let summary = download_checkpoint_summary(config, *ckp_id).await?;
-            summary.clone().try_into_verified(&prev_committee)?;
-            // Write the checkpoint summary to a file
-            write_checkpoint(config, &summary)?;
-            summary
-        };
-
-        // Print the id of the checkpoint and the epoch number
-        println!(
-            "Epoch: {} Checkpoint ID: {}",
-            summary.epoch(),
-            summary.digest()
-        );
-
-        // Extract the new committee information
-        if let Some(EndOfEpochData {
-            next_epoch_committee,
-            ..
-        }) = &summary.end_of_epoch_data
-        {
-            let next_committee = next_epoch_committee.iter().cloned().collect();
-            prev_committee =
-                Committee::new(summary.epoch().checked_add(1).unwrap(), next_committee);
-        } else {
-            return Err(anyhow!(
-                "Expected all checkpoints to be end-of-epoch checkpoints"
-            ));
-        }
-    }
-
-    Ok(())
-}
-
-async fn get_full_checkpoint(config: &Config, seq: u64) -> anyhow::Result<CheckpointData> {
+pub async fn get_full_checkpoint(config: &Config, seq: u64) -> anyhow::Result<CheckpointData> {
     // Downloading the checkpoint from the server
     let client: Client = Client::new(config.rest_url());
     let full_checkpoint = client.get_full_checkpoint(seq).await?;
@@ -329,7 +212,7 @@ async fn get_full_checkpoint(config: &Config, seq: u64) -> anyhow::Result<Checkp
     Ok(full_checkpoint)
 }
 
-fn extract_verified_effects_and_events(
+pub fn extract_verified_effects_and_events(
     checkpoint: &CheckpointData,
     committee: &Committee,
     tid: TransactionDigest,
@@ -363,7 +246,7 @@ fn extract_verified_effects_and_events(
     Ok((matching_tx.effects.clone(), matching_tx.events.clone()))
 }
 
-async fn get_verified_effects_and_events(
+pub async fn get_verified_effects_and_events(
     config: &Config,
     tid: TransactionDigest,
 ) -> anyhow::Result<(TransactionEffects, Option<TransactionEvents>)> {
@@ -430,7 +313,7 @@ async fn get_verified_effects_and_events(
     extract_verified_effects_and_events(&full_check_point, &committee, tid)
 }
 
-async fn get_verified_object(config: &Config, id: ObjectID) -> anyhow::Result<Object> {
+pub async fn get_verified_object(config: &Config, id: ObjectID) -> anyhow::Result<Object> {
     let client: Client = Client::new(config.rest_url());
     let object = client.get_object(id).await?;
 
@@ -447,243 +330,111 @@ async fn get_verified_object(config: &Config, id: ObjectID) -> anyhow::Result<Ob
     Ok(object)
 }
 
-#[tokio::main]
-pub async fn main() {
-    // Command line arguments and config loading
-    let args = Args::parse();
-
-    let path = args
-        .config
-        .unwrap_or_else(|| panic!("Need a config file path"));
-    let reader = fs::File::open(path.clone())
-        .unwrap_or_else(|_| panic!("Unable to load config from {}", path.display()));
-    let config: Config = serde_yaml::from_reader(reader).unwrap();
-
-    // Print config parameters
-    println!(
-        "Checkpoint Dir: {}",
-        config.checkpoint_summary_dir.display()
-    );
-
-    let remote_package_store = RemotePackageStore::new(config.clone());
-    let resolver = Resolver::new(remote_package_store);
-
-    match args.command {
-        Some(SCommands::Transaction { tid }) => {
-            let (effects, events) = get_verified_effects_and_events(
-                &config,
-                TransactionDigest::from_str(&tid).unwrap(),
-            )
-            .await
-            .unwrap();
-
-            let exec_digests = effects.execution_digests();
-            println!(
-                "Executed TID: {} Effects: {}",
-                exec_digests.transaction, exec_digests.effects
-            );
-
-            for event in events.as_ref().unwrap().data.iter() {
-                let type_layout = resolver
-                    .type_layout(event.type_.clone().into())
-                    .await
-                    .unwrap();
-
-                let json_val =
-                    IotaJsonValue::from_bcs_bytes(Some(&type_layout), &event.contents).unwrap();
-
-                println!(
-                    "Event:\n - Package: {}\n - Module: {}\n - Sender: {}\n - Type: {}\n{}",
-                    event.package_id,
-                    event.transaction_module,
-                    event.sender,
-                    event.type_,
-                    serde_json::to_string_pretty(&json_val.to_json_value()).unwrap()
-                );
-            }
-        }
-        Some(SCommands::Object { oid }) => {
-            let oid = ObjectID::from_str(&oid).unwrap();
-            let object = get_verified_object(&config, oid).await.unwrap();
-
-            if let Data::Move(move_object) = &object.data {
-                let object_type = move_object.type_().clone();
-
-                let type_layout = resolver
-                    .type_layout(object_type.clone().into())
-                    .await
-                    .unwrap();
-
-                let json_val =
-                    IotaJsonValue::from_bcs_bytes(Some(&type_layout), move_object.contents())
-                        .unwrap();
-
-                let (oid, version, hash) = object.compute_object_reference();
-                println!(
-                    "OID: {}\n - Version: {}\n - Hash: {}\n - Owner: {}\n - Type: {}\n{}",
-                    oid,
-                    version,
-                    hash,
-                    object.owner,
-                    object_type,
-                    serde_json::to_string_pretty(&json_val.to_json_value()).unwrap()
-                );
-            }
-        }
-
-        Some(SCommands::Sync {}) => {
-            check_and_sync_checkpoints(&config)
-                .await
-                .expect("Failed to sync checkpoints");
-        }
-        _ => {}
-    }
+pub struct RemotePackageStore {
+    config: Config,
 }
 
-// Make a test namespace
-#[cfg(test)]
-mod tests {
-    use std::path::{Path, PathBuf};
-
-    use iota_types::messages_checkpoint::FullCheckpointContents;
-
-    use super::*;
-
-    async fn read_full_checkpoint(checkpoint_path: &PathBuf) -> anyhow::Result<CheckpointData> {
-        Ok(bcs::from_reader(fs::File::open(checkpoint_path)?)?)
+impl RemotePackageStore {
+    pub fn new(config: Config) -> Self {
+        Self { config }
     }
+}
 
-    // clippy ignore dead-code
-    #[allow(dead_code)]
-    async fn write_full_checkpoint(
-        checkpoint_path: &Path,
-        checkpoint: &CheckpointData,
-    ) -> anyhow::Result<()> {
-        bcs::serialize_into(&mut fs::File::create(checkpoint_path)?, &checkpoint)?;
-        Ok(())
+#[async_trait]
+impl PackageStore for RemotePackageStore {
+    /// Read package contents. Fails if `id` is not an object, not a package, or
+    /// is malformed in some way.
+    async fn fetch(&self, id: AccountAddress) -> ResolverResult<Arc<Package>> {
+        let object = get_verified_object(&self.config, id.into()).await.unwrap();
+        let package = Package::read_from_object(&object).unwrap();
+        Ok(Arc::new(package))
     }
+}
 
-    async fn read_data() -> (Committee, CheckpointData) {
-        let mut d = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        d.push("example_config/528.json");
-
-        let checkpoint: Envelope<CheckpointSummary, AuthorityQuorumSignInfo<true>> =
-            serde_json::from_reader(&fs::File::open(&d).unwrap())
-                .map_err(|_| anyhow!("Unable to parse checkpoint summary file"))
-                .unwrap();
-
-        let prev_committee = checkpoint
-            .end_of_epoch_data
-            .as_ref()
-            .ok_or(anyhow!(
-                "Expected all checkpoints to be end-of-epoch checkpoints"
-            ))
-            .unwrap()
-            .next_epoch_committee
-            .iter()
-            .cloned()
-            .collect();
-
-        // Make a committee object using this
-        let committee = Committee::new(checkpoint.epoch().checked_add(1).unwrap(), prev_committee);
+#[derive(Subcommand, Debug)]
+pub enum SCommands {
+    /// Sync all end-of-epoch checkpoints
+    Sync {},
 
-        let mut d = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        d.push("example_config/794.chk");
+    /// Checks a specific transaction using the light client
+    Transaction {
+        /// Transaction hash
+        #[arg(short, long, value_name = "TID")]
+        tid: String,
+    },
 
-        let full_checkpoint = read_full_checkpoint(&d).await.unwrap();
+    /// Checks a specific object using the light client
+    Object {
+        /// Transaction hash
+        #[arg(short, long, value_name = "OID")]
+        oid: String,
+    },
+}
 
-        (committee, full_checkpoint)
-    }
+// The config file for the light client including the root of trust genesis
+// digest
+#[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
+pub struct Config {
+    /// Full node url
+    full_node_url: String,
 
-    #[tokio::test]
-    async fn test_checkpoint_all_good() {
-        let (committee, full_checkpoint) = read_data().await;
+    /// Checkpoint summary directory
+    checkpoint_summary_dir: PathBuf,
 
-        extract_verified_effects_and_events(
-            &full_checkpoint,
-            &committee,
-            TransactionDigest::from_str("9AoR24Tcmss7K3DgBZYiUZNxHFuk8kdAbZEMcFe9mcAi").unwrap(),
-        )
-        .unwrap();
-    }
+    //  Genesis file name
+    genesis_filename: PathBuf,
+}
 
-    #[tokio::test]
-    async fn test_checkpoint_bad_committee() {
-        let (mut committee, full_checkpoint) = read_data().await;
-
-        // Change committee
-        committee.epoch += 10;
-
-        assert!(
-            extract_verified_effects_and_events(
-                &full_checkpoint,
-                &committee,
-                TransactionDigest::from_str("9AoR24Tcmss7K3DgBZYiUZNxHFuk8kdAbZEMcFe9mcAi")
-                    .unwrap(),
-            )
-            .is_err()
-        );
+impl Config {
+    pub fn rest_url(&self) -> &str {
+        &self.full_node_url
     }
 
-    #[tokio::test]
-    async fn test_checkpoint_no_transaction() {
-        let (committee, full_checkpoint) = read_data().await;
-
-        assert!(
-            extract_verified_effects_and_events(
-                &full_checkpoint,
-                &committee,
-                TransactionDigest::from_str("6ciKBJF3gZ2zNNKLqwRMBL4ftZRGL2kHPgKepWP2thbs")
-                    .unwrap(),
-            )
-            .is_err()
-        );
+    pub fn full_node_url(&self) -> &str {
+        &self.full_node_url
     }
 
-    #[tokio::test]
-    async fn test_checkpoint_bad_contents() {
-        let (committee, mut full_checkpoint) = read_data().await;
-
-        // Change contents
-        let random_contents = FullCheckpointContents::random_for_testing();
-        full_checkpoint.checkpoint_contents = random_contents.checkpoint_contents();
-
-        assert!(
-            extract_verified_effects_and_events(
-                &full_checkpoint,
-                &committee,
-                TransactionDigest::from_str("9AoR24Tcmss7K3DgBZYiUZNxHFuk8kdAbZEMcFe9mcAi")
-                    .unwrap(),
-            )
-            .is_err()
-        );
+    pub fn checkpoint_summary_dir(&self) -> &PathBuf {
+        &self.checkpoint_summary_dir
     }
+}
 
-    #[tokio::test]
-    async fn test_checkpoint_bad_events() {
-        let (committee, mut full_checkpoint) = read_data().await;
+// The list of checkpoints at the end of each epoch
+#[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
+pub struct CheckpointsList {
+    // List of end of epoch checkpoints
+    pub checkpoints: Vec<u64>,
+}
 
-        let event = full_checkpoint.transactions[1]
-            .events
-            .as_ref()
-            .unwrap()
-            .data[0]
-            .clone();
+pub fn read_checkpoint_list(config: &Config) -> anyhow::Result<CheckpointsList> {
+    let mut checkpoints_path = config.checkpoint_summary_dir.clone();
+    checkpoints_path.push("checkpoints.yaml");
+    // Read the resulting file and parse the yaml checkpoint list
+    let reader = fs::File::open(&checkpoints_path)?;
+    Ok(serde_yaml::from_reader(reader)?)
+}
 
-        for t in &mut full_checkpoint.transactions {
-            if let Some(events) = &mut t.events {
-                events.data.push(event.clone());
-            }
-        }
+pub fn read_checkpoint(
+    config: &Config,
+    seq: u64,
+) -> anyhow::Result<Envelope<CheckpointSummary, AuthorityQuorumSignInfo<true>>> {
+    read_checkpoint_general(config, seq, None)
+}
 
-        assert!(
-            extract_verified_effects_and_events(
-                &full_checkpoint,
-                &committee,
-                TransactionDigest::from_str("Hj7mZdET3fKqxbSnbdcVbx9N2pqvHtkoKbPy6MEeFsfB")
-                    .unwrap(),
-            )
-            .is_err()
-        );
+pub fn read_checkpoint_general(
+    config: &Config,
+    seq: u64,
+    path: Option<&str>,
+) -> anyhow::Result<Envelope<CheckpointSummary, AuthorityQuorumSignInfo<true>>> {
+    // Read the resulting file and parse the yaml checkpoint list
+    let mut checkpoint_path = config.checkpoint_summary_dir.clone();
+    if let Some(path) = path {
+        checkpoint_path.push(path);
     }
+    checkpoint_path.push(format!("{}.chk", seq));
+    let mut reader = fs::File::open(checkpoint_path.clone())?;
+    let metadata = fs::metadata(&checkpoint_path)?;
+    let mut buffer = vec![0; metadata.len() as usize];
+    reader.read_exact(&mut buffer)?;
+    bcs::from_bytes(&buffer).map_err(|_| anyhow!("Unable to parse checkpoint file"))
 }
diff --git a/crates/iota-light-client/tests/README.md b/crates/iota-light-client/tests/README.md
new file mode 100644
index 00000000000..2717ee5571a
--- /dev/null
+++ b/crates/iota-light-client/tests/README.md
@@ -0,0 +1,6 @@
+To generate checkpoint snapshots, follow these steps:
+
+1. `cargo run --release --bin iota start --force-regenesis --with-faucet`
+2. Clear checkpoints.yaml file - make `checkpoints: []`
+3. Run `cargo run --bin generate_chk_snapshots`
+4. Replace data in tests according to generated checkpoints.
diff --git a/crates/iota-light-client/tests/check_proof.rs b/crates/iota-light-client/tests/check_proof.rs
index 50bf4473249..7af7206ad3f 100644
--- a/crates/iota-light-client/tests/check_proof.rs
+++ b/crates/iota-light-client/tests/check_proof.rs
@@ -64,7 +64,7 @@ async fn read_data(committee_seq: u64, seq: u64) -> (Committee, CheckpointData)
 
 #[tokio::test]
 async fn check_can_read_test_data() {
-    let (_committee, full_checkpoint) = read_data(528, 794).await;
+    let (_committee, full_checkpoint) = read_data(532, 801).await;
     assert!(
         full_checkpoint
             .checkpoint_summary
@@ -75,7 +75,7 @@ async fn check_can_read_test_data() {
 
 #[tokio::test]
 async fn test_new_committee() {
-    let (committee, full_checkpoint) = read_data(528, 794).await;
+    let (committee, full_checkpoint) = read_data(532, 801).await;
 
     let new_committee_data = full_checkpoint
         .checkpoint_summary
@@ -110,7 +110,7 @@ async fn test_new_committee() {
 // Fail if the new committee does not match the target of the proof
 #[tokio::test]
 async fn test_incorrect_new_committee() {
-    let (committee, full_checkpoint) = read_data(528, 794).await;
+    let (committee, full_checkpoint) = read_data(532, 801).await;
 
     let committee_proof = Proof {
         checkpoint_summary: full_checkpoint.checkpoint_summary.clone(),
@@ -124,7 +124,7 @@ async fn test_incorrect_new_committee() {
 // Fail if the certificate is incorrect even if no proof targets are given
 #[tokio::test]
 async fn test_fail_incorrect_cert() {
-    let (_committee, full_checkpoint) = read_data(528, 794).await;
+    let (_committee, full_checkpoint) = read_data(532, 801).await;
 
     let new_committee_data = full_checkpoint
         .checkpoint_summary
@@ -164,7 +164,7 @@ async fn test_fail_incorrect_cert() {
 
 #[tokio::test]
 async fn test_object_target_fail_no_data() {
-    let (committee, full_checkpoint) = read_data(528, 794).await;
+    let (committee, full_checkpoint) = read_data(532, 801).await;
 
     let sample_object: Object = full_checkpoint.transactions[0].output_objects[0].clone();
     let sample_ref = sample_object.compute_object_reference();
@@ -180,7 +180,7 @@ async fn test_object_target_fail_no_data() {
 
 #[tokio::test]
 async fn test_object_target_success() {
-    let (committee, full_checkpoint) = read_data(528, 794).await;
+    let (committee, full_checkpoint) = read_data(532, 801).await;
 
     let sample_object: Object = full_checkpoint.transactions[0].output_objects[0].clone();
     let sample_ref = sample_object.compute_object_reference();
@@ -193,7 +193,7 @@ async fn test_object_target_success() {
 
 #[tokio::test]
 async fn test_object_target_fail_wrong_object() {
-    let (committee, full_checkpoint) = read_data(528, 794).await;
+    let (committee, full_checkpoint) = read_data(532, 801).await;
 
     let sample_object: Object = full_checkpoint.transactions[0].output_objects[0].clone();
     let wrong_object: Object = full_checkpoint.transactions[1].output_objects[1].clone();
@@ -214,7 +214,7 @@ async fn test_object_target_fail_wrong_object() {
 
 #[tokio::test]
 async fn test_event_target_fail_no_data() {
-    let (committee, full_checkpoint) = read_data(528, 794).await;
+    let (committee, full_checkpoint) = read_data(532, 801).await;
 
     let sample_event: Event = full_checkpoint.transactions[1]
         .events
@@ -238,7 +238,7 @@ async fn test_event_target_fail_no_data() {
 
 #[tokio::test]
 async fn test_event_target_success() {
-    let (committee, full_checkpoint) = read_data(528, 794).await;
+    let (committee, full_checkpoint) = read_data(532, 801).await;
 
     let sample_event: Event = full_checkpoint.transactions[1]
         .events
@@ -259,7 +259,7 @@ async fn test_event_target_success() {
 
 #[tokio::test]
 async fn test_event_target_fail_bad_event() {
-    let (committee, full_checkpoint) = read_data(528, 794).await;
+    let (committee, full_checkpoint) = read_data(532, 801).await;
 
     let sample_event: Event = full_checkpoint.transactions[1]
         .events
diff --git a/crates/iota-macros/Cargo.toml b/crates/iota-macros/Cargo.toml
index 8d3cd2b60ed..3f7f960dd06 100644
--- a/crates/iota-macros/Cargo.toml
+++ b/crates/iota-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-macros"
-version = "0.7.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-metric-checker/example/config.yaml b/crates/iota-metric-checker/example/config.yaml
index ced6792ae54..c335bcf5aca 100644
--- a/crates/iota-metric-checker/example/config.yaml
+++ b/crates/iota-metric-checker/example/config.yaml
@@ -3,7 +3,7 @@ queries:
   # Check current epoch
   - query: 'max(current_epoch{network="private-testnet"})'
     type: Instant
-  # Narwhal batch execution latency - p50
+  # Consensus batch execution latency - p50
   - query: 'histogram_quantile(0.50, sum by(le) (rate(batch_execution_latency_bucket{network="private-testnet"}[15m])))'
     type: !Range
       start: "now-8h"
diff --git a/crates/iota-metrics/Cargo.toml b/crates/iota-metrics/Cargo.toml
index c45c1a8ada7..f871d0221e1 100644
--- a/crates/iota-metrics/Cargo.toml
+++ b/crates/iota-metrics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-metrics"
-version = "0.7.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -11,8 +11,11 @@ workspace = true
 
 [dependencies]
 # external dependencies
+anemo.workspace = true
+anemo-tower.workspace = true
 async-trait.workspace = true
 axum.workspace = true
+bytes.workspace = true
 dashmap.workspace = true
 futures.workspace = true
 once_cell.workspace = true
diff --git a/crates/iota-metrics/src/lib.rs b/crates/iota-metrics/src/lib.rs
index 796b77016f2..4d033c3bba1 100644
--- a/crates/iota-metrics/src/lib.rs
+++ b/crates/iota-metrics/src/lib.rs
@@ -35,6 +35,7 @@ use uuid::Uuid;
 mod guards;
 pub mod histogram;
 pub mod metered_channel;
+pub mod metrics_network;
 pub mod monitored_mpsc;
 pub mod thread_stall_monitor;
 pub use guards::*;
diff --git a/crates/iota-metrics/src/metered_channel.rs b/crates/iota-metrics/src/metered_channel.rs
index 39b875a8a62..210580e1b4b 100644
--- a/crates/iota-metrics/src/metered_channel.rs
+++ b/crates/iota-metrics/src/metered_channel.rs
@@ -378,28 +378,6 @@ pub fn channel<T>(size: usize, gauge: &IntGauge) -> (Sender<T>, Receiver<T>) {
     )
 }
 
-/// Deprecated: use `monitored_mpsc::channel` instead.
-#[track_caller]
-pub fn channel_with_total<T>(
-    size: usize,
-    gauge: &IntGauge,
-    total_gauge: &IntCounter,
-) -> (Sender<T>, Receiver<T>) {
-    gauge.set(0);
-    let (sender, receiver) = mpsc::channel(size);
-    (
-        Sender {
-            inner: sender,
-            gauge: gauge.clone(),
-        },
-        Receiver {
-            inner: receiver,
-            gauge: gauge.clone(),
-            total: Some(total_gauge.clone()),
-        },
-    )
-}
-
 /// Defines an asynchronous method `with_permit` for working with a permit to
 /// send a message.
 #[async_trait]
diff --git a/narwhal/network/src/metrics.rs b/crates/iota-metrics/src/metrics_network.rs
similarity index 100%
rename from narwhal/network/src/metrics.rs
rename to crates/iota-metrics/src/metrics_network.rs
diff --git a/crates/iota-metrics/src/tests/metered_channel_tests.rs b/crates/iota-metrics/src/tests/metered_channel_tests.rs
index 99b64706e65..b3e85fd1a01 100644
--- a/crates/iota-metrics/src/tests/metered_channel_tests.rs
+++ b/crates/iota-metrics/src/tests/metered_channel_tests.rs
@@ -7,10 +7,10 @@ use futures::{
     FutureExt,
     task::{Context, Poll, noop_waker},
 };
-use prometheus::{IntCounter, IntGauge};
+use prometheus::IntGauge;
 use tokio::sync::mpsc::error::TrySendError;
 
-use super::{channel, channel_with_total};
+use super::channel;
 
 #[tokio::test]
 async fn test_send() {
@@ -26,22 +26,6 @@ async fn test_send() {
     assert_eq!(counter.get(), 0);
 }
 
-#[tokio::test]
-async fn test_total() {
-    let counter = IntGauge::new("TEST_COUNTER", "test").unwrap();
-    let counter_total = IntCounter::new("TEST_TOTAL", "test_total").unwrap();
-    let (tx, mut rx) = channel_with_total(8, &counter, &counter_total);
-
-    assert_eq!(counter.get(), 0);
-    let item = 42;
-    tx.send(item).await.unwrap();
-    assert_eq!(counter.get(), 1);
-    let received_item = rx.recv().await.unwrap();
-    assert_eq!(received_item, item);
-    assert_eq!(counter.get(), 0);
-    assert_eq!(counter_total.get(), 1);
-}
-
 #[tokio::test]
 async fn test_empty_closed_channel() {
     let counter = IntGauge::new("TEST_COUNTER", "test").unwrap();
diff --git a/crates/iota-network-stack/Cargo.toml b/crates/iota-network-stack/Cargo.toml
index 09c71863011..47f9d97f3fb 100644
--- a/crates/iota-network-stack/Cargo.toml
+++ b/crates/iota-network-stack/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-network-stack"
-version = "0.2.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-network/Cargo.toml b/crates/iota-network/Cargo.toml
index 24098d9e430..22283e9537d 100644
--- a/crates/iota-network/Cargo.toml
+++ b/crates/iota-network/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-network"
-version = "0.0.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-network/build.rs b/crates/iota-network/build.rs
index 088e92e429f..ee7d0a1a6f5 100644
--- a/crates/iota-network/build.rs
+++ b/crates/iota-network/build.rs
@@ -35,28 +35,19 @@ fn main() -> Result<()> {
         )
         .method(
             Method::builder()
-                .name("handle_certificate_v2")
-                .route_name("CertifiedTransactionV2")
-                .input_type("iota_types::transaction::CertifiedTransaction")
-                .output_type("iota_types::messages_grpc::HandleCertificateResponseV2")
-                .codec_path(codec_path)
-                .build(),
-        )
-        .method(
-            Method::builder()
-                .name("handle_certificate_v3")
-                .route_name("CertifiedTransactionV3")
-                .input_type("iota_types::messages_grpc::HandleCertificateRequestV3")
-                .output_type("iota_types::messages_grpc::HandleCertificateResponseV3")
+                .name("handle_certificate_v1")
+                .route_name("CertifiedTransactionV1")
+                .input_type("iota_types::messages_grpc::HandleCertificateRequestV1")
+                .output_type("iota_types::messages_grpc::HandleCertificateResponseV1")
                 .codec_path(codec_path)
                 .build(),
         )
         .method(
             Method::builder()
-                .name("handle_soft_bundle_certificates_v3")
-                .route_name("SoftBundleCertifiedTransactionsV3")
-                .input_type("iota_types::messages_grpc::HandleSoftBundleCertificatesRequestV3")
-                .output_type("iota_types::messages_grpc::HandleSoftBundleCertificatesResponseV3")
+                .name("handle_soft_bundle_certificates_v1")
+                .route_name("SoftBundleCertifiedTransactionsV1")
+                .input_type("iota_types::messages_grpc::HandleSoftBundleCertificatesRequestV1")
+                .output_type("iota_types::messages_grpc::HandleSoftBundleCertificatesResponseV1")
                 .codec_path(codec_path)
                 .build(),
         )
@@ -96,15 +87,6 @@ fn main() -> Result<()> {
                 .codec_path(codec_path)
                 .build(),
         )
-        .method(
-            Method::builder()
-                .name("checkpoint_v2")
-                .route_name("CheckpointV2")
-                .input_type("iota_types::messages_checkpoint::CheckpointRequestV2")
-                .output_type("iota_types::messages_checkpoint::CheckpointResponseV2")
-                .codec_path(codec_path)
-                .build(),
-        )
         .method(
             Method::builder()
                 .name("get_system_state_object")
diff --git a/crates/iota-node/Cargo.toml b/crates/iota-node/Cargo.toml
index cf25f696c41..238f79d2e5f 100644
--- a/crates/iota-node/Cargo.toml
+++ b/crates/iota-node/Cargo.toml
@@ -54,7 +54,6 @@ iota-storage.workspace = true
 iota-tls.workspace = true
 iota-types.workspace = true
 move-vm-profiler.workspace = true
-narwhal-network.workspace = true
 telemetry-subscribers.workspace = true
 typed-store.workspace = true
 
diff --git a/crates/iota-node/src/lib.rs b/crates/iota-node/src/lib.rs
index 005e687902c..1e2282ea92a 100644
--- a/crates/iota-node/src/lib.rs
+++ b/crates/iota-node/src/lib.rs
@@ -46,6 +46,7 @@ use iota_core::{
         SubmitCheckpointToConsensus,
         checkpoint_executor::{CheckpointExecutor, StopReason, metrics::CheckpointExecutorMetrics},
     },
+    connection_monitor::ConnectionMonitor,
     consensus_adapter::{
         CheckConnection, ConnectionMonitorStatus, ConsensusAdapter, ConsensusAdapterMetrics,
         SubmitToConsensus,
@@ -79,7 +80,11 @@ use iota_json_rpc::{
 };
 use iota_json_rpc_api::JsonRpcMetrics;
 use iota_macros::{fail_point, fail_point_async, replay_log};
-use iota_metrics::{RegistryService, server_timing_middleware, spawn_monitored_task};
+use iota_metrics::{
+    RegistryService,
+    metrics_network::{MetricsMakeCallbackHandler, NetworkConnectionMetrics, NetworkMetrics},
+    server_timing_middleware, spawn_monitored_task,
+};
 use iota_network::{
     api::ValidatorServer, discovery, discovery::TrustedPeerChangeEvent, randomness, state_sync,
 };
@@ -109,9 +114,6 @@ use iota_types::{
     supported_protocol_versions::SupportedProtocolVersions,
     transaction::Transaction,
 };
-use narwhal_network::metrics::{
-    MetricsMakeCallbackHandler, NetworkConnectionMetrics, NetworkMetrics,
-};
 use prometheus::Registry;
 #[cfg(msim)]
 pub use simulator::set_jwk_injector;
@@ -579,9 +581,7 @@ impl IotaNode {
             None
         };
 
-        let rest_index = if is_full_node
-            && config.enable_experimental_rest_api
-            && config.enable_index_processing
+        let rest_index = if is_full_node && config.enable_rest_api && config.enable_index_processing
         {
             Some(Arc::new(RestIndexStore::new(
                 config.db_path().join("rest_index"),
@@ -779,13 +779,12 @@ impl IotaNode {
 
         let authority_names_to_peer_ids = ArcSwap::from_pointee(authority_names_to_peer_ids);
 
-        let (_connection_monitor_handle, connection_statuses) =
-            narwhal_network::connectivity::ConnectionMonitor::spawn(
-                p2p_network.downgrade(),
-                network_connection_metrics,
-                HashMap::new(),
-                None,
-            );
+        let (_connection_monitor_handle, connection_statuses) = ConnectionMonitor::spawn(
+            p2p_network.downgrade(),
+            network_connection_metrics,
+            HashMap::new(),
+            None,
+        );
 
         let connection_monitor_status = ConnectionMonitorStatus {
             connection_statuses,
@@ -1682,7 +1681,7 @@ impl IotaNode {
                 consensus_store_pruner.prune(next_epoch).await;
 
                 if self.state.is_validator(&new_epoch_store) {
-                    // Only restart Narwhal if this node is still a validator in the new epoch.
+                    // Only restart consensus if this node is still a validator in the new epoch.
                     Some(
                         Self::start_epoch_specific_validator_components(
                             &self.config,
@@ -1967,7 +1966,7 @@ fn build_kv_store(
     )))
 }
 
-/// Builds and starts the HTTP server for the Iota node, exposing JSON-RPC and
+/// Builds and starts the HTTP server for the IOTA node, exposing JSON-RPC and
 /// REST APIs based on the node's configuration.
 ///
 /// This function performs the following tasks:
@@ -1980,7 +1979,7 @@ fn build_kv_store(
 ///    TransactionBuilderApi, GovernanceApi, TransactionExecutionApi, and
 ///    IndexerApi.
 /// 4. Optionally, if the REST API is enabled, nests the REST API router under
-///    the `/rest` path.
+///    the `/api/v1` path.
 /// 5. Binds the server to the specified JSON-RPC address and starts listening
 ///    for incoming connections.
 pub async fn build_http_server(
@@ -2053,7 +2052,7 @@ pub async fn build_http_server(
 
     router = router.merge(json_rpc_router);
 
-    if config.enable_experimental_rest_api {
+    if config.enable_rest_api {
         let mut rest_service = iota_rest_api::RestService::new(
             Arc::new(RestReadStore::new(state, store)),
             software_version,
diff --git a/crates/iota-node/src/metrics.rs b/crates/iota-node/src/metrics.rs
index e8128bed384..2d83d7bb4e6 100644
--- a/crates/iota-node/src/metrics.rs
+++ b/crates/iota-node/src/metrics.rs
@@ -140,7 +140,7 @@ mod tests {
         tokio::task::yield_now().await;
 
         // now add a few registries to the service along side with metrics
-        let registry_1 = Registry::new_custom(Some("narwhal".to_string()), None).unwrap();
+        let registry_1 = Registry::new_custom(Some("consensus".to_string()), None).unwrap();
         let counter_1 = IntCounter::new("counter_1", "a sample counter 1").unwrap();
         registry_1.register(Box::new(counter_1)).unwrap();
 
@@ -161,9 +161,9 @@ iota_counter_2 0"
         ));
 
         assert!(result.contains(
-            "# HELP narwhal_counter_1 a sample counter 1
-# TYPE narwhal_counter_1 counter
-narwhal_counter_1 0"
+            "# HELP consensus_counter_1 a sample counter 1
+# TYPE consensus_counter_1 counter
+consensus_counter_1 0"
         ));
 
         // Now remove registry 1
@@ -178,9 +178,9 @@ narwhal_counter_1 0"
 
         // Registry 1 metrics should not be present anymore
         assert!(!result.contains(
-            "# HELP narwhal_counter_1 a sample counter 1
-# TYPE narwhal_counter_1 counter
-narwhal_counter_1 0"
+            "# HELP consensus_counter_1 a sample counter 1
+# TYPE consensus_counter_1 counter
+consensus_counter_1 0"
         ));
 
         // Registry 2 metric should have increased by 1
diff --git a/crates/iota-open-rpc-macros/Cargo.toml b/crates/iota-open-rpc-macros/Cargo.toml
index 77c30f3357a..fec90a14d91 100644
--- a/crates/iota-open-rpc-macros/Cargo.toml
+++ b/crates/iota-open-rpc-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-open-rpc-macros"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-open-rpc/spec/openrpc.json b/crates/iota-open-rpc/spec/openrpc.json
index 10d0f8d5f34..009cc089d26 100644
--- a/crates/iota-open-rpc/spec/openrpc.json
+++ b/crates/iota-open-rpc/spec/openrpc.json
@@ -12,7 +12,7 @@
       "name": "Apache-2.0",
       "url": "https://raw.githubusercontent.com/iotaledger/iota/main/LICENSE"
     },
-    "version": "0.4.0"
+    "version": "0.5.0-alpha"
   },
   "methods": [
     {
@@ -1603,7 +1603,7 @@
                   "u64": "1"
                 },
                 "gas_model_version": {
-                  "u64": "8"
+                  "u64": "1"
                 },
                 "gas_rounding_step": {
                   "u64": "1000"
@@ -1767,9 +1767,6 @@
                 "max_accumulated_txn_cost_per_object_in_mysticeti_commit": {
                   "u64": "10"
                 },
-                "max_accumulated_txn_cost_per_object_in_narwhal_commit": {
-                  "u64": "100"
-                },
                 "max_age_of_jwk_in_epochs": {
                   "u64": "1"
                 },
diff --git a/crates/iota-package-resolver/Cargo.toml b/crates/iota-package-resolver/Cargo.toml
index e66462ed79b..4e3c54da62e 100644
--- a/crates/iota-package-resolver/Cargo.toml
+++ b/crates/iota-package-resolver/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-package-resolver"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-proc-macros/Cargo.toml b/crates/iota-proc-macros/Cargo.toml
index 232a8917e22..635d828d407 100644
--- a/crates/iota-proc-macros/Cargo.toml
+++ b/crates/iota-proc-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-proc-macros"
-version = "0.7.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-proc-macros/src/lib.rs b/crates/iota-proc-macros/src/lib.rs
index cf31f4fba63..68e16646ae2 100644
--- a/crates/iota-proc-macros/src/lib.rs
+++ b/crates/iota-proc-macros/src/lib.rs
@@ -73,8 +73,7 @@ pub fn init_static_initializers(_args: TokenStream, item: TokenStream) -> TokenS
                 use ::iota_simulator::anemo_tower::trace::DefaultMakeSpan;
                 use ::iota_simulator::anemo_tower::trace::DefaultOnFailure;
                 use ::iota_simulator::anemo_tower::trace::TraceLayer;
-                use ::iota_simulator::narwhal_network::metrics::MetricsMakeCallbackHandler;
-                use ::iota_simulator::narwhal_network::metrics::NetworkMetrics;
+                use ::iota_metrics::metrics_network::{NetworkMetrics, MetricsMakeCallbackHandler};
 
                 use std::sync::Arc;
                 use ::iota_simulator::fastcrypto::traits::KeyPair;
diff --git a/crates/iota-protocol-config-macros/Cargo.toml b/crates/iota-protocol-config-macros/Cargo.toml
index e5dd7a0feaf..fa7c0700b3f 100644
--- a/crates/iota-protocol-config-macros/Cargo.toml
+++ b/crates/iota-protocol-config-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-protocol-config-macros"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-protocol-config/Cargo.toml b/crates/iota-protocol-config/Cargo.toml
index 37d84dcaf96..388abe0649b 100644
--- a/crates/iota-protocol-config/Cargo.toml
+++ b/crates/iota-protocol-config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-protocol-config"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-protocol-config/src/lib.rs b/crates/iota-protocol-config/src/lib.rs
index 8b2f8cd07d7..3ca28d34e66 100644
--- a/crates/iota-protocol-config/src/lib.rs
+++ b/crates/iota-protocol-config/src/lib.rs
@@ -190,7 +190,7 @@ fn is_false(b: &bool) -> bool {
     !b
 }
 
-/// Ordering mechanism for transactions in one Narwhal consensus output.
+/// Ordering mechanism for transactions in one consensus output.
 #[derive(Default, Copy, Clone, PartialEq, Eq, Serialize, Debug)]
 pub enum ConsensusTransactionOrdering {
     /// No ordering. Transactions are processed in the order they appear in the
@@ -907,13 +907,6 @@ pub struct ProtocolConfig {
     /// The maximum number of transactions included in a consensus block.
     consensus_max_num_transactions_in_block: Option<u64>,
 
-    /// The max accumulated txn execution cost per object in a Narwhal commit.
-    /// Transactions in a checkpoint will be deferred once their touch
-    /// shared objects hit this limit. This config is meant to be used when
-    /// consensus protocol is Narwhal, where each consensus commit
-    /// corresponding to 1 checkpoint (or 2 if randomness is enabled)
-    max_accumulated_txn_cost_per_object_in_narwhal_commit: Option<u64>,
-
     /// The max number of consensus rounds a transaction can be deferred due to
     /// shared object congestion. Transactions will be cancelled after this
     /// many rounds.
@@ -934,11 +927,9 @@ pub struct ProtocolConfig {
     // `None` and `Some(false)`, as committee was already finalized on Testnet.
     bridge_should_try_to_finalize_committee: Option<bool>,
 
-    /// The max accumulated txn execution cost per object in a mysticeti.
+    /// The max accumulated txn execution cost per object in a mysticeti commit.
     /// Transactions in a commit will be deferred once their touch shared
-    /// objects hit this limit. This config plays the same role as
-    /// `max_accumulated_txn_cost_per_object_in_narwhal_commit`
-    /// but for mysticeti commits due to that mysticeti has higher commit rate.
+    /// objects hit this limit.    
     max_accumulated_txn_cost_per_object_in_mysticeti_commit: Option<u64>,
 }
 
@@ -1266,7 +1257,7 @@ impl ProtocolConfig {
             obj_access_cost_verify_per_byte: Some(200),
             obj_data_cost_refundable: Some(100),
             obj_metadata_cost_non_refundable: Some(50),
-            gas_model_version: Some(8),
+            gas_model_version: Some(1),
             storage_rebate_rate: Some(10000),
             // Change reward slashing rate to 100%.
             reward_slashing_rate: Some(10000),
@@ -1574,8 +1565,6 @@ impl ProtocolConfig {
             // that is 512, to account for bursty traffic and system transactions.
             consensus_max_num_transactions_in_block: Some(512),
 
-            max_accumulated_txn_cost_per_object_in_narwhal_commit: Some(100),
-
             max_deferral_rounds_for_congestion_control: Some(10),
 
             min_checkpoint_interval_ms: Some(200),
diff --git a/crates/iota-protocol-config/src/snapshots/iota_protocol_config__test__Mainnet_version_1.snap b/crates/iota-protocol-config/src/snapshots/iota_protocol_config__test__Mainnet_version_1.snap
index 40ac4f18320..0de45bcf16d 100644
--- a/crates/iota-protocol-config/src/snapshots/iota_protocol_config__test__Mainnet_version_1.snap
+++ b/crates/iota-protocol-config/src/snapshots/iota_protocol_config__test__Mainnet_version_1.snap
@@ -84,7 +84,7 @@ obj_access_cost_read_per_byte: 15
 obj_access_cost_mutate_per_byte: 40
 obj_access_cost_delete_per_byte: 40
 obj_access_cost_verify_per_byte: 200
-gas_model_version: 8
+gas_model_version: 1
 obj_data_cost_refundable: 100
 obj_metadata_cost_non_refundable: 50
 storage_rebate_rate: 10000
@@ -261,7 +261,6 @@ random_beacon_dkg_version: 1
 consensus_max_transaction_size_bytes: 262144
 consensus_max_transactions_in_block_bytes: 524288
 consensus_max_num_transactions_in_block: 512
-max_accumulated_txn_cost_per_object_in_narwhal_commit: 100
 max_deferral_rounds_for_congestion_control: 10
 min_checkpoint_interval_ms: 200
 checkpoint_summary_version_specific_data: 1
diff --git a/crates/iota-protocol-config/src/snapshots/iota_protocol_config__test__Testnet_version_1.snap b/crates/iota-protocol-config/src/snapshots/iota_protocol_config__test__Testnet_version_1.snap
index 1a37c689667..d2f9066956f 100644
--- a/crates/iota-protocol-config/src/snapshots/iota_protocol_config__test__Testnet_version_1.snap
+++ b/crates/iota-protocol-config/src/snapshots/iota_protocol_config__test__Testnet_version_1.snap
@@ -84,7 +84,7 @@ obj_access_cost_read_per_byte: 15
 obj_access_cost_mutate_per_byte: 40
 obj_access_cost_delete_per_byte: 40
 obj_access_cost_verify_per_byte: 200
-gas_model_version: 8
+gas_model_version: 1
 obj_data_cost_refundable: 100
 obj_metadata_cost_non_refundable: 50
 storage_rebate_rate: 10000
@@ -261,7 +261,6 @@ random_beacon_dkg_version: 1
 consensus_max_transaction_size_bytes: 262144
 consensus_max_transactions_in_block_bytes: 524288
 consensus_max_num_transactions_in_block: 512
-max_accumulated_txn_cost_per_object_in_narwhal_commit: 100
 max_deferral_rounds_for_congestion_control: 10
 min_checkpoint_interval_ms: 200
 checkpoint_summary_version_specific_data: 1
diff --git a/crates/iota-protocol-config/src/snapshots/iota_protocol_config__test__version_1.snap b/crates/iota-protocol-config/src/snapshots/iota_protocol_config__test__version_1.snap
index 1863f2f5d1d..b7209c62e66 100644
--- a/crates/iota-protocol-config/src/snapshots/iota_protocol_config__test__version_1.snap
+++ b/crates/iota-protocol-config/src/snapshots/iota_protocol_config__test__version_1.snap
@@ -88,7 +88,7 @@ obj_access_cost_read_per_byte: 15
 obj_access_cost_mutate_per_byte: 40
 obj_access_cost_delete_per_byte: 40
 obj_access_cost_verify_per_byte: 200
-gas_model_version: 8
+gas_model_version: 1
 obj_data_cost_refundable: 100
 obj_metadata_cost_non_refundable: 50
 storage_rebate_rate: 10000
@@ -269,7 +269,6 @@ random_beacon_dkg_version: 1
 consensus_max_transaction_size_bytes: 262144
 consensus_max_transactions_in_block_bytes: 524288
 consensus_max_num_transactions_in_block: 512
-max_accumulated_txn_cost_per_object_in_narwhal_commit: 100
 max_deferral_rounds_for_congestion_control: 10
 min_checkpoint_interval_ms: 200
 checkpoint_summary_version_specific_data: 1
diff --git a/crates/iota-replay/Cargo.toml b/crates/iota-replay/Cargo.toml
index 6e105fc4b7f..c04d90ed733 100644
--- a/crates/iota-replay/Cargo.toml
+++ b/crates/iota-replay/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-replay"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-replay/src/displays/gas_status_displays.rs b/crates/iota-replay/src/displays/gas_status_displays.rs
index ad8b8ce9d74..0237a95449c 100644
--- a/crates/iota-replay/src/displays/gas_status_displays.rs
+++ b/crates/iota-replay/src/displays/gas_status_displays.rs
@@ -4,7 +4,7 @@
 
 use std::fmt::{Display, Formatter};
 
-use iota_types::{gas::IotaGasStatus, gas_model::gas_v2::IotaGasStatus as GasStatusV2};
+use iota_types::{gas::IotaGasStatus, gas_model::gas_v1::IotaGasStatus as GasStatusV1};
 use tabled::{
     builder::Builder as TableBuilder,
     settings::{Style as TableStyle, style::HorizontalLine},
@@ -16,7 +16,7 @@ impl<'a> Display for Pretty<'a, IotaGasStatus> {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         let Pretty(iota_gas_status) = self;
         match iota_gas_status {
-            IotaGasStatus::V2(s) => {
+            IotaGasStatus::V1(s) => {
                 display_info(f, s)?;
                 per_object_storage_table(f, s)?;
             }
@@ -25,7 +25,7 @@ impl<'a> Display for Pretty<'a, IotaGasStatus> {
     }
 }
 
-fn per_object_storage_table(f: &mut Formatter, iota_gas_status: &GasStatusV2) -> std::fmt::Result {
+fn per_object_storage_table(f: &mut Formatter, iota_gas_status: &GasStatusV1) -> std::fmt::Result {
     let mut builder = TableBuilder::default();
     builder.push_record(vec!["Object ID", "Bytes", "Old Rebate", "New Rebate"]);
     for (object_id, per_obj_storage) in iota_gas_status.per_object_storage() {
@@ -45,7 +45,7 @@ fn per_object_storage_table(f: &mut Formatter, iota_gas_status: &GasStatusV2) ->
     write!(f, "\n{}\n", table)
 }
 
-fn display_info(f: &mut Formatter<'_>, iota_gas_status: &GasStatusV2) -> std::fmt::Result {
+fn display_info(f: &mut Formatter<'_>, iota_gas_status: &GasStatusV1) -> std::fmt::Result {
     let mut builder = TableBuilder::default();
     builder.push_record(vec!["Gas Info".to_string()]);
     builder.push_record(vec![format!(
diff --git a/crates/iota-replay/src/replay.rs b/crates/iota-replay/src/replay.rs
index d5048ca2589..858f1cc0f8f 100644
--- a/crates/iota-replay/src/replay.rs
+++ b/crates/iota-replay/src/replay.rs
@@ -32,8 +32,8 @@ use iota_types::{
     metrics::LimitsMetrics,
     object::{Data, Object, Owner},
     storage::{
-        BackingPackageStore, ChildObjectResolver, ObjectStore, PackageObject, ParentSync,
-        get_module, get_module_by_id,
+        BackingPackageStore, ChildObjectResolver, ObjectStore, PackageObject, get_module,
+        get_module_by_id,
     },
     transaction::{
         CheckedInputObjects, InputObjectKind, InputObjects, ObjectReadResult, ObjectReadResultKind,
@@ -1970,39 +1970,6 @@ impl ChildObjectResolver for LocalExec {
     }
 }
 
-impl ParentSync for LocalExec {
-    /// The objects here much already exist in the store because we downloaded
-    /// them earlier No download from network
-    fn get_latest_parent_entry_ref_deprecated(
-        &self,
-        object_id: ObjectID,
-    ) -> IotaResult<Option<ObjectRef>> {
-        fn inner(self_: &LocalExec, object_id: ObjectID) -> IotaResult<Option<ObjectRef>> {
-            if let Some(v) = self_
-                .storage
-                .live_objects_store
-                .lock()
-                .expect("Can't lock")
-                .get(&object_id)
-            {
-                return Ok(Some(v.compute_object_reference()));
-            }
-            Ok(None)
-        }
-        let res = inner(self, object_id);
-        self.exec_store_events
-            .lock()
-            .expect("Unable to lock events list")
-            .push(
-                ExecutionStoreEvent::ParentSyncStoreGetLatestParentEntryRef {
-                    object_id,
-                    result: res.clone(),
-                },
-            );
-        res
-    }
-}
-
 impl ResourceResolver for LocalExec {
     type Error = IotaError;
 
diff --git a/crates/iota-replay/src/types.rs b/crates/iota-replay/src/types.rs
index 11ca9df050c..993868020a6 100644
--- a/crates/iota-replay/src/types.rs
+++ b/crates/iota-replay/src/types.rs
@@ -276,10 +276,6 @@ pub enum ExecutionStoreEvent {
         child: ObjectID,
         result: IotaResult<Option<Object>>,
     },
-    ParentSyncStoreGetLatestParentEntryRef {
-        object_id: ObjectID,
-        result: IotaResult<Option<ObjectRef>>,
-    },
     ResourceResolverGetResource {
         address: AccountAddress,
         typ: StructTag,
diff --git a/crates/iota-rest-api/Cargo.toml b/crates/iota-rest-api/Cargo.toml
index 01a2340dc7c..52398fb326c 100644
--- a/crates/iota-rest-api/Cargo.toml
+++ b/crates/iota-rest-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-rest-api"
-version = "0.1.0"
+version.workspace = true
 edition = "2021"
 license = "Apache-2.0"
 publish = false
diff --git a/crates/iota-rest-api/openapi/elements.html b/crates/iota-rest-api/openapi/elements.html
index 7beb2f44231..437d3c8be38 100644
--- a/crates/iota-rest-api/openapi/elements.html
+++ b/crates/iota-rest-api/openapi/elements.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>Iota Node Api</title>
+    <title>IOTA Node API</title>
     <!-- Embed elements Elements via Web Component -->
     <script src="https://unpkg.com/@stoplight/elements/web-components.min.js"></script>
     <link rel="stylesheet" href="https://unpkg.com/@stoplight/elements/styles.min.css">
diff --git a/crates/iota-rest-api/openapi/openapi.json b/crates/iota-rest-api/openapi/openapi.json
index 96c8711cd78..0a59da60bdf 100644
--- a/crates/iota-rest-api/openapi/openapi.json
+++ b/crates/iota-rest-api/openapi/openapi.json
@@ -1,8 +1,8 @@
 {
   "openapi": "3.1.0",
   "info": {
-    "title": "Iota Node Api",
-    "description": "REST Api for interacting with the Iota Blockchain",
+    "title": "IOTA Node API",
+    "description": "REST API for interacting with the IOTA Blockchain",
     "contact": {
       "name": "IOTA Foundation",
       "url": "https://github.com/iotaledger/iota"
@@ -15,7 +15,7 @@
   },
   "servers": [
     {
-      "url": "/v2"
+      "url": "/api/v1"
     }
   ],
   "paths": {
@@ -2602,7 +2602,7 @@
               "error": {
                 "type": "string",
                 "enum": [
-                  "iota_move_verification_timedout"
+                  "iota_move_verification_timeout"
                 ]
               }
             }
@@ -3013,23 +3013,6 @@
           }
         }
       },
-      "ModifiedAtVersion": {
-        "type": "object",
-        "required": [
-          "object_id",
-          "version"
-        ],
-        "properties": {
-          "object_id": {
-            "$ref": "#/components/schemas/ObjectId"
-          },
-          "version": {
-            "description": "Radix-10 encoded 64-bit unsigned integer",
-            "type": "string",
-            "format": "u64"
-          }
-        }
-      },
       "MoveLocation": {
         "type": "object",
         "required": [
@@ -3519,21 +3502,6 @@
           }
         }
       },
-      "ObjectReferenceWithOwner": {
-        "type": "object",
-        "required": [
-          "owner",
-          "reference"
-        ],
-        "properties": {
-          "owner": {
-            "$ref": "#/components/schemas/Owner"
-          },
-          "reference": {
-            "$ref": "#/components/schemas/ObjectReference"
-          }
-        }
-      },
       "Owner": {
         "oneOf": [
           {
@@ -4227,136 +4195,6 @@
       "TransactionEffects": {
         "description": "The response from processing a transaction or a certified transaction",
         "oneOf": [
-          {
-            "description": "The response from processing a transaction or a certified transaction",
-            "type": "object",
-            "required": [
-              "created",
-              "deleted",
-              "dependencies",
-              "epoch",
-              "gas_object",
-              "gas_used",
-              "modified_at_versions",
-              "mutated",
-              "shared_objects",
-              "success",
-              "transaction_digest",
-              "unwrapped",
-              "unwrapped_then_deleted",
-              "version",
-              "wrapped"
-            ],
-            "properties": {
-              "created": {
-                "description": "ObjectReference and owner of new objects created.",
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/ObjectReferenceWithOwner"
-                }
-              },
-              "deleted": {
-                "description": "Object Refs of objects now deleted (the new refs).",
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/ObjectReference"
-                }
-              },
-              "dependencies": {
-                "description": "The set of transaction digests this transaction depends on.",
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/TransactionDigest"
-                }
-              },
-              "epoch": {
-                "description": "The epoch when this transaction was executed.",
-                "type": "string",
-                "format": "u64"
-              },
-              "events_digest": {
-                "description": "The digest of the events emitted during execution, can be None if the transaction does not emit any event.",
-                "allOf": [
-                  {
-                    "$ref": "#/components/schemas/TransactionEventsDigest"
-                  }
-                ]
-              },
-              "gas_object": {
-                "description": "The updated gas object reference. Have a dedicated field for convenient access. It's also included in mutated.",
-                "allOf": [
-                  {
-                    "$ref": "#/components/schemas/ObjectReferenceWithOwner"
-                  }
-                ]
-              },
-              "gas_used": {
-                "$ref": "#/components/schemas/GasCostSummary"
-              },
-              "modified_at_versions": {
-                "description": "The version that every modified (mutated or deleted) object had before it was modified by this transaction.",
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/ModifiedAtVersion"
-                }
-              },
-              "mutated": {
-                "description": "ObjectReference and owner of mutated objects, including gas object.",
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/ObjectReferenceWithOwner"
-                }
-              },
-              "shared_objects": {
-                "description": "The object references of the shared objects used in this transaction. Empty if no shared objects were used.",
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/ObjectReference"
-                }
-              },
-              "status": {
-                "$ref": "#/components/schemas/FailureStatus"
-              },
-              "success": {
-                "type": "boolean"
-              },
-              "transaction_digest": {
-                "description": "The transaction digest",
-                "allOf": [
-                  {
-                    "$ref": "#/components/schemas/TransactionDigest"
-                  }
-                ]
-              },
-              "unwrapped": {
-                "description": "ObjectReference and owner of objects that are unwrapped in this transaction. Unwrapped objects are objects that were wrapped into other objects in the past, and just got extracted out.",
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/ObjectReferenceWithOwner"
-                }
-              },
-              "unwrapped_then_deleted": {
-                "description": "Object refs of objects previously wrapped in other objects but now deleted.",
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/ObjectReference"
-                }
-              },
-              "version": {
-                "type": "string",
-                "enum": [
-                  "1"
-                ]
-              },
-              "wrapped": {
-                "description": "Object refs of objects now wrapped in other objects.",
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/ObjectReference"
-                }
-              }
-            }
-          },
           {
             "description": "The response from processing a transaction or a certified transaction",
             "type": "object",
@@ -4445,7 +4283,7 @@
               "version": {
                 "type": "string",
                 "enum": [
-                  "2"
+                  "1"
                 ]
               }
             }
@@ -4556,10 +4394,17 @@
           {
             "type": "object",
             "required": [
+              "events",
               "kind",
               "objects"
             ],
             "properties": {
+              "events": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/Event"
+                }
+              },
               "kind": {
                 "type": "string",
                 "enum": [
@@ -4652,7 +4497,7 @@
               "kind": {
                 "type": "string",
                 "enum": [
-                  "authenticator_state_update"
+                  "authenticator_state_update_v1"
                 ]
               },
               "new_active_jwks": {
diff --git a/crates/iota-rest-api/src/client/sdk.rs b/crates/iota-rest-api/src/client/sdk.rs
index 939eeb968e5..89ae4df822a 100644
--- a/crates/iota-rest-api/src/client/sdk.rs
+++ b/crates/iota-rest-api/src/client/sdk.rs
@@ -50,7 +50,7 @@ impl Client {
             )));
         }
 
-        url.set_path("/v2/");
+        url.set_path("/api/v1/");
 
         let inner = reqwest::ClientBuilder::new()
             .user_agent(USER_AGENT)
diff --git a/crates/iota-rest-api/src/lib.rs b/crates/iota-rest-api/src/lib.rs
index 016e843b980..aecf9ccccbb 100644
--- a/crates/iota-rest-api/src/lib.rs
+++ b/crates/iota-rest-api/src/lib.rs
@@ -149,13 +149,8 @@ impl RestService {
         api.register_endpoints(ENDPOINTS.to_owned());
 
         Router::new()
-            .nest("/v2/", api.to_router().with_state(self.clone()))
-            .route("/v2", get(|| async { Redirect::permanent("/v2/") }))
-            // Previously the service used to be hosted at `/rest`. In an effort to migrate folks
-            // to the new versioned route, we'll issue redirects from `/rest` -> `/v2`.
-            .route("/rest/*path", axum::routing::method_routing::any(redirect))
-            .route("/rest", get(|| async { Redirect::permanent("/v2/") }))
-            .route("/rest/", get(|| async { Redirect::permanent("/v2/") }))
+            .nest("/api/v1/", api.to_router().with_state(self.clone()))
+            .route("/api/v1", get(|| async { Redirect::permanent("/api/v1/") }))
             .layer(axum::middleware::map_response_with_state(
                 self,
                 response::append_info_headers,
@@ -181,8 +176,8 @@ fn info() -> openapiv3::v3_1::Info {
     use openapiv3::v3_1::{Contact, License};
 
     openapiv3::v3_1::Info {
-        title: "Iota Node Api".to_owned(),
-        description: Some("REST Api for interacting with the Iota Blockchain".to_owned()),
+        title: "IOTA Node API".to_owned(),
+        description: Some("REST API for interacting with the IOTA Blockchain".to_owned()),
         contact: Some(Contact {
             name: Some("IOTA Foundation".to_owned()),
             url: Some("https://github.com/iotaledger/iota".to_owned()),
@@ -198,10 +193,6 @@ fn info() -> openapiv3::v3_1::Info {
     }
 }
 
-async fn redirect(axum::extract::Path(path): axum::extract::Path<String>) -> Redirect {
-    Redirect::permanent(&format!("/v2/{path}"))
-}
-
 mod _schemars {
     use schemars::{
         JsonSchema,
diff --git a/crates/iota-rest-api/src/openapi.rs b/crates/iota-rest-api/src/openapi.rs
index af95b803feb..f8840098856 100644
--- a/crates/iota-rest-api/src/openapi.rs
+++ b/crates/iota-rest-api/src/openapi.rs
@@ -166,7 +166,7 @@ impl<'a, S> Api<'a, S> {
         openapi.tags.sort_by(|a, b| a.name.cmp(&b.name));
 
         openapi.servers = vec![openapiv3::v3_1::Server {
-            url: "/v2".into(),
+            url: "/api/v1".into(),
             ..Default::default()
         }];
 
diff --git a/crates/iota-rosetta/docker/iota-rosetta-local/Dockerfile b/crates/iota-rosetta/docker/iota-rosetta-local/Dockerfile
index 90dd3f22c09..ce58d2510c8 100644
--- a/crates/iota-rosetta/docker/iota-rosetta-local/Dockerfile
+++ b/crates/iota-rosetta/docker/iota-rosetta-local/Dockerfile
@@ -31,7 +31,6 @@ COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
 COPY iota-execution iota-execution
-COPY narwhal narwhal
 COPY external-crates external-crates
 COPY docs docs
 
diff --git a/crates/iota-sdk/src/apis/read.rs b/crates/iota-sdk/src/apis/read.rs
index 14fe1f9f915..a334f457137 100644
--- a/crates/iota-sdk/src/apis/read.rs
+++ b/crates/iota-sdk/src/apis/read.rs
@@ -298,7 +298,7 @@ impl ReadApi {
             .await?)
     }
 
-    /// Return a [IotaObjectResponse] based on the provided [ObjectID] and
+    /// Return an [IotaObjectResponse] based on the provided [ObjectID] and
     /// [IotaObjectDataOptions], or an error upon failure.
     ///
     /// The [IotaObjectResponse] contains two fields:
@@ -456,8 +456,9 @@ impl ReadApi {
         Ok(*self.api.http.get_total_transaction_blocks().await?)
     }
 
-    /// Return a transaction and its effects in a [IotaTransactionBlockResponse]
-    /// based on its [TransactionDigest], or an error upon failure.
+    /// Return a transaction and its effects in an
+    /// [IotaTransactionBlockResponse] based on its [TransactionDigest], or
+    /// an error upon failure.
     pub async fn get_transaction_with_options(
         &self,
         digest: TransactionDigest,
diff --git a/crates/iota-sdk/src/lib.rs b/crates/iota-sdk/src/lib.rs
index 1a2c0268500..27ed64393c5 100644
--- a/crates/iota-sdk/src/lib.rs
+++ b/crates/iota-sdk/src/lib.rs
@@ -26,7 +26,7 @@
 //!
 //! # Usage
 //! The main way to interact with the API is through the [IotaClientBuilder],
-//! which returns a [IotaClient] object from which the user can access the
+//! which returns an [IotaClient] object from which the user can access the
 //! various APIs.
 //!
 //! ## Getting Started
@@ -195,7 +195,7 @@ impl IotaClientBuilder {
         self
     }
 
-    /// Returns a [IotaClient] object connected to the Iota network running at
+    /// Returns an [IotaClient] object connected to the Iota network running at
     /// the URI provided.
     ///
     /// # Examples
@@ -285,7 +285,7 @@ impl IotaClientBuilder {
         })
     }
 
-    /// Returns a [IotaClient] object that is ready to interact with the local
+    /// Returns an [IotaClient] object that is ready to interact with the local
     /// development network (by default it expects the Iota network to be
     /// up and running at `127.0.0.1:9000`).
     ///
@@ -308,7 +308,7 @@ impl IotaClientBuilder {
         self.build(IOTA_LOCAL_NETWORK_URL).await
     }
 
-    /// Returns a [IotaClient] object that is ready to interact with the Iota
+    /// Returns an [IotaClient] object that is ready to interact with the Iota
     /// devnet.
     ///
     /// For connecting to a custom URI, use the `build` function instead..
@@ -330,7 +330,7 @@ impl IotaClientBuilder {
         self.build(IOTA_DEVNET_URL).await
     }
 
-    /// Returns a [IotaClient] object that is ready to interact with the Iota
+    /// Returns an [IotaClient] object that is ready to interact with the Iota
     /// testnet.
     ///
     /// For connecting to a custom URI, use the `build` function instead.
@@ -404,7 +404,7 @@ impl IotaClientBuilder {
 ///
 /// # Usage
 ///
-/// Use [IotaClientBuilder] to build a [IotaClient].
+/// Use [IotaClientBuilder] to build an [IotaClient].
 ///
 /// # Examples
 ///
diff --git a/crates/iota-simulator/Cargo.toml b/crates/iota-simulator/Cargo.toml
index a96c9dcd8b8..f0f8a82d7d7 100644
--- a/crates/iota-simulator/Cargo.toml
+++ b/crates/iota-simulator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-simulator"
-version = "0.7.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -27,7 +27,6 @@ iota-framework.workspace = true
 iota-move-build.workspace = true
 iota-types.workspace = true
 move-package.workspace = true
-narwhal-network.workspace = true
 telemetry-subscribers.workspace = true
 
 [target.'cfg(msim)'.dependencies]
diff --git a/crates/iota-simulator/src/lib.rs b/crates/iota-simulator/src/lib.rs
index f59a4b14c74..7bafac71cb5 100644
--- a/crates/iota-simulator/src/lib.rs
+++ b/crates/iota-simulator/src/lib.rs
@@ -18,7 +18,6 @@ pub use lru;
 pub use move_package;
 #[cfg(msim)]
 pub use msim::*;
-pub use narwhal_network;
 pub use telemetry_subscribers;
 pub use tempfile;
 pub use tower;
diff --git a/crates/iota-single-node-benchmark/Cargo.toml b/crates/iota-single-node-benchmark/Cargo.toml
index 1a997bf0427..94cb47e5cdf 100644
--- a/crates/iota-single-node-benchmark/Cargo.toml
+++ b/crates/iota-single-node-benchmark/Cargo.toml
@@ -37,5 +37,6 @@ telemetry-subscribers.workspace = true
 
 [dev-dependencies]
 iota-macros.workspace = true
+iota-metrics.workspace = true
 iota-protocol-config.workspace = true
 iota-simulator.workspace = true
diff --git a/crates/iota-single-node-benchmark/README.md b/crates/iota-single-node-benchmark/README.md
index 78725d03b19..94500b283a2 100644
--- a/crates/iota-single-node-benchmark/README.md
+++ b/crates/iota-single-node-benchmark/README.md
@@ -1,6 +1,6 @@
 # Iota Single Node Benchmark
 
-This crate contains a binary for performance benchmarking a single Iota node.
+This crate contains a binary for performance benchmarking a single IOTA node.
 Upon running the binary, the node will instantiate a standalone `AuthorityState`, and submit
 executable transactions to it in parallel. We then measure the time it takes for it to finish
 executing all the transactions.
diff --git a/crates/iota-single-node-benchmark/src/mock_storage.rs b/crates/iota-single-node-benchmark/src/mock_storage.rs
index c0ff1624cfc..e5740a903d8 100644
--- a/crates/iota-single-node-benchmark/src/mock_storage.rs
+++ b/crates/iota-single-node-benchmark/src/mock_storage.rs
@@ -9,13 +9,13 @@ use std::{
 
 use iota_storage::package_object_cache::PackageObjectCache;
 use iota_types::{
-    base_types::{EpochId, ObjectID, ObjectRef, SequenceNumber, VersionNumber},
+    base_types::{EpochId, ObjectID, SequenceNumber, VersionNumber},
     error::{IotaError, IotaResult},
     inner_temporary_store::InnerTemporaryStore,
     object::{Object, Owner},
     storage::{
         BackingPackageStore, ChildObjectResolver, GetSharedLocks, ObjectStore, PackageObject,
-        ParentSync, get_module_by_id,
+        get_module_by_id,
     },
     transaction::{InputObjectKind, InputObjects, ObjectReadResult, TransactionKey},
 };
@@ -170,15 +170,6 @@ impl GetModule for InMemoryObjectStore {
     }
 }
 
-impl ParentSync for InMemoryObjectStore {
-    fn get_latest_parent_entry_ref_deprecated(
-        &self,
-        _object_id: ObjectID,
-    ) -> IotaResult<Option<ObjectRef>> {
-        unreachable!()
-    }
-}
-
 impl GetSharedLocks for InMemoryObjectStore {
     fn get_shared_locks(
         &self,
diff --git a/crates/iota-snapshot/Cargo.toml b/crates/iota-snapshot/Cargo.toml
index e52716185b9..26c10319894 100644
--- a/crates/iota-snapshot/Cargo.toml
+++ b/crates/iota-snapshot/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-snapshot"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-source-validation-service/Cargo.toml b/crates/iota-source-validation-service/Cargo.toml
index 861edf99d63..7c0451f1298 100644
--- a/crates/iota-source-validation-service/Cargo.toml
+++ b/crates/iota-source-validation-service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-source-validation-service"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-storage/Cargo.toml b/crates/iota-storage/Cargo.toml
index 61bddb1328c..d0d7a9cb32b 100644
--- a/crates/iota-storage/Cargo.toml
+++ b/crates/iota-storage/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-storage"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-storage/tests/key_value_tests.rs b/crates/iota-storage/tests/key_value_tests.rs
index f71ee6e9cbb..07fa3b01421 100644
--- a/crates/iota-storage/tests/key_value_tests.rs
+++ b/crates/iota-storage/tests/key_value_tests.rs
@@ -427,6 +427,7 @@ async fn test_get_tx_from_fallback() {
 #[cfg(msim)]
 mod simtests {
     use std::{
+        net::SocketAddr,
         sync::Mutex,
         time::{Duration, Instant},
     };
@@ -441,30 +442,32 @@ mod simtests {
     use iota_simulator::configs::constant_latency_ms;
     use iota_storage::http_key_value_store::*;
     use rustls::crypto::{CryptoProvider, ring};
-    use tokio::net::TcpListener;
     use tracing::info;
 
     use super::*;
 
+    async fn svc(
+        State(state): State<Arc<Mutex<HashMap<String, Vec<u8>>>>>,
+        request: Request<Body>,
+    ) -> Response {
+        let path = request.uri().path().to_string();
+        let key = path.trim_start_matches('/');
+        let value = state.lock().unwrap().get(key).cloned();
+        info!("Got request for key: {:?}, value: {:?}", key, value);
+        match value {
+            Some(v) => Response::new(Body::from(v)),
+            None => Response::builder()
+                .status(hyper::StatusCode::NOT_FOUND)
+                .body(Body::empty())
+                .unwrap(),
+        }
+    }
+
     async fn test_server(data: Arc<Mutex<HashMap<String, Vec<u8>>>>) {
         let handle = iota_simulator::runtime::Handle::current();
         let builder = handle.create_node();
         let (startup_sender, mut startup_receiver) = tokio::sync::watch::channel(false);
         let startup_sender = Arc::new(startup_sender);
-        let (sender, _) = tokio::sync::broadcast::channel::<()>(1);
-
-        async fn get_data(
-            data: State<Arc<Mutex<HashMap<String, Vec<u8>>>>>,
-            req: Request,
-        ) -> Result<Vec<u8>, String> {
-            let path = req.uri().path().to_string();
-            let key = path.trim_start_matches('/');
-            let value = data.lock().unwrap().get(key).cloned();
-            info!("Got request for key: {:?}, value: {:?}", key, value);
-            value.ok_or_else(|| "no value".to_owned())
-        }
-
-        let sender_clone = sender.clone();
         let _node = builder
             .ip("10.10.10.10".parse().unwrap())
             .name("server")
@@ -472,21 +475,13 @@ mod simtests {
                 info!("Server started");
                 let data = data.clone();
                 let startup_sender = startup_sender.clone();
-                let mut receiver = sender_clone.subscribe();
                 async move {
-                    let app = axum::Router::new()
-                        .route("/", get(get_data))
-                        .with_state(data);
-
-                    let addr = TcpListener::bind(("10.10.10.10", 8080)).await.unwrap();
-
-                    tokio::spawn(async move {
-                        axum::serve(addr, app)
-                            .with_graceful_shutdown(async move {
-                                receiver.recv().await.ok();
-                            })
-                            .await
-                            .unwrap()
+                    let router = get(svc).with_state(data);
+                    let addr = SocketAddr::from(([10, 10, 10, 10], 8080));
+                    let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
+
+                    tokio::spawn(async {
+                        axum::serve(listener, router).await.unwrap();
                     });
 
                     startup_sender.send(true).ok();
@@ -494,7 +489,6 @@ mod simtests {
             })
             .build();
         startup_receiver.changed().await.unwrap();
-        sender.send(()).ok();
     }
 
     #[sim_test(config = "constant_latency_ms(250)")]
diff --git a/crates/iota-surfer/Cargo.toml b/crates/iota-surfer/Cargo.toml
index e0012406013..c43292d8478 100644
--- a/crates/iota-surfer/Cargo.toml
+++ b/crates/iota-surfer/Cargo.toml
@@ -35,5 +35,6 @@ prometheus.workspace = true
 
 # internal dependencies
 iota-macros.workspace = true
+iota-metrics.workspace = true
 iota-simulator.workspace = true
 move-package.workspace = true
diff --git a/crates/iota-swarm-config/Cargo.toml b/crates/iota-swarm-config/Cargo.toml
index 184c38b6bd2..3f36999d2f6 100644
--- a/crates/iota-swarm-config/Cargo.toml
+++ b/crates/iota-swarm-config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-swarm-config"
-version = "0.0.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-swarm-config/src/genesis_config.rs b/crates/iota-swarm-config/src/genesis_config.rs
index 7cd808b1328..35620d1911d 100644
--- a/crates/iota-swarm-config/src/genesis_config.rs
+++ b/crates/iota-swarm-config/src/genesis_config.rs
@@ -51,8 +51,6 @@ pub struct ValidatorGenesisConfig {
     pub p2p_listen_address: Option<SocketAddr>,
     #[serde(default = "default_socket_address")]
     pub metrics_address: SocketAddr,
-    #[serde(default = "default_multiaddr_address")]
-    pub narwhal_metrics_address: Multiaddr,
     pub gas_price: u64,
     pub commission_rate: u64,
     pub primary_address: Multiaddr,
@@ -164,31 +162,23 @@ impl ValidatorGenesisConfigBuilder {
         let (protocol_key_pair, network_key_pair): (NetworkKeyPair, NetworkKeyPair) =
             (get_key_pair_from_rng(rng).1, get_key_pair_from_rng(rng).1);
 
-        let (
-            network_address,
-            p2p_address,
-            metrics_address,
-            narwhal_metrics_address,
-            primary_address,
-        ) = if let Some(offset) = self.port_offset {
-            (
-                local_ip_utils::new_deterministic_tcp_address_for_testing(&ip, offset),
-                local_ip_utils::new_deterministic_udp_address_for_testing(&ip, offset + 1),
-                local_ip_utils::new_deterministic_tcp_address_for_testing(&ip, offset + 2)
-                    .with_zero_ip(),
-                local_ip_utils::new_deterministic_tcp_address_for_testing(&ip, offset + 3)
-                    .with_zero_ip(),
-                local_ip_utils::new_deterministic_udp_address_for_testing(&ip, offset + 4),
-            )
-        } else {
-            (
-                local_ip_utils::new_tcp_address_for_testing(&ip),
-                local_ip_utils::new_udp_address_for_testing(&ip),
-                local_ip_utils::new_tcp_address_for_testing(&localhost),
-                local_ip_utils::new_tcp_address_for_testing(&localhost),
-                local_ip_utils::new_udp_address_for_testing(&ip),
-            )
-        };
+        let (network_address, p2p_address, metrics_address, primary_address) =
+            if let Some(offset) = self.port_offset {
+                (
+                    local_ip_utils::new_deterministic_tcp_address_for_testing(&ip, offset),
+                    local_ip_utils::new_deterministic_udp_address_for_testing(&ip, offset + 1),
+                    local_ip_utils::new_deterministic_tcp_address_for_testing(&ip, offset + 2)
+                        .with_zero_ip(),
+                    local_ip_utils::new_deterministic_udp_address_for_testing(&ip, offset + 3),
+                )
+            } else {
+                (
+                    local_ip_utils::new_tcp_address_for_testing(&ip),
+                    local_ip_utils::new_udp_address_for_testing(&ip),
+                    local_ip_utils::new_tcp_address_for_testing(&localhost),
+                    local_ip_utils::new_udp_address_for_testing(&ip),
+                )
+            };
 
         let p2p_listen_address = self
             .p2p_listen_ip_address
@@ -203,7 +193,6 @@ impl ValidatorGenesisConfigBuilder {
             p2p_address,
             p2p_listen_address,
             metrics_address: metrics_address.to_socket_addr().unwrap(),
-            narwhal_metrics_address,
             gas_price,
             commission_rate: DEFAULT_COMMISSION_RATE,
             primary_address,
@@ -265,10 +254,6 @@ fn default_socket_address() -> SocketAddr {
     local_ip_utils::new_local_tcp_socket_for_testing()
 }
 
-fn default_multiaddr_address() -> Multiaddr {
-    local_ip_utils::new_local_tcp_address_for_testing()
-}
-
 fn default_stake() -> u64 {
     iota_types::governance::VALIDATOR_LOW_STAKE_THRESHOLD_NANOS
 }
diff --git a/crates/iota-swarm-config/src/node_config_builder.rs b/crates/iota-swarm-config/src/node_config_builder.rs
index c95486df704..1e2c422b1eb 100644
--- a/crates/iota-swarm-config/src/node_config_builder.rs
+++ b/crates/iota-swarm-config/src/node_config_builder.rs
@@ -207,7 +207,7 @@ impl ValidatorConfigBuilder {
             indexer_max_subscriptions: Default::default(),
             transaction_kv_store_read_config: Default::default(),
             transaction_kv_store_write_config: None,
-            enable_experimental_rest_api: true,
+            enable_rest_api: true,
             jwk_fetch_interval_seconds: self
                 .jwk_fetch_interval
                 .map(|i| i.as_secs())
@@ -497,7 +497,7 @@ impl FullnodeConfigBuilder {
             indexer_max_subscriptions: Default::default(),
             transaction_kv_store_read_config: Default::default(),
             transaction_kv_store_write_config: Default::default(),
-            enable_experimental_rest_api: true,
+            enable_rest_api: true,
             // note: not used by fullnodes.
             jwk_fetch_interval_seconds: 3600,
             zklogin_oauth_providers: default_zklogin_oauth_providers(),
diff --git a/crates/iota-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap b/crates/iota-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap
index bbf1ad8c93f..4725bfb9ffa 100644
--- a/crates/iota-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap
+++ b/crates/iota-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap
@@ -14,7 +14,7 @@ validator_configs:
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
-    enable-experimental-rest-api: true
+    enable-rest-api: true
     metrics-address: "0.0.0.0:1"
     admin-interface-port: 8888
     consensus-config:
@@ -134,7 +134,7 @@ validator_configs:
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
-    enable-experimental-rest-api: true
+    enable-rest-api: true
     metrics-address: "0.0.0.0:1"
     admin-interface-port: 8888
     consensus-config:
@@ -254,7 +254,7 @@ validator_configs:
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
-    enable-experimental-rest-api: true
+    enable-rest-api: true
     metrics-address: "0.0.0.0:1"
     admin-interface-port: 8888
     consensus-config:
@@ -374,7 +374,7 @@ validator_configs:
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
-    enable-experimental-rest-api: true
+    enable-rest-api: true
     metrics-address: "0.0.0.0:1"
     admin-interface-port: 8888
     consensus-config:
@@ -494,7 +494,7 @@ validator_configs:
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
-    enable-experimental-rest-api: true
+    enable-rest-api: true
     metrics-address: "0.0.0.0:1"
     admin-interface-port: 8888
     consensus-config:
@@ -614,7 +614,7 @@ validator_configs:
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
-    enable-experimental-rest-api: true
+    enable-rest-api: true
     metrics-address: "0.0.0.0:1"
     admin-interface-port: 8888
     consensus-config:
@@ -734,7 +734,7 @@ validator_configs:
     db-path: /tmp/foo/
     network-address: ""
     json-rpc-address: "0.0.0.0:1"
-    enable-experimental-rest-api: true
+    enable-rest-api: true
     metrics-address: "0.0.0.0:1"
     admin-interface-port: 8888
     consensus-config:
diff --git a/crates/iota-swarm/Cargo.toml b/crates/iota-swarm/Cargo.toml
index e69ed6612ad..783c57c891a 100644
--- a/crates/iota-swarm/Cargo.toml
+++ b/crates/iota-swarm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-swarm"
-version = "0.0.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-test-transaction-builder/Cargo.toml b/crates/iota-test-transaction-builder/Cargo.toml
index b3cf1f4d923..cfcbe035366 100644
--- a/crates/iota-test-transaction-builder/Cargo.toml
+++ b/crates/iota-test-transaction-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-test-transaction-builder"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-tls/Cargo.toml b/crates/iota-tls/Cargo.toml
index 25a602741b1..3a1002c1946 100644
--- a/crates/iota-tls/Cargo.toml
+++ b/crates/iota-tls/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-tls"
-version = "0.0.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-tool/README.md b/crates/iota-tool/README.md
index 3705939719d..7076016c490 100644
--- a/crates/iota-tool/README.md
+++ b/crates/iota-tool/README.md
@@ -30,7 +30,6 @@ cargo run --bin iota-tool -- anemo ping --server-name "$SERVER_NAME" "$ADDRESS"
 
 `iota-tool` has been preconfigured to support RPC calls using [RON (Rusty Object Notation)](https://crates.io/crates/ron) for the following servivces:
 
-- Narwhal: `PrimaryToPrimary` and `WorkerToWorker`
 - Iota: `Discovery` and `StateSync`
 
 Example command to send an RPC:
diff --git a/crates/iota-tool/src/commands.rs b/crates/iota-tool/src/commands.rs
index ab139db7e78..7c4a03eabcb 100644
--- a/crates/iota-tool/src/commands.rs
+++ b/crates/iota-tool/src/commands.rs
@@ -639,6 +639,7 @@ impl ToolCommand {
                         .handle_checkpoint(CheckpointRequest {
                             sequence_number,
                             request_content: true,
+                            certified: true,
                         })
                         .await
                         .unwrap();
diff --git a/crates/iota-tool/src/db_tool/db_dump.rs b/crates/iota-tool/src/db_tool/db_dump.rs
index 5fc0af5bf66..c1ddfd489c8 100644
--- a/crates/iota-tool/src/db_tool/db_dump.rs
+++ b/crates/iota-tool/src/db_tool/db_dump.rs
@@ -43,7 +43,6 @@ pub enum StoreName {
     Validator,
     Index,
     Epoch,
-    // TODO: Add the new checkpoint v2 tables.
 }
 impl std::fmt::Display for StoreName {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
diff --git a/crates/iota-transaction-builder/Cargo.toml b/crates/iota-transaction-builder/Cargo.toml
index 7023993b4c5..b7b2ea053a8 100644
--- a/crates/iota-transaction-builder/Cargo.toml
+++ b/crates/iota-transaction-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-transaction-builder"
-version = "0.0.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-transaction-checks/Cargo.toml b/crates/iota-transaction-checks/Cargo.toml
index cb4829109e4..95b648a590b 100644
--- a/crates/iota-transaction-checks/Cargo.toml
+++ b/crates/iota-transaction-checks/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-transaction-checks"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-transactional-test-runner/Cargo.toml b/crates/iota-transactional-test-runner/Cargo.toml
index 5909b1d6e46..a4ca6024125 100644
--- a/crates/iota-transactional-test-runner/Cargo.toml
+++ b/crates/iota-transactional-test-runner/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-transactional-test-runner"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-transactional-test-runner/src/simulator_persisted_store.rs b/crates/iota-transactional-test-runner/src/simulator_persisted_store.rs
index 073afb43ed9..d5282dd11bc 100644
--- a/crates/iota-transactional-test-runner/src/simulator_persisted_store.rs
+++ b/crates/iota-transactional-test-runner/src/simulator_persisted_store.rs
@@ -20,8 +20,8 @@ use iota_types::{
     },
     object::{Object, Owner},
     storage::{
-        BackingPackageStore, ChildObjectResolver, ObjectStore, PackageObject, ParentSync,
-        ReadStore, RestStateReader, load_package_object_from_object_store,
+        BackingPackageStore, ChildObjectResolver, ObjectStore, PackageObject, ReadStore,
+        RestStateReader, load_package_object_from_object_store,
     },
     transaction::VerifiedTransaction,
 };
@@ -517,15 +517,6 @@ impl ObjectStore for PersistedStore {
     }
 }
 
-impl ParentSync for PersistedStore {
-    fn get_latest_parent_entry_ref_deprecated(
-        &self,
-        _object_id: ObjectID,
-    ) -> iota_types::error::IotaResult<Option<iota_types::base_types::ObjectRef>> {
-        panic!("Never called in newer protocol versions")
-    }
-}
-
 impl ObjectStore for PersistedStoreInnerReadOnlyWrapper {
     fn get_object(
         &self,
diff --git a/crates/iota-types/Cargo.toml b/crates/iota-types/Cargo.toml
index 6527f245153..d90f6b26953 100644
--- a/crates/iota-types/Cargo.toml
+++ b/crates/iota-types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-types"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -81,6 +81,7 @@ shared-crypto.workspace = true
 typed-store-error.workspace = true
 
 [dev-dependencies]
+# external dependencies
 async-trait.workspace = true
 bincode.workspace = true
 coset.workspace = true
@@ -94,6 +95,9 @@ serde_yaml.workspace = true
 tokio.workspace = true
 url.workspace = true
 
+# internal dependencies
+iota-util-mem.workspace = true
+
 [[bench]]
 name = "accumulator_bench"
 harness = false
@@ -107,3 +111,6 @@ gas-profiler = [
   "move-vm-types/gas-profiler",
 ]
 fuzzing = ["move-core-types/fuzzing", "dep:proptest-derive", "dep:proptest"]
+
+[package.metadata.cargo-udeps.ignore]
+development = ["iota-util-mem"]
diff --git a/crates/iota-types/src/authenticator_state.rs b/crates/iota-types/src/authenticator_state.rs
index 48ea0861ade..c350b756723 100644
--- a/crates/iota-types/src/authenticator_state.rs
+++ b/crates/iota-types/src/authenticator_state.rs
@@ -2,7 +2,7 @@
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use fastcrypto_zkp::bn254::zk_login::{JWK, JwkId};
+pub(crate) use fastcrypto_zkp::bn254::zk_login::{JWK, JwkId};
 use move_core_types::{account_address::AccountAddress, ident_str, identifier::IdentStr};
 use serde::{Deserialize, Serialize};
 
diff --git a/crates/iota-types/src/base_types.rs b/crates/iota-types/src/base_types.rs
index edd5270892a..b28eafbdcd0 100644
--- a/crates/iota-types/src/base_types.rs
+++ b/crates/iota-types/src/base_types.rs
@@ -114,6 +114,9 @@ impl fmt::Display for SequenceNumber {
 
 pub type VersionNumber = SequenceNumber;
 
+/// The round number.
+pub type CommitRound = u64;
+
 #[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Hash, Default, Debug, Serialize, Deserialize)]
 pub struct UserData(pub Option<[u8; 32]>);
 
@@ -612,6 +615,10 @@ pub struct IotaAddress(
 impl IotaAddress {
     pub const ZERO: Self = Self([0u8; IOTA_ADDRESS_LENGTH]);
 
+    pub fn new(bytes: [u8; IOTA_ADDRESS_LENGTH]) -> Self {
+        Self(bytes)
+    }
+
     /// Convert the address to a byte buffer.
     pub fn to_vec(&self) -> Vec<u8> {
         self.0.to_vec()
diff --git a/crates/iota-types/src/digests.rs b/crates/iota-types/src/digests.rs
index f776e4c4345..761d86fba66 100644
--- a/crates/iota-types/src/digests.rs
+++ b/crates/iota-types/src/digests.rs
@@ -157,7 +157,7 @@ impl fmt::UpperHex for Digest {
     Deserialize,
     JsonSchema,
 )]
-pub struct ChainIdentifier(CheckpointDigest);
+pub struct ChainIdentifier(pub(crate) CheckpointDigest);
 
 pub static MAINNET_CHAIN_IDENTIFIER: OnceCell<ChainIdentifier> = OnceCell::new();
 pub static TESTNET_CHAIN_IDENTIFIER: OnceCell<ChainIdentifier> = OnceCell::new();
@@ -205,6 +205,14 @@ impl ChainIdentifier {
     pub fn as_bytes(&self) -> &[u8; 32] {
         self.0.inner()
     }
+
+    pub fn into_bytes(self) -> [u8; 32] {
+        self.0.into_inner()
+    }
+
+    pub fn digest(&self) -> CheckpointDigest {
+        self.0
+    }
 }
 
 pub fn get_mainnet_chain_identifier() -> ChainIdentifier {
diff --git a/crates/iota-types/src/effects/effects_v1.rs b/crates/iota-types/src/effects/effects_v1.rs
index ea26901b1a8..3f3458d42b0 100644
--- a/crates/iota-types/src/effects/effects_v1.rs
+++ b/crates/iota-types/src/effects/effects_v1.rs
@@ -2,130 +2,66 @@
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use std::{
-    collections::{BTreeMap, HashSet},
-    fmt::{Display, Formatter, Write},
-};
+#[cfg(debug_assertions)]
+use std::collections::HashSet;
+use std::collections::{BTreeMap, BTreeSet};
 
 use serde::{Deserialize, Serialize};
 
-use super::{IDOperation, ObjectChange};
+use super::{
+    EffectsObjectChange, IDOperation, ObjectChange,
+    object_change::{ObjectIn, ObjectOut},
+};
+#[cfg(debug_assertions)]
+use crate::is_system_package;
 use crate::{
     base_types::{
-        EpochId, IotaAddress, ObjectID, ObjectRef, SequenceNumber, TransactionDigest,
-        random_object_ref,
+        EpochId, IotaAddress, ObjectDigest, ObjectID, ObjectRef, SequenceNumber, TransactionDigest,
+        VersionDigest,
     },
-    digests::{ObjectDigest, TransactionEventsDigest},
-    effects::{InputSharedObject, TransactionEffectsAPI, UnchangedSharedKind},
+    digests::{EffectsAuxDataDigest, TransactionEventsDigest},
+    effects::{InputSharedObject, TransactionEffectsAPI},
+    execution::SharedInput,
     execution_status::ExecutionStatus,
     gas::GasCostSummary,
-    object::Owner,
+    object::{OBJECT_START_VERSION, Owner},
 };
 
 /// The response from processing a transaction or a certified transaction
 #[derive(Eq, PartialEq, Clone, Debug, Serialize, Deserialize)]
 pub struct TransactionEffectsV1 {
     /// The status of the execution
-    status: ExecutionStatus,
+    pub(crate) status: ExecutionStatus,
     /// The epoch when this transaction was executed.
-    executed_epoch: EpochId,
-    gas_used: GasCostSummary,
-    /// The version that every modified (mutated or deleted) object had before
-    /// it was modified by this transaction.
-    modified_at_versions: Vec<(ObjectID, SequenceNumber)>,
-    /// The object references of the shared objects used in this transaction.
-    /// Empty if no shared objects were used.
-    shared_objects: Vec<ObjectRef>,
+    pub(crate) executed_epoch: EpochId,
+    pub(crate) gas_used: GasCostSummary,
     /// The transaction digest
-    transaction_digest: TransactionDigest,
-
-    // TODO: All the SequenceNumbers in the ObjectRefs below equal the same value (the lamport
-    // timestamp of the transaction).  Consider factoring this out into one place in the effects.
-    /// ObjectRef and owner of new objects created.
-    created: Vec<(ObjectRef, Owner)>,
-    /// ObjectRef and owner of mutated objects, including gas object.
-    mutated: Vec<(ObjectRef, Owner)>,
-    /// ObjectRef and owner of objects that are unwrapped in this transaction.
-    /// Unwrapped objects are objects that were wrapped into other objects in
-    /// the past, and just got extracted out.
-    unwrapped: Vec<(ObjectRef, Owner)>,
-    /// Object Refs of objects now deleted (the new refs).
-    deleted: Vec<ObjectRef>,
-    /// Object refs of objects previously wrapped in other objects but now
-    /// deleted.
-    unwrapped_then_deleted: Vec<ObjectRef>,
-    /// Object refs of objects now wrapped in other objects.
-    wrapped: Vec<ObjectRef>,
-    /// The updated gas object reference. Have a dedicated field for convenient
-    /// access. It's also included in mutated.
-    gas_object: (ObjectRef, Owner),
+    pub(crate) transaction_digest: TransactionDigest,
+    /// The updated gas object reference, as an index into the `changed_objects`
+    /// vector. Having a dedicated field for convenient access.
+    /// System transaction that don't require gas will leave this as None.
+    pub(crate) gas_object_index: Option<u32>,
     /// The digest of the events emitted during execution,
     /// can be None if the transaction does not emit any event.
-    events_digest: Option<TransactionEventsDigest>,
+    pub(crate) events_digest: Option<TransactionEventsDigest>,
     /// The set of transaction digests this transaction depends on.
-    dependencies: Vec<TransactionDigest>,
-}
-
-impl TransactionEffectsV1 {
-    pub fn new(
-        status: ExecutionStatus,
-        executed_epoch: EpochId,
-        gas_used: GasCostSummary,
-        modified_at_versions: Vec<(ObjectID, SequenceNumber)>,
-        shared_objects: Vec<ObjectRef>,
-        transaction_digest: TransactionDigest,
-        created: Vec<(ObjectRef, Owner)>,
-        mutated: Vec<(ObjectRef, Owner)>,
-        unwrapped: Vec<(ObjectRef, Owner)>,
-        deleted: Vec<ObjectRef>,
-        unwrapped_then_deleted: Vec<ObjectRef>,
-        wrapped: Vec<ObjectRef>,
-        gas_object: (ObjectRef, Owner),
-        events_digest: Option<TransactionEventsDigest>,
-        dependencies: Vec<TransactionDigest>,
-    ) -> Self {
-        Self {
-            status,
-            executed_epoch,
-            gas_used,
-            modified_at_versions,
-            shared_objects,
-            transaction_digest,
-            created,
-            mutated,
-            unwrapped,
-            deleted,
-            unwrapped_then_deleted,
-            wrapped,
-            gas_object,
-            events_digest,
-            dependencies,
-        }
-    }
-
-    pub fn modified_at_versions(&self) -> &[(ObjectID, SequenceNumber)] {
-        &self.modified_at_versions
-    }
-
-    pub fn mutated(&self) -> &[(ObjectRef, Owner)] {
-        &self.mutated
-    }
-
-    pub fn created(&self) -> &[(ObjectRef, Owner)] {
-        &self.created
-    }
-
-    pub fn unwrapped(&self) -> &[(ObjectRef, Owner)] {
-        &self.unwrapped
-    }
-
-    pub fn deleted(&self) -> &[ObjectRef] {
-        &self.deleted
-    }
-
-    pub fn wrapped(&self) -> &[ObjectRef] {
-        &self.wrapped
-    }
+    pub(crate) dependencies: Vec<TransactionDigest>,
+
+    /// The version number of all the written Move objects by this transaction.
+    pub(crate) lamport_version: SequenceNumber,
+    /// Objects whose state are changed in the object store.
+    pub(crate) changed_objects: Vec<(ObjectID, EffectsObjectChange)>,
+    /// Shared objects that are not mutated in this transaction. Unlike owned
+    /// objects, read-only shared objects' version are not committed in the
+    /// transaction, and in order for a node to catch up and execute it
+    /// without consensus sequencing, the version needs to be committed in
+    /// the effects.
+    pub(crate) unchanged_shared_objects: Vec<(ObjectID, UnchangedSharedKind)>,
+    /// Auxiliary data that are not protocol-critical, generated as part of the
+    /// effects but are stored separately. Storing it separately allows us
+    /// to avoid bloating the effects with data that are not critical.
+    /// It also provides more flexibility on the format and type of the data.
+    pub(crate) aux_data_digest: Option<EffectsAuxDataDigest>,
 }
 
 impl TransactionEffectsAPI for TransactionEffectsV1 {
@@ -142,127 +78,238 @@ impl TransactionEffectsAPI for TransactionEffectsV1 {
     }
 
     fn modified_at_versions(&self) -> Vec<(ObjectID, SequenceNumber)> {
-        self.modified_at_versions.clone()
+        self.changed_objects
+            .iter()
+            .filter_map(|(id, change)| {
+                if let ObjectIn::Exist(((version, _digest), _owner)) = &change.input_state {
+                    Some((*id, *version))
+                } else {
+                    None
+                }
+            })
+            .collect()
     }
 
     fn lamport_version(&self) -> SequenceNumber {
-        SequenceNumber::lamport_increment(self.modified_at_versions.iter().map(|(_, v)| *v))
+        self.lamport_version
     }
 
     fn old_object_metadata(&self) -> Vec<(ObjectRef, Owner)> {
-        unimplemented!("Only supposed by v2 and above");
+        self.changed_objects
+            .iter()
+            .filter_map(|(id, change)| {
+                if let ObjectIn::Exist(((version, digest), owner)) = &change.input_state {
+                    Some(((*id, *version, *digest), *owner))
+                } else {
+                    None
+                }
+            })
+            .collect()
     }
 
     fn input_shared_objects(&self) -> Vec<InputSharedObject> {
-        let modified: HashSet<_> = self.modified_at_versions.iter().map(|(r, _)| r).collect();
-        self.shared_objects
+        self.changed_objects
             .iter()
-            .map(|r| {
-                if modified.contains(&r.0) {
-                    InputSharedObject::Mutate(*r)
-                } else {
-                    InputSharedObject::ReadOnly(*r)
+            .filter_map(|(id, change)| match &change.input_state {
+                ObjectIn::Exist(((version, digest), Owner::Shared { .. })) => {
+                    Some(InputSharedObject::Mutate((*id, *version, *digest)))
                 }
+                _ => None,
             })
+            .chain(
+                self.unchanged_shared_objects
+                    .iter()
+                    .filter_map(|(id, change_kind)| match change_kind {
+                        UnchangedSharedKind::ReadOnlyRoot((version, digest)) => {
+                            Some(InputSharedObject::ReadOnly((*id, *version, *digest)))
+                        }
+                        UnchangedSharedKind::MutateDeleted(seqno) => {
+                            Some(InputSharedObject::MutateDeleted(*id, *seqno))
+                        }
+                        UnchangedSharedKind::ReadDeleted(seqno) => {
+                            Some(InputSharedObject::ReadDeleted(*id, *seqno))
+                        }
+                        UnchangedSharedKind::Cancelled(seqno) => {
+                            Some(InputSharedObject::Cancelled(*id, *seqno))
+                        }
+                        // We can not expose the per epoch config object as input shared object,
+                        // since it does not require sequencing, and hence shall not be considered
+                        // as a normal input shared object.
+                        UnchangedSharedKind::PerEpochConfig => None,
+                    }),
+            )
             .collect()
     }
 
     fn created(&self) -> Vec<(ObjectRef, Owner)> {
-        self.created.clone()
+        self.changed_objects
+            .iter()
+            .filter_map(|(id, change)| {
+                match (
+                    &change.input_state,
+                    &change.output_state,
+                    &change.id_operation,
+                ) {
+                    (
+                        ObjectIn::NotExist,
+                        ObjectOut::ObjectWrite((digest, owner)),
+                        IDOperation::Created,
+                    ) => Some(((*id, self.lamport_version, *digest), *owner)),
+                    (
+                        ObjectIn::NotExist,
+                        ObjectOut::PackageWrite((version, digest)),
+                        IDOperation::Created,
+                    ) => Some(((*id, *version, *digest), Owner::Immutable)),
+                    _ => None,
+                }
+            })
+            .collect()
     }
 
     fn mutated(&self) -> Vec<(ObjectRef, Owner)> {
-        self.mutated.clone()
+        self.changed_objects
+            .iter()
+            .filter_map(
+                |(id, change)| match (&change.input_state, &change.output_state) {
+                    (ObjectIn::Exist(_), ObjectOut::ObjectWrite((digest, owner))) => {
+                        Some(((*id, self.lamport_version, *digest), *owner))
+                    }
+                    (ObjectIn::Exist(_), ObjectOut::PackageWrite((version, digest))) => {
+                        Some(((*id, *version, *digest), Owner::Immutable))
+                    }
+                    _ => None,
+                },
+            )
+            .collect()
     }
 
     fn unwrapped(&self) -> Vec<(ObjectRef, Owner)> {
-        self.unwrapped.clone()
+        self.changed_objects
+            .iter()
+            .filter_map(|(id, change)| {
+                match (
+                    &change.input_state,
+                    &change.output_state,
+                    &change.id_operation,
+                ) {
+                    (
+                        ObjectIn::NotExist,
+                        ObjectOut::ObjectWrite((digest, owner)),
+                        IDOperation::None,
+                    ) => Some(((*id, self.lamport_version, *digest), *owner)),
+                    _ => None,
+                }
+            })
+            .collect()
     }
 
     fn deleted(&self) -> Vec<ObjectRef> {
-        self.deleted.clone()
+        self.changed_objects
+            .iter()
+            .filter_map(|(id, change)| {
+                match (
+                    &change.input_state,
+                    &change.output_state,
+                    &change.id_operation,
+                ) {
+                    (ObjectIn::Exist(_), ObjectOut::NotExist, IDOperation::Deleted) => Some((
+                        *id,
+                        self.lamport_version,
+                        ObjectDigest::OBJECT_DIGEST_DELETED,
+                    )),
+                    _ => None,
+                }
+            })
+            .collect()
     }
 
     fn unwrapped_then_deleted(&self) -> Vec<ObjectRef> {
-        self.unwrapped_then_deleted.clone()
+        self.changed_objects
+            .iter()
+            .filter_map(|(id, change)| {
+                match (
+                    &change.input_state,
+                    &change.output_state,
+                    &change.id_operation,
+                ) {
+                    (ObjectIn::NotExist, ObjectOut::NotExist, IDOperation::Deleted) => Some((
+                        *id,
+                        self.lamport_version,
+                        ObjectDigest::OBJECT_DIGEST_DELETED,
+                    )),
+                    _ => None,
+                }
+            })
+            .collect()
     }
 
     fn wrapped(&self) -> Vec<ObjectRef> {
-        self.wrapped.clone()
+        self.changed_objects
+            .iter()
+            .filter_map(|(id, change)| {
+                match (
+                    &change.input_state,
+                    &change.output_state,
+                    &change.id_operation,
+                ) {
+                    (ObjectIn::Exist(_), ObjectOut::NotExist, IDOperation::None) => Some((
+                        *id,
+                        self.lamport_version,
+                        ObjectDigest::OBJECT_DIGEST_WRAPPED,
+                    )),
+                    _ => None,
+                }
+            })
+            .collect()
     }
 
     fn object_changes(&self) -> Vec<ObjectChange> {
-        let modified_at: BTreeMap<_, _> = self.modified_at_versions.iter().copied().collect();
-
-        let created = self.created.iter().map(|((id, v, d), _)| ObjectChange {
-            id: *id,
-            input_version: None,
-            input_digest: None,
-            output_version: Some(*v),
-            output_digest: Some(*d),
-            id_operation: IDOperation::Created,
-        });
-
-        let mutated = self.mutated.iter().map(|((id, v, d), _)| ObjectChange {
-            id: *id,
-            input_version: modified_at.get(id).copied(),
-            input_digest: None,
-            output_version: Some(*v),
-            output_digest: Some(*d),
-            id_operation: IDOperation::None,
-        });
-
-        let unwrapped = self.unwrapped.iter().map(|((id, v, d), _)| ObjectChange {
-            id: *id,
-            input_version: None,
-            input_digest: None,
-            output_version: Some(*v),
-            output_digest: Some(*d),
-            id_operation: IDOperation::None,
-        });
+        self.changed_objects
+            .iter()
+            .map(|(id, change)| {
+                let input_version_digest = match &change.input_state {
+                    ObjectIn::NotExist => None,
+                    ObjectIn::Exist((vd, _)) => Some(*vd),
+                };
+
+                let output_version_digest = match &change.output_state {
+                    ObjectOut::NotExist => None,
+                    ObjectOut::ObjectWrite((d, _)) => Some((self.lamport_version, *d)),
+                    ObjectOut::PackageWrite(vd) => Some(*vd),
+                };
+
+                ObjectChange {
+                    id: *id,
 
-        let deleted = self.deleted.iter().map(|(id, _, _)| ObjectChange {
-            id: *id,
-            input_version: modified_at.get(id).copied(),
-            input_digest: None,
-            output_version: None,
-            output_digest: None,
-            id_operation: IDOperation::Deleted,
-        });
+                    input_version: input_version_digest.map(|k| k.0),
+                    input_digest: input_version_digest.map(|k| k.1),
 
-        let unwrapped_then_deleted =
-            self.unwrapped_then_deleted
-                .iter()
-                .map(|(id, _, _)| ObjectChange {
-                    id: *id,
-                    input_version: None,
-                    input_digest: None,
-                    output_version: None,
-                    output_digest: None,
-                    id_operation: IDOperation::Deleted,
-                });
-
-        let wrapped = self.wrapped.iter().map(|(id, _, _)| ObjectChange {
-            id: *id,
-            input_version: modified_at.get(id).copied(),
-            input_digest: None,
-            output_version: None,
-            output_digest: None,
-            id_operation: IDOperation::None,
-        });
+                    output_version: output_version_digest.map(|k| k.0),
+                    output_digest: output_version_digest.map(|k| k.1),
 
-        created
-            .chain(mutated)
-            .chain(unwrapped)
-            .chain(deleted)
-            .chain(unwrapped_then_deleted)
-            .chain(wrapped)
+                    id_operation: change.id_operation,
+                }
+            })
             .collect()
     }
 
     fn gas_object(&self) -> (ObjectRef, Owner) {
-        self.gas_object
+        if let Some(gas_object_index) = self.gas_object_index {
+            let entry = &self.changed_objects[gas_object_index as usize];
+            match entry.1.output_state {
+                ObjectOut::ObjectWrite((digest, owner)) => {
+                    ((entry.0, self.lamport_version, digest), owner)
+                }
+                _ => panic!("Gas object must be an ObjectWrite in changed_objects"),
+            }
+        } else {
+            (
+                (ObjectID::ZERO, SequenceNumber::default(), ObjectDigest::MIN),
+                Owner::AddressOwner(IotaAddress::default()),
+            )
+        }
     }
+
     fn events_digest(&self) -> Option<&TransactionEventsDigest> {
         self.events_digest.as_ref()
     }
@@ -280,16 +327,7 @@ impl TransactionEffectsAPI for TransactionEffectsV1 {
     }
 
     fn unchanged_shared_objects(&self) -> Vec<(ObjectID, UnchangedSharedKind)> {
-        self.input_shared_objects()
-            .iter()
-            .filter_map(|o| match o {
-                // In effects v1, the only unchanged shared objects are read-only shared objects.
-                InputSharedObject::ReadOnly(oref) => {
-                    Some((oref.0, UnchangedSharedKind::ReadOnlyRoot((oref.1, oref.2))))
-                }
-                _ => None,
-            })
-            .collect()
+        self.unchanged_shared_objects.clone()
     }
 
     fn status_mut_for_testing(&mut self) -> &mut ExecutionStatus {
@@ -311,96 +349,269 @@ impl TransactionEffectsAPI for TransactionEffectsV1 {
     fn unsafe_add_input_shared_object_for_testing(&mut self, kind: InputSharedObject) {
         match kind {
             InputSharedObject::Mutate(obj_ref) => {
-                self.shared_objects.push(obj_ref);
-                self.modified_at_versions.push((obj_ref.0, obj_ref.1));
-            }
-            InputSharedObject::ReadOnly(obj_ref) => {
-                self.shared_objects.push(obj_ref);
-            }
-            InputSharedObject::ReadDeleted(id, version)
-            | InputSharedObject::MutateDeleted(id, version) => {
-                self.shared_objects
-                    .push((id, version, ObjectDigest::OBJECT_DIGEST_DELETED));
-            }
-            InputSharedObject::Cancelled(..) => {
-                panic!("Transaction cancellation is not supported in effect v1");
+                self.changed_objects.push((obj_ref.0, EffectsObjectChange {
+                    input_state: ObjectIn::Exist(((obj_ref.1, obj_ref.2), Owner::Shared {
+                        initial_shared_version: OBJECT_START_VERSION,
+                    })),
+                    output_state: ObjectOut::ObjectWrite((obj_ref.2, Owner::Shared {
+                        initial_shared_version: obj_ref.1,
+                    })),
+                    id_operation: IDOperation::None,
+                }))
             }
+            InputSharedObject::ReadOnly(obj_ref) => self.unchanged_shared_objects.push((
+                obj_ref.0,
+                UnchangedSharedKind::ReadOnlyRoot((obj_ref.1, obj_ref.2)),
+            )),
+            InputSharedObject::ReadDeleted(obj_id, seqno) => self
+                .unchanged_shared_objects
+                .push((obj_id, UnchangedSharedKind::ReadDeleted(seqno))),
+            InputSharedObject::MutateDeleted(obj_id, seqno) => self
+                .unchanged_shared_objects
+                .push((obj_id, UnchangedSharedKind::MutateDeleted(seqno))),
+            InputSharedObject::Cancelled(obj_id, seqno) => self
+                .unchanged_shared_objects
+                .push((obj_id, UnchangedSharedKind::Cancelled(seqno))),
         }
     }
 
-    fn unsafe_add_deleted_live_object_for_testing(&mut self, object: ObjectRef) {
-        self.modified_at_versions.push((object.0, object.1));
+    fn unsafe_add_deleted_live_object_for_testing(&mut self, obj_ref: ObjectRef) {
+        self.changed_objects.push((obj_ref.0, EffectsObjectChange {
+            input_state: ObjectIn::Exist((
+                (obj_ref.1, obj_ref.2),
+                Owner::AddressOwner(IotaAddress::default()),
+            )),
+            output_state: ObjectOut::ObjectWrite((
+                obj_ref.2,
+                Owner::AddressOwner(IotaAddress::default()),
+            )),
+            id_operation: IDOperation::None,
+        }))
     }
 
-    fn unsafe_add_object_tombstone_for_testing(&mut self, object: ObjectRef) {
-        self.deleted.push(object);
+    fn unsafe_add_object_tombstone_for_testing(&mut self, obj_ref: ObjectRef) {
+        self.changed_objects.push((obj_ref.0, EffectsObjectChange {
+            input_state: ObjectIn::Exist((
+                (obj_ref.1, obj_ref.2),
+                Owner::AddressOwner(IotaAddress::default()),
+            )),
+            output_state: ObjectOut::NotExist,
+            id_operation: IDOperation::Deleted,
+        }))
     }
 }
 
-impl Display for TransactionEffectsV1 {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        let mut writer = String::new();
-        writeln!(writer, "Status : {:?}", self.status)?;
-        if !self.created.is_empty() {
-            writeln!(writer, "Created Objects:")?;
-            for ((id, _, _), owner) in &self.created {
-                writeln!(writer, "  - ID: {} , Owner: {}", id, owner)?;
-            }
-        }
-        if !self.mutated.is_empty() {
-            writeln!(writer, "Mutated Objects:")?;
-            for ((id, _, _), owner) in &self.mutated {
-                writeln!(writer, "  - ID: {} , Owner: {}", id, owner)?;
-            }
-        }
-        if !self.deleted.is_empty() {
-            writeln!(writer, "Deleted Objects:")?;
-            for (id, _, _) in &self.deleted {
-                writeln!(writer, "  - ID: {}", id)?;
-            }
-        }
-        if !self.wrapped.is_empty() {
-            writeln!(writer, "Wrapped Objects:")?;
-            for (id, _, _) in &self.wrapped {
-                writeln!(writer, "  - ID: {}", id)?;
+impl TransactionEffectsV1 {
+    pub fn new(
+        status: ExecutionStatus,
+        executed_epoch: EpochId,
+        gas_used: GasCostSummary,
+        shared_objects: Vec<SharedInput>,
+        loaded_per_epoch_config_objects: BTreeSet<ObjectID>,
+        transaction_digest: TransactionDigest,
+        lamport_version: SequenceNumber,
+        changed_objects: BTreeMap<ObjectID, EffectsObjectChange>,
+        gas_object: Option<ObjectID>,
+        events_digest: Option<TransactionEventsDigest>,
+        dependencies: Vec<TransactionDigest>,
+    ) -> Self {
+        let unchanged_shared_objects = shared_objects
+            .into_iter()
+            .filter_map(|shared_input| match shared_input {
+                SharedInput::Existing((id, version, digest)) => {
+                    if changed_objects.contains_key(&id) {
+                        None
+                    } else {
+                        Some((id, UnchangedSharedKind::ReadOnlyRoot((version, digest))))
+                    }
+                }
+                SharedInput::Deleted((id, version, mutable, _)) => {
+                    debug_assert!(!changed_objects.contains_key(&id));
+                    if mutable {
+                        Some((id, UnchangedSharedKind::MutateDeleted(version)))
+                    } else {
+                        Some((id, UnchangedSharedKind::ReadDeleted(version)))
+                    }
+                }
+                SharedInput::Cancelled((id, version)) => {
+                    debug_assert!(!changed_objects.contains_key(&id));
+                    Some((id, UnchangedSharedKind::Cancelled(version)))
+                }
+            })
+            .chain(
+                loaded_per_epoch_config_objects
+                    .into_iter()
+                    .map(|id| (id, UnchangedSharedKind::PerEpochConfig)),
+            )
+            .collect();
+        let changed_objects: Vec<_> = changed_objects.into_iter().collect();
+
+        let gas_object_index = gas_object.map(|gas_id| {
+            changed_objects
+                .iter()
+                .position(|(id, _)| id == &gas_id)
+                .unwrap() as u32
+        });
+
+        #[allow(clippy::let_and_return)]
+        let result = Self {
+            status,
+            executed_epoch,
+            gas_used,
+            transaction_digest,
+            lamport_version,
+            changed_objects,
+            unchanged_shared_objects,
+            gas_object_index,
+            events_digest,
+            dependencies,
+            aux_data_digest: None,
+        };
+        #[cfg(debug_assertions)]
+        result.check_invariant();
+
+        result
+    }
+
+    /// This function demonstrates what's the invariant of the effects.
+    /// It also documents the semantics of different combinations in object
+    /// changes.
+    #[cfg(debug_assertions)]
+    fn check_invariant(&self) {
+        let mut unique_ids = HashSet::new();
+        for (id, change) in &self.changed_objects {
+            assert!(unique_ids.insert(*id));
+            match (
+                &change.input_state,
+                &change.output_state,
+                &change.id_operation,
+            ) {
+                (ObjectIn::NotExist, ObjectOut::NotExist, IDOperation::Created) => {
+                    // created and then wrapped Move object.
+                }
+                (ObjectIn::NotExist, ObjectOut::NotExist, IDOperation::Deleted) => {
+                    // unwrapped and then deleted Move object.
+                }
+                (ObjectIn::NotExist, ObjectOut::ObjectWrite((_, owner)), IDOperation::None) => {
+                    // unwrapped Move object.
+                    // It's not allowed to make an object shared after unwrapping.
+                    assert!(!owner.is_shared());
+                }
+                (ObjectIn::NotExist, ObjectOut::ObjectWrite(..), IDOperation::Created) => {
+                    // created Move object.
+                }
+                (ObjectIn::NotExist, ObjectOut::PackageWrite(_), IDOperation::Created) => {
+                    // created Move package or user Move package upgrade.
+                }
+                (
+                    ObjectIn::Exist(((old_version, _), old_owner)),
+                    ObjectOut::NotExist,
+                    IDOperation::None,
+                ) => {
+                    // wrapped.
+                    assert!(old_version.value() < self.lamport_version.value());
+                    assert!(
+                        !old_owner.is_shared() && !old_owner.is_immutable(),
+                        "Cannot wrap shared or immutable object"
+                    );
+                }
+                (
+                    ObjectIn::Exist(((old_version, _), old_owner)),
+                    ObjectOut::NotExist,
+                    IDOperation::Deleted,
+                ) => {
+                    // deleted.
+                    assert!(old_version.value() < self.lamport_version.value());
+                    assert!(!old_owner.is_immutable(), "Cannot delete immutable object");
+                }
+                (
+                    ObjectIn::Exist(((old_version, old_digest), old_owner)),
+                    ObjectOut::ObjectWrite((new_digest, new_owner)),
+                    IDOperation::None,
+                ) => {
+                    // mutated.
+                    assert!(old_version.value() < self.lamport_version.value());
+                    assert_ne!(old_digest, new_digest);
+                    assert!(!old_owner.is_immutable(), "Cannot mutate immutable object");
+                    if old_owner.is_shared() {
+                        assert!(new_owner.is_shared(), "Cannot un-share an object");
+                    } else {
+                        assert!(!new_owner.is_shared(), "Cannot share an existing object");
+                    }
+                }
+                (
+                    ObjectIn::Exist(((old_version, old_digest), old_owner)),
+                    ObjectOut::PackageWrite((new_version, new_digest)),
+                    IDOperation::None,
+                ) => {
+                    // system package upgrade.
+                    assert!(
+                        old_owner.is_immutable() && is_system_package(*id),
+                        "Must be a system package"
+                    );
+                    assert_eq!(old_version.value() + 1, new_version.value());
+                    assert_ne!(old_digest, new_digest);
+                }
+                _ => {
+                    panic!("Impossible object change: {:?}, {:?}", id, change);
+                }
             }
         }
-        if !self.unwrapped.is_empty() {
-            writeln!(writer, "Unwrapped Objects:")?;
-            for ((id, _, _), owner) in &self.unwrapped {
-                writeln!(writer, "  - ID: {} , Owner: {}", id, owner)?;
-            }
+        // Make sure that gas object exists in changed_objects.
+        let (_, owner) = self.gas_object();
+        assert!(matches!(owner, Owner::AddressOwner(_)));
+
+        for (id, _) in &self.unchanged_shared_objects {
+            assert!(
+                unique_ids.insert(*id),
+                "Duplicate object id: {:?}\n{:#?}",
+                id,
+                self
+            );
         }
-        write!(f, "{}", writer)
+    }
+
+    pub fn changed_objects(&self) -> &[(ObjectID, EffectsObjectChange)] {
+        &self.changed_objects
+    }
+
+    pub fn aux_data_digest(&self) -> Option<EffectsAuxDataDigest> {
+        self.aux_data_digest
     }
 }
 
 impl Default for TransactionEffectsV1 {
     fn default() -> Self {
-        TransactionEffectsV1 {
+        Self {
             status: ExecutionStatus::Success,
             executed_epoch: 0,
-            gas_used: GasCostSummary {
-                computation_cost: 0,
-                storage_cost: 0,
-                storage_rebate: 0,
-                non_refundable_storage_fee: 0,
-            },
-            modified_at_versions: Vec::new(),
-            shared_objects: Vec::new(),
-            transaction_digest: TransactionDigest::random(),
-            created: Vec::new(),
-            mutated: Vec::new(),
-            unwrapped: Vec::new(),
-            deleted: Vec::new(),
-            unwrapped_then_deleted: Vec::new(),
-            wrapped: Vec::new(),
-            gas_object: (
-                random_object_ref(),
-                Owner::AddressOwner(IotaAddress::default()),
-            ),
+            gas_used: GasCostSummary::default(),
+            transaction_digest: TransactionDigest::default(),
+            lamport_version: SequenceNumber::default(),
+            changed_objects: vec![],
+            unchanged_shared_objects: vec![],
+            gas_object_index: None,
             events_digest: None,
-            dependencies: Vec::new(),
+            dependencies: vec![],
+            aux_data_digest: None,
         }
     }
 }
+
+#[derive(Eq, PartialEq, Clone, Debug, Serialize, Deserialize)]
+pub enum UnchangedSharedKind {
+    /// Read-only shared objects from the input. We don't really need
+    /// ObjectDigest for protocol correctness, but it will make it easier to
+    /// verify untrusted read.
+    ReadOnlyRoot(VersionDigest),
+    /// Deleted shared objects that appear mutably/owned in the input.
+    MutateDeleted(SequenceNumber),
+    /// Deleted shared objects that appear as read-only in the input.
+    ReadDeleted(SequenceNumber),
+    /// Shared objects in cancelled transaction. The sequence number embed
+    /// cancellation reason.
+    Cancelled(SequenceNumber),
+    /// Read of a per-epoch config object that should remain the same during an
+    /// epoch.
+    PerEpochConfig,
+}
diff --git a/crates/iota-types/src/effects/effects_v2.rs b/crates/iota-types/src/effects/effects_v2.rs
deleted file mode 100644
index 68184453467..00000000000
--- a/crates/iota-types/src/effects/effects_v2.rs
+++ /dev/null
@@ -1,613 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-#[cfg(debug_assertions)]
-use std::collections::HashSet;
-use std::collections::{BTreeMap, BTreeSet};
-
-use serde::{Deserialize, Serialize};
-
-use super::{
-    EffectsObjectChange, IDOperation, ObjectChange,
-    object_change::{ObjectIn, ObjectOut},
-};
-#[cfg(debug_assertions)]
-use crate::is_system_package;
-use crate::{
-    base_types::{
-        EpochId, IotaAddress, ObjectDigest, ObjectID, ObjectRef, SequenceNumber, TransactionDigest,
-        VersionDigest,
-    },
-    digests::{EffectsAuxDataDigest, TransactionEventsDigest},
-    effects::{InputSharedObject, TransactionEffectsAPI},
-    execution::SharedInput,
-    execution_status::ExecutionStatus,
-    gas::GasCostSummary,
-    object::{OBJECT_START_VERSION, Owner},
-};
-
-/// The response from processing a transaction or a certified transaction
-#[derive(Eq, PartialEq, Clone, Debug, Serialize, Deserialize)]
-pub struct TransactionEffectsV2 {
-    /// The status of the execution
-    status: ExecutionStatus,
-    /// The epoch when this transaction was executed.
-    executed_epoch: EpochId,
-    gas_used: GasCostSummary,
-    /// The transaction digest
-    transaction_digest: TransactionDigest,
-    /// The updated gas object reference, as an index into the `changed_objects`
-    /// vector. Having a dedicated field for convenient access.
-    /// System transaction that don't require gas will leave this as None.
-    gas_object_index: Option<u32>,
-    /// The digest of the events emitted during execution,
-    /// can be None if the transaction does not emit any event.
-    events_digest: Option<TransactionEventsDigest>,
-    /// The set of transaction digests this transaction depends on.
-    dependencies: Vec<TransactionDigest>,
-
-    /// The version number of all the written Move objects by this transaction.
-    pub(crate) lamport_version: SequenceNumber,
-    /// Objects whose state are changed in the object store.
-    changed_objects: Vec<(ObjectID, EffectsObjectChange)>,
-    /// Shared objects that are not mutated in this transaction. Unlike owned
-    /// objects, read-only shared objects' version are not committed in the
-    /// transaction, and in order for a node to catch up and execute it
-    /// without consensus sequencing, the version needs to be committed in
-    /// the effects.
-    unchanged_shared_objects: Vec<(ObjectID, UnchangedSharedKind)>,
-    /// Auxiliary data that are not protocol-critical, generated as part of the
-    /// effects but are stored separately. Storing it separately allows us
-    /// to avoid bloating the effects with data that are not critical.
-    /// It also provides more flexibility on the format and type of the data.
-    aux_data_digest: Option<EffectsAuxDataDigest>,
-}
-
-impl TransactionEffectsAPI for TransactionEffectsV2 {
-    fn status(&self) -> &ExecutionStatus {
-        &self.status
-    }
-
-    fn into_status(self) -> ExecutionStatus {
-        self.status
-    }
-
-    fn executed_epoch(&self) -> EpochId {
-        self.executed_epoch
-    }
-
-    fn modified_at_versions(&self) -> Vec<(ObjectID, SequenceNumber)> {
-        self.changed_objects
-            .iter()
-            .filter_map(|(id, change)| {
-                if let ObjectIn::Exist(((version, _digest), _owner)) = &change.input_state {
-                    Some((*id, *version))
-                } else {
-                    None
-                }
-            })
-            .collect()
-    }
-
-    fn lamport_version(&self) -> SequenceNumber {
-        self.lamport_version
-    }
-
-    fn old_object_metadata(&self) -> Vec<(ObjectRef, Owner)> {
-        self.changed_objects
-            .iter()
-            .filter_map(|(id, change)| {
-                if let ObjectIn::Exist(((version, digest), owner)) = &change.input_state {
-                    Some(((*id, *version, *digest), *owner))
-                } else {
-                    None
-                }
-            })
-            .collect()
-    }
-
-    fn input_shared_objects(&self) -> Vec<InputSharedObject> {
-        self.changed_objects
-            .iter()
-            .filter_map(|(id, change)| match &change.input_state {
-                ObjectIn::Exist(((version, digest), Owner::Shared { .. })) => {
-                    Some(InputSharedObject::Mutate((*id, *version, *digest)))
-                }
-                _ => None,
-            })
-            .chain(
-                self.unchanged_shared_objects
-                    .iter()
-                    .filter_map(|(id, change_kind)| match change_kind {
-                        UnchangedSharedKind::ReadOnlyRoot((version, digest)) => {
-                            Some(InputSharedObject::ReadOnly((*id, *version, *digest)))
-                        }
-                        UnchangedSharedKind::MutateDeleted(seqno) => {
-                            Some(InputSharedObject::MutateDeleted(*id, *seqno))
-                        }
-                        UnchangedSharedKind::ReadDeleted(seqno) => {
-                            Some(InputSharedObject::ReadDeleted(*id, *seqno))
-                        }
-                        UnchangedSharedKind::Cancelled(seqno) => {
-                            Some(InputSharedObject::Cancelled(*id, *seqno))
-                        }
-                        // We can not expose the per epoch config object as input shared object,
-                        // since it does not require sequencing, and hence shall not be considered
-                        // as a normal input shared object.
-                        UnchangedSharedKind::PerEpochConfig => None,
-                    }),
-            )
-            .collect()
-    }
-
-    fn created(&self) -> Vec<(ObjectRef, Owner)> {
-        self.changed_objects
-            .iter()
-            .filter_map(|(id, change)| {
-                match (
-                    &change.input_state,
-                    &change.output_state,
-                    &change.id_operation,
-                ) {
-                    (
-                        ObjectIn::NotExist,
-                        ObjectOut::ObjectWrite((digest, owner)),
-                        IDOperation::Created,
-                    ) => Some(((*id, self.lamport_version, *digest), *owner)),
-                    (
-                        ObjectIn::NotExist,
-                        ObjectOut::PackageWrite((version, digest)),
-                        IDOperation::Created,
-                    ) => Some(((*id, *version, *digest), Owner::Immutable)),
-                    _ => None,
-                }
-            })
-            .collect()
-    }
-
-    fn mutated(&self) -> Vec<(ObjectRef, Owner)> {
-        self.changed_objects
-            .iter()
-            .filter_map(
-                |(id, change)| match (&change.input_state, &change.output_state) {
-                    (ObjectIn::Exist(_), ObjectOut::ObjectWrite((digest, owner))) => {
-                        Some(((*id, self.lamport_version, *digest), *owner))
-                    }
-                    (ObjectIn::Exist(_), ObjectOut::PackageWrite((version, digest))) => {
-                        Some(((*id, *version, *digest), Owner::Immutable))
-                    }
-                    _ => None,
-                },
-            )
-            .collect()
-    }
-
-    fn unwrapped(&self) -> Vec<(ObjectRef, Owner)> {
-        self.changed_objects
-            .iter()
-            .filter_map(|(id, change)| {
-                match (
-                    &change.input_state,
-                    &change.output_state,
-                    &change.id_operation,
-                ) {
-                    (
-                        ObjectIn::NotExist,
-                        ObjectOut::ObjectWrite((digest, owner)),
-                        IDOperation::None,
-                    ) => Some(((*id, self.lamport_version, *digest), *owner)),
-                    _ => None,
-                }
-            })
-            .collect()
-    }
-
-    fn deleted(&self) -> Vec<ObjectRef> {
-        self.changed_objects
-            .iter()
-            .filter_map(|(id, change)| {
-                match (
-                    &change.input_state,
-                    &change.output_state,
-                    &change.id_operation,
-                ) {
-                    (ObjectIn::Exist(_), ObjectOut::NotExist, IDOperation::Deleted) => Some((
-                        *id,
-                        self.lamport_version,
-                        ObjectDigest::OBJECT_DIGEST_DELETED,
-                    )),
-                    _ => None,
-                }
-            })
-            .collect()
-    }
-
-    fn unwrapped_then_deleted(&self) -> Vec<ObjectRef> {
-        self.changed_objects
-            .iter()
-            .filter_map(|(id, change)| {
-                match (
-                    &change.input_state,
-                    &change.output_state,
-                    &change.id_operation,
-                ) {
-                    (ObjectIn::NotExist, ObjectOut::NotExist, IDOperation::Deleted) => Some((
-                        *id,
-                        self.lamport_version,
-                        ObjectDigest::OBJECT_DIGEST_DELETED,
-                    )),
-                    _ => None,
-                }
-            })
-            .collect()
-    }
-
-    fn wrapped(&self) -> Vec<ObjectRef> {
-        self.changed_objects
-            .iter()
-            .filter_map(|(id, change)| {
-                match (
-                    &change.input_state,
-                    &change.output_state,
-                    &change.id_operation,
-                ) {
-                    (ObjectIn::Exist(_), ObjectOut::NotExist, IDOperation::None) => Some((
-                        *id,
-                        self.lamport_version,
-                        ObjectDigest::OBJECT_DIGEST_WRAPPED,
-                    )),
-                    _ => None,
-                }
-            })
-            .collect()
-    }
-
-    fn object_changes(&self) -> Vec<ObjectChange> {
-        self.changed_objects
-            .iter()
-            .map(|(id, change)| {
-                let input_version_digest = match &change.input_state {
-                    ObjectIn::NotExist => None,
-                    ObjectIn::Exist((vd, _)) => Some(*vd),
-                };
-
-                let output_version_digest = match &change.output_state {
-                    ObjectOut::NotExist => None,
-                    ObjectOut::ObjectWrite((d, _)) => Some((self.lamport_version, *d)),
-                    ObjectOut::PackageWrite(vd) => Some(*vd),
-                };
-
-                ObjectChange {
-                    id: *id,
-
-                    input_version: input_version_digest.map(|k| k.0),
-                    input_digest: input_version_digest.map(|k| k.1),
-
-                    output_version: output_version_digest.map(|k| k.0),
-                    output_digest: output_version_digest.map(|k| k.1),
-
-                    id_operation: change.id_operation,
-                }
-            })
-            .collect()
-    }
-
-    fn gas_object(&self) -> (ObjectRef, Owner) {
-        if let Some(gas_object_index) = self.gas_object_index {
-            let entry = &self.changed_objects[gas_object_index as usize];
-            match entry.1.output_state {
-                ObjectOut::ObjectWrite((digest, owner)) => {
-                    ((entry.0, self.lamport_version, digest), owner)
-                }
-                _ => panic!("Gas object must be an ObjectWrite in changed_objects"),
-            }
-        } else {
-            (
-                (ObjectID::ZERO, SequenceNumber::default(), ObjectDigest::MIN),
-                Owner::AddressOwner(IotaAddress::default()),
-            )
-        }
-    }
-
-    fn events_digest(&self) -> Option<&TransactionEventsDigest> {
-        self.events_digest.as_ref()
-    }
-
-    fn dependencies(&self) -> &[TransactionDigest] {
-        &self.dependencies
-    }
-
-    fn transaction_digest(&self) -> &TransactionDigest {
-        &self.transaction_digest
-    }
-
-    fn gas_cost_summary(&self) -> &GasCostSummary {
-        &self.gas_used
-    }
-
-    fn unchanged_shared_objects(&self) -> Vec<(ObjectID, UnchangedSharedKind)> {
-        self.unchanged_shared_objects.clone()
-    }
-
-    fn status_mut_for_testing(&mut self) -> &mut ExecutionStatus {
-        &mut self.status
-    }
-
-    fn gas_cost_summary_mut_for_testing(&mut self) -> &mut GasCostSummary {
-        &mut self.gas_used
-    }
-
-    fn transaction_digest_mut_for_testing(&mut self) -> &mut TransactionDigest {
-        &mut self.transaction_digest
-    }
-
-    fn dependencies_mut_for_testing(&mut self) -> &mut Vec<TransactionDigest> {
-        &mut self.dependencies
-    }
-
-    fn unsafe_add_input_shared_object_for_testing(&mut self, kind: InputSharedObject) {
-        match kind {
-            InputSharedObject::Mutate(obj_ref) => {
-                self.changed_objects.push((obj_ref.0, EffectsObjectChange {
-                    input_state: ObjectIn::Exist(((obj_ref.1, obj_ref.2), Owner::Shared {
-                        initial_shared_version: OBJECT_START_VERSION,
-                    })),
-                    output_state: ObjectOut::ObjectWrite((obj_ref.2, Owner::Shared {
-                        initial_shared_version: obj_ref.1,
-                    })),
-                    id_operation: IDOperation::None,
-                }))
-            }
-            InputSharedObject::ReadOnly(obj_ref) => self.unchanged_shared_objects.push((
-                obj_ref.0,
-                UnchangedSharedKind::ReadOnlyRoot((obj_ref.1, obj_ref.2)),
-            )),
-            InputSharedObject::ReadDeleted(obj_id, seqno) => self
-                .unchanged_shared_objects
-                .push((obj_id, UnchangedSharedKind::ReadDeleted(seqno))),
-            InputSharedObject::MutateDeleted(obj_id, seqno) => self
-                .unchanged_shared_objects
-                .push((obj_id, UnchangedSharedKind::MutateDeleted(seqno))),
-            InputSharedObject::Cancelled(obj_id, seqno) => self
-                .unchanged_shared_objects
-                .push((obj_id, UnchangedSharedKind::Cancelled(seqno))),
-        }
-    }
-
-    fn unsafe_add_deleted_live_object_for_testing(&mut self, obj_ref: ObjectRef) {
-        self.changed_objects.push((obj_ref.0, EffectsObjectChange {
-            input_state: ObjectIn::Exist((
-                (obj_ref.1, obj_ref.2),
-                Owner::AddressOwner(IotaAddress::default()),
-            )),
-            output_state: ObjectOut::ObjectWrite((
-                obj_ref.2,
-                Owner::AddressOwner(IotaAddress::default()),
-            )),
-            id_operation: IDOperation::None,
-        }))
-    }
-
-    fn unsafe_add_object_tombstone_for_testing(&mut self, obj_ref: ObjectRef) {
-        self.changed_objects.push((obj_ref.0, EffectsObjectChange {
-            input_state: ObjectIn::Exist((
-                (obj_ref.1, obj_ref.2),
-                Owner::AddressOwner(IotaAddress::default()),
-            )),
-            output_state: ObjectOut::NotExist,
-            id_operation: IDOperation::Deleted,
-        }))
-    }
-}
-
-impl TransactionEffectsV2 {
-    pub fn new(
-        status: ExecutionStatus,
-        executed_epoch: EpochId,
-        gas_used: GasCostSummary,
-        shared_objects: Vec<SharedInput>,
-        loaded_per_epoch_config_objects: BTreeSet<ObjectID>,
-        transaction_digest: TransactionDigest,
-        lamport_version: SequenceNumber,
-        changed_objects: BTreeMap<ObjectID, EffectsObjectChange>,
-        gas_object: Option<ObjectID>,
-        events_digest: Option<TransactionEventsDigest>,
-        dependencies: Vec<TransactionDigest>,
-    ) -> Self {
-        let unchanged_shared_objects = shared_objects
-            .into_iter()
-            .filter_map(|shared_input| match shared_input {
-                SharedInput::Existing((id, version, digest)) => {
-                    if changed_objects.contains_key(&id) {
-                        None
-                    } else {
-                        Some((id, UnchangedSharedKind::ReadOnlyRoot((version, digest))))
-                    }
-                }
-                SharedInput::Deleted((id, version, mutable, _)) => {
-                    debug_assert!(!changed_objects.contains_key(&id));
-                    if mutable {
-                        Some((id, UnchangedSharedKind::MutateDeleted(version)))
-                    } else {
-                        Some((id, UnchangedSharedKind::ReadDeleted(version)))
-                    }
-                }
-                SharedInput::Cancelled((id, version)) => {
-                    debug_assert!(!changed_objects.contains_key(&id));
-                    Some((id, UnchangedSharedKind::Cancelled(version)))
-                }
-            })
-            .chain(
-                loaded_per_epoch_config_objects
-                    .into_iter()
-                    .map(|id| (id, UnchangedSharedKind::PerEpochConfig)),
-            )
-            .collect();
-        let changed_objects: Vec<_> = changed_objects.into_iter().collect();
-
-        let gas_object_index = gas_object.map(|gas_id| {
-            changed_objects
-                .iter()
-                .position(|(id, _)| id == &gas_id)
-                .unwrap() as u32
-        });
-
-        #[allow(clippy::let_and_return)]
-        let result = Self {
-            status,
-            executed_epoch,
-            gas_used,
-            transaction_digest,
-            lamport_version,
-            changed_objects,
-            unchanged_shared_objects,
-            gas_object_index,
-            events_digest,
-            dependencies,
-            aux_data_digest: None,
-        };
-        #[cfg(debug_assertions)]
-        result.check_invariant();
-
-        result
-    }
-
-    /// This function demonstrates what's the invariant of the effects.
-    /// It also documents the semantics of different combinations in object
-    /// changes.
-    #[cfg(debug_assertions)]
-    fn check_invariant(&self) {
-        let mut unique_ids = HashSet::new();
-        for (id, change) in &self.changed_objects {
-            assert!(unique_ids.insert(*id));
-            match (
-                &change.input_state,
-                &change.output_state,
-                &change.id_operation,
-            ) {
-                (ObjectIn::NotExist, ObjectOut::NotExist, IDOperation::Created) => {
-                    // created and then wrapped Move object.
-                }
-                (ObjectIn::NotExist, ObjectOut::NotExist, IDOperation::Deleted) => {
-                    // unwrapped and then deleted Move object.
-                }
-                (ObjectIn::NotExist, ObjectOut::ObjectWrite((_, owner)), IDOperation::None) => {
-                    // unwrapped Move object.
-                    // It's not allowed to make an object shared after unwrapping.
-                    assert!(!owner.is_shared());
-                }
-                (ObjectIn::NotExist, ObjectOut::ObjectWrite(..), IDOperation::Created) => {
-                    // created Move object.
-                }
-                (ObjectIn::NotExist, ObjectOut::PackageWrite(_), IDOperation::Created) => {
-                    // created Move package or user Move package upgrade.
-                }
-                (
-                    ObjectIn::Exist(((old_version, _), old_owner)),
-                    ObjectOut::NotExist,
-                    IDOperation::None,
-                ) => {
-                    // wrapped.
-                    assert!(old_version.value() < self.lamport_version.value());
-                    assert!(
-                        !old_owner.is_shared() && !old_owner.is_immutable(),
-                        "Cannot wrap shared or immutable object"
-                    );
-                }
-                (
-                    ObjectIn::Exist(((old_version, _), old_owner)),
-                    ObjectOut::NotExist,
-                    IDOperation::Deleted,
-                ) => {
-                    // deleted.
-                    assert!(old_version.value() < self.lamport_version.value());
-                    assert!(!old_owner.is_immutable(), "Cannot delete immutable object");
-                }
-                (
-                    ObjectIn::Exist(((old_version, old_digest), old_owner)),
-                    ObjectOut::ObjectWrite((new_digest, new_owner)),
-                    IDOperation::None,
-                ) => {
-                    // mutated.
-                    assert!(old_version.value() < self.lamport_version.value());
-                    assert_ne!(old_digest, new_digest);
-                    assert!(!old_owner.is_immutable(), "Cannot mutate immutable object");
-                    if old_owner.is_shared() {
-                        assert!(new_owner.is_shared(), "Cannot un-share an object");
-                    } else {
-                        assert!(!new_owner.is_shared(), "Cannot share an existing object");
-                    }
-                }
-                (
-                    ObjectIn::Exist(((old_version, old_digest), old_owner)),
-                    ObjectOut::PackageWrite((new_version, new_digest)),
-                    IDOperation::None,
-                ) => {
-                    // system package upgrade.
-                    assert!(
-                        old_owner.is_immutable() && is_system_package(*id),
-                        "Must be a system package"
-                    );
-                    assert_eq!(old_version.value() + 1, new_version.value());
-                    assert_ne!(old_digest, new_digest);
-                }
-                _ => {
-                    panic!("Impossible object change: {:?}, {:?}", id, change);
-                }
-            }
-        }
-        // Make sure that gas object exists in changed_objects.
-        let (_, owner) = self.gas_object();
-        assert!(matches!(owner, Owner::AddressOwner(_)));
-
-        for (id, _) in &self.unchanged_shared_objects {
-            assert!(
-                unique_ids.insert(*id),
-                "Duplicate object id: {:?}\n{:#?}",
-                id,
-                self
-            );
-        }
-    }
-
-    pub fn changed_objects(&self) -> &[(ObjectID, EffectsObjectChange)] {
-        &self.changed_objects
-    }
-}
-
-impl Default for TransactionEffectsV2 {
-    fn default() -> Self {
-        Self {
-            status: ExecutionStatus::Success,
-            executed_epoch: 0,
-            gas_used: GasCostSummary::default(),
-            transaction_digest: TransactionDigest::default(),
-            lamport_version: SequenceNumber::default(),
-            changed_objects: vec![],
-            unchanged_shared_objects: vec![],
-            gas_object_index: None,
-            events_digest: None,
-            dependencies: vec![],
-            aux_data_digest: None,
-        }
-    }
-}
-
-#[derive(Eq, PartialEq, Clone, Debug, Serialize, Deserialize)]
-pub enum UnchangedSharedKind {
-    /// Read-only shared objects from the input. We don't really need
-    /// ObjectDigest for protocol correctness, but it will make it easier to
-    /// verify untrusted read.
-    ReadOnlyRoot(VersionDigest),
-    /// Deleted shared objects that appear mutably/owned in the input.
-    MutateDeleted(SequenceNumber),
-    /// Deleted shared objects that appear as read-only in the input.
-    ReadDeleted(SequenceNumber),
-    /// Shared objects in cancelled transaction. The sequence number embed
-    /// cancellation reason.
-    Cancelled(SequenceNumber),
-    /// Read of a per-epoch config object that should remain the same during an
-    /// epoch.
-    PerEpochConfig,
-}
diff --git a/crates/iota-types/src/effects/mod.rs b/crates/iota-types/src/effects/mod.rs
index 8d9b507562c..b67048f2473 100644
--- a/crates/iota-types/src/effects/mod.rs
+++ b/crates/iota-types/src/effects/mod.rs
@@ -5,14 +5,13 @@
 use std::collections::{BTreeMap, BTreeSet};
 
 use effects_v1::TransactionEffectsV1;
-pub use effects_v2::UnchangedSharedKind;
+pub use effects_v1::UnchangedSharedKind;
 use enum_dispatch::enum_dispatch;
 pub use object_change::{EffectsObjectChange, ObjectIn, ObjectOut};
 use serde::{Deserialize, Serialize};
 use shared_crypto::intent::{Intent, IntentScope};
 pub use test_effects_builder::TestEffectsBuilder;
 
-use self::effects_v2::TransactionEffectsV2;
 use crate::{
     base_types::{ExecutionDigests, ObjectID, ObjectRef, SequenceNumber},
     committee::{Committee, EpochId},
@@ -31,8 +30,7 @@ use crate::{
     storage::WriteKind,
 };
 
-mod effects_v1;
-mod effects_v2;
+pub(crate) mod effects_v1;
 mod object_change;
 mod test_effects_builder;
 
@@ -59,7 +57,6 @@ pub const APPROX_SIZE_OF_OWNER: usize = 48;
 #[allow(clippy::large_enum_variant)]
 pub enum TransactionEffects {
     V1(TransactionEffectsV1),
-    V2(TransactionEffectsV2),
 }
 
 impl Message for TransactionEffects {
@@ -74,7 +71,7 @@ impl Message for TransactionEffects {
 // TODO: Get rid of this and use TestEffectsBuilder instead.
 impl Default for TransactionEffects {
     fn default() -> Self {
-        TransactionEffects::V2(Default::default())
+        TransactionEffects::V1(Default::default())
     }
 }
 
@@ -87,44 +84,6 @@ impl TransactionEffects {
     /// Creates a TransactionEffects message from the results of execution,
     /// choosing the correct format for the current protocol version.
     pub fn new_from_execution_v1(
-        status: ExecutionStatus,
-        executed_epoch: EpochId,
-        gas_used: GasCostSummary,
-        modified_at_versions: Vec<(ObjectID, SequenceNumber)>,
-        shared_objects: Vec<ObjectRef>,
-        transaction_digest: TransactionDigest,
-        created: Vec<(ObjectRef, Owner)>,
-        mutated: Vec<(ObjectRef, Owner)>,
-        unwrapped: Vec<(ObjectRef, Owner)>,
-        deleted: Vec<ObjectRef>,
-        unwrapped_then_deleted: Vec<ObjectRef>,
-        wrapped: Vec<ObjectRef>,
-        gas_object: (ObjectRef, Owner),
-        events_digest: Option<TransactionEventsDigest>,
-        dependencies: Vec<TransactionDigest>,
-    ) -> Self {
-        Self::V1(TransactionEffectsV1::new(
-            status,
-            executed_epoch,
-            gas_used,
-            modified_at_versions,
-            shared_objects,
-            transaction_digest,
-            created,
-            mutated,
-            unwrapped,
-            deleted,
-            unwrapped_then_deleted,
-            wrapped,
-            gas_object,
-            events_digest,
-            dependencies,
-        ))
-    }
-
-    /// Creates a TransactionEffects message from the results of execution,
-    /// choosing the correct format for the current protocol version.
-    pub fn new_from_execution_v2(
         status: ExecutionStatus,
         executed_epoch: EpochId,
         gas_used: GasCostSummary,
@@ -137,7 +96,7 @@ impl TransactionEffects {
         events_digest: Option<TransactionEventsDigest>,
         dependencies: Vec<TransactionDigest>,
     ) -> Self {
-        Self::V2(TransactionEffectsV2::new(
+        Self::V1(TransactionEffectsV1::new(
             status,
             executed_epoch,
             gas_used,
@@ -160,30 +119,6 @@ impl TransactionEffects {
     }
 
     pub fn estimate_effects_size_upperbound_v1(
-        num_writes: usize,
-        num_mutables: usize,
-        num_deletes: usize,
-        num_deps: usize,
-    ) -> usize {
-        let fixed_sizes = APPROX_SIZE_OF_EXECUTION_STATUS
-            + APPROX_SIZE_OF_EPOCH_ID
-            + APPROX_SIZE_OF_GAS_COST_SUMMARY
-            + APPROX_SIZE_OF_OPT_TX_EVENTS_DIGEST;
-
-        // Each write or delete contributes at roughly this amount because:
-        // Each write can be a mutation which can show up in `mutated` and
-        // `modified_at_versions` `num_delete` is added for padding
-        let approx_change_entry_size = 1_000
-            + (APPROX_SIZE_OF_OWNER + APPROX_SIZE_OF_OBJECT_REF) * num_writes
-            + (APPROX_SIZE_OF_OBJECT_REF * num_mutables)
-            + (APPROX_SIZE_OF_OBJECT_REF * num_deletes);
-
-        let deps_size = 1_000 + APPROX_SIZE_OF_TX_DIGEST * num_deps;
-
-        fixed_sizes + approx_change_entry_size + deps_size
-    }
-
-    pub fn estimate_effects_size_upperbound_v2(
         num_writes: usize,
         num_modifies: usize,
         num_deps: usize,
@@ -317,7 +252,7 @@ pub trait TransactionEffectsAPI {
     /// Metadata of objects prior to modification. This includes any object that
     /// exists in the store prior to this transaction and is modified in
     /// this transaction. It includes objects that are mutated, wrapped and
-    /// deleted. This API is only available on effects v2 and above.
+    /// deleted.
     fn old_object_metadata(&self) -> Vec<(ObjectRef, Owner)>;
     /// Returns the list of sequenced shared objects used in the input.
     /// This is needed in effects because in transaction we only have object ID
diff --git a/crates/iota-types/src/effects/test_effects_builder.rs b/crates/iota-types/src/effects/test_effects_builder.rs
index 8ddf8d51717..4bc63afdd88 100644
--- a/crates/iota-types/src/effects/test_effects_builder.rs
+++ b/crates/iota-types/src/effects/test_effects_builder.rs
@@ -134,7 +134,7 @@ impl TestEffectsBuilder {
         let gas_object_id = self.transaction.transaction_data().gas()[0].0;
         let event_digest = self.events_digest;
         let dependencies = vec![];
-        TransactionEffects::new_from_execution_v2(
+        TransactionEffects::new_from_execution_v1(
             status,
             executed_epoch,
             GasCostSummary::default(),
diff --git a/crates/iota-types/src/execution.rs b/crates/iota-types/src/execution.rs
index d7dadb98fb2..abbc6c69ee3 100644
--- a/crates/iota-types/src/execution.rs
+++ b/crates/iota-types/src/execution.rs
@@ -14,7 +14,7 @@ use crate::{
     event::Event,
     is_system_package,
     object::{Data, Object, Owner},
-    storage::{BackingPackageStore, ObjectChange},
+    storage::BackingPackageStore,
     transaction::Argument,
 };
 
@@ -56,20 +56,13 @@ impl<T> TypeLayoutStore for T where T: BackingPackageStore {}
 #[derive(Debug)]
 pub enum ExecutionResults {
     V1(ExecutionResultsV1),
-    V2(ExecutionResultsV2),
-}
-
-#[derive(Debug)]
-pub struct ExecutionResultsV1 {
-    pub object_changes: BTreeMap<ObjectID, ObjectChange>,
-    pub user_events: Vec<Event>,
 }
 
 /// Used by iota-execution v1 and above, to capture the execution results from
 /// Move. The results represent the primitive information that can then be used
-/// to construct both transaction effects V1 and V2.
+/// to construct both transaction effect V1.
 #[derive(Debug, Default)]
-pub struct ExecutionResultsV2 {
+pub struct ExecutionResultsV1 {
     /// All objects written regardless of whether they were mutated, created, or
     /// unwrapped.
     pub written_objects: BTreeMap<ObjectID, Object>,
@@ -94,7 +87,7 @@ pub type ExecutionResult = (
     Vec<(Vec<u8>, TypeTag)>,
 );
 
-impl ExecutionResultsV2 {
+impl ExecutionResultsV1 {
     pub fn drop_writes(&mut self) {
         self.written_objects.clear();
         self.modified_objects.clear();
diff --git a/crates/iota-types/src/execution_status.rs b/crates/iota-types/src/execution_status.rs
index 7e3b4c129c9..22a23be2188 100644
--- a/crates/iota-types/src/execution_status.rs
+++ b/crates/iota-types/src/execution_status.rs
@@ -186,7 +186,7 @@ pub enum ExecutionFailureStatus {
         "Iota Move Bytecode Verification Timeout. \
         Please run the Iota Move Verifier for more information."
     )]
-    IotaMoveVerificationTimedout,
+    IotaMoveVerificationTimeout,
 
     #[error("The shared object operation is not allowed.")]
     SharedObjectOperationNotAllowed,
diff --git a/crates/iota-types/src/full_checkpoint_content.rs b/crates/iota-types/src/full_checkpoint_content.rs
index cd8c5bbf299..db44a808589 100644
--- a/crates/iota-types/src/full_checkpoint_content.rs
+++ b/crates/iota-types/src/full_checkpoint_content.rs
@@ -4,7 +4,6 @@
 
 use std::collections::BTreeMap;
 
-use itertools::Either;
 use serde::{Deserialize, Serialize};
 use tap::Pipe;
 
@@ -95,25 +94,8 @@ impl CheckpointTransaction {
     pub fn removed_objects_pre_version(&self) -> impl Iterator<Item = &Object> {
         // Iterator over id and versions for all deleted or wrapped objects
         match &self.effects {
-            TransactionEffects::V1(v1) => Either::Left(
-                // Effects v1 has deleted and wrapped objects versions as the "new" version, not
-                // the old one that was actually removed. So we need to take these
-                // and then look them up in the `modified_at_versions`.
-                // No need to chain unwrapped_then_deleted because these objects must have been
-                // wrapped before the transaction, hence they will not be in
-                // modified_at_versions / input_objects.
-                v1.deleted().iter().chain(v1.wrapped()).map(|(id, _, _)| {
-                    // lookup the old version for mutated objects
-                    let (_, old_version) = v1
-                        .modified_at_versions()
-                        .iter()
-                        .find(|(oid, _old_version)| oid == id)
-                        .expect("deleted/wrapped object must have entry in 'modified_at_versions'");
-                    (id, old_version)
-                }),
-            ),
-            TransactionEffects::V2(v2) => {
-                Either::Right(v2.changed_objects().iter().filter_map(|(id, change)| {
+            TransactionEffects::V1(v1) => {
+                v1.changed_objects().iter().filter_map(|(id, change)| {
                     match (
                         &change.input_state,
                         &change.output_state,
@@ -134,7 +116,7 @@ impl CheckpointTransaction {
                         ) => Some((id, version)),
                         _ => None,
                     }
-                }))
+                })
             }
         }
         // Use id and version to lookup in input Objects
@@ -156,24 +138,8 @@ impl CheckpointTransaction {
     pub fn changed_objects(&self) -> impl Iterator<Item = (&Object, Option<&Object>)> {
         // Iterator over ((ObjectId, new version), Option<old version>)
         match &self.effects {
-            TransactionEffects::V1(v1) => Either::Left(
-                v1.created()
-                    .iter()
-                    .chain(v1.unwrapped())
-                    .map(|((id, version, _), _)| ((id, version), None))
-                    .chain(v1.mutated().iter().map(|((id, version, _), _)| {
-                        // lookup the old version for mutated objects
-                        let (_, old_version) = v1
-                            .modified_at_versions()
-                            .iter()
-                            .find(|(oid, _old_version)| oid == id)
-                            .expect("mutated object must have entry in modified_at_versions");
-
-                        ((id, version), Some(old_version))
-                    })),
-            ),
-            TransactionEffects::V2(v2) => {
-                Either::Right(v2.changed_objects().iter().filter_map(|(id, change)| {
+            TransactionEffects::V1(v1) => {
+                v1.changed_objects().iter().filter_map(|(id, change)| {
                     match (
                         &change.input_state,
                         &change.output_state,
@@ -181,7 +147,7 @@ impl CheckpointTransaction {
                     ) {
                         // Created Objects
                         (ObjectIn::NotExist, ObjectOut::ObjectWrite(_), IDOperation::Created) => {
-                            Some(((id, &v2.lamport_version), None))
+                            Some(((id, &v1.lamport_version), None))
                         }
                         (
                             ObjectIn::NotExist,
@@ -191,12 +157,12 @@ impl CheckpointTransaction {
 
                         // Unwrapped Objects
                         (ObjectIn::NotExist, ObjectOut::ObjectWrite(_), IDOperation::None) => {
-                            Some(((id, &v2.lamport_version), None))
+                            Some(((id, &v1.lamport_version), None))
                         }
 
                         // Mutated Objects
                         (ObjectIn::Exist(((old_version, _), _)), ObjectOut::ObjectWrite(_), _) => {
-                            Some(((id, &v2.lamport_version), Some(old_version)))
+                            Some(((id, &v1.lamport_version), Some(old_version)))
                         }
                         (
                             ObjectIn::Exist(((old_version, _), _)),
@@ -206,7 +172,7 @@ impl CheckpointTransaction {
 
                         _ => None,
                     }
-                }))
+                })
             }
         }
         // Lookup Objects in output Objects as well as old versions for mutated objects
@@ -231,13 +197,8 @@ impl CheckpointTransaction {
     pub fn created_objects(&self) -> impl Iterator<Item = &Object> {
         // Iterator over (ObjectId, version) for created objects
         match &self.effects {
-            TransactionEffects::V1(v1) => Either::Left(
-                v1.created()
-                    .iter()
-                    .map(|((id, version, _), _)| (id, version)),
-            ),
-            TransactionEffects::V2(v2) => {
-                Either::Right(v2.changed_objects().iter().filter_map(|(id, change)| {
+            TransactionEffects::V1(v1) => {
+                v1.changed_objects().iter().filter_map(|(id, change)| {
                     match (
                         &change.input_state,
                         &change.output_state,
@@ -245,7 +206,7 @@ impl CheckpointTransaction {
                     ) {
                         // Created Objects
                         (ObjectIn::NotExist, ObjectOut::ObjectWrite(_), IDOperation::Created) => {
-                            Some((id, &v2.lamport_version))
+                            Some((id, &v1.lamport_version))
                         }
                         (
                             ObjectIn::NotExist,
@@ -255,7 +216,7 @@ impl CheckpointTransaction {
 
                         _ => None,
                     }
-                }))
+                })
             }
         }
         // Lookup Objects in output Objects as well as old versions for mutated objects
diff --git a/crates/iota-types/src/gas.rs b/crates/iota-types/src/gas.rs
index 9cad8bdf882..8df712a0797 100644
--- a/crates/iota-types/src/gas.rs
+++ b/crates/iota-types/src/gas.rs
@@ -19,10 +19,7 @@ pub mod checked {
         ObjectID,
         effects::{TransactionEffects, TransactionEffectsAPI},
         error::{ExecutionError, IotaResult, UserInputError, UserInputResult},
-        gas_model::{
-            gas_predicates::gas_price_too_high, gas_v2::IotaGasStatus as IotaGasStatusV2,
-            tables::GasStatus,
-        },
+        gas_model::{gas_v1::IotaGasStatus as IotaGasStatusV1, tables::GasStatus},
         iota_serde::{BigInt, Readable},
         object::Object,
         transaction::ObjectReadResult,
@@ -57,9 +54,7 @@ pub mod checked {
     #[enum_dispatch(IotaGasStatusAPI)]
     #[derive(Debug)]
     pub enum IotaGasStatus {
-        // V1 does not exists any longer as it was a pre mainnet version.
-        // So we start the enum from V2
-        V2(IotaGasStatusV2),
+        V1(IotaGasStatusV1),
     }
 
     impl IotaGasStatus {
@@ -80,15 +75,14 @@ pub mod checked {
                 }
                 .into());
             }
-            if gas_price_too_high(config.gas_model_version()) && gas_price >= config.max_gas_price()
-            {
+            if gas_price > config.max_gas_price() {
                 return Err(UserInputError::GasPriceTooHigh {
                     max_gas_price: config.max_gas_price(),
                 }
                 .into());
             }
 
-            Ok(Self::V2(IotaGasStatusV2::new_with_budget(
+            Ok(Self::V1(IotaGasStatusV1::new_with_budget(
                 gas_budget,
                 gas_price,
                 reference_gas_price,
@@ -97,7 +91,7 @@ pub mod checked {
         }
 
         pub fn new_unmetered() -> Self {
-            Self::V2(IotaGasStatusV2::new_unmetered())
+            Self::V1(IotaGasStatusV1::new_unmetered())
         }
 
         // This is the only public API on IotaGasStatus, all other gas related
@@ -108,7 +102,7 @@ pub mod checked {
             gas_budget: u64,
         ) -> UserInputResult {
             match self {
-                Self::V2(status) => status.check_gas_balance(gas_objs, gas_budget),
+                Self::V1(status) => status.check_gas_balance(gas_objs, gas_budget),
             }
         }
     }
diff --git a/crates/iota-types/src/gas_model/gas_predicates.rs b/crates/iota-types/src/gas_model/gas_predicates.rs
index 8117c30cb34..9dbbe50c16a 100644
--- a/crates/iota-types/src/gas_model/gas_predicates.rs
+++ b/crates/iota-types/src/gas_model/gas_predicates.rs
@@ -6,51 +6,9 @@
 // Predicates and utility functions based on gas versions.
 //
 
-use crate::gas_model::{
-    tables::{
-        initial_cost_schedule_v1, initial_cost_schedule_v2, initial_cost_schedule_v3,
-        initial_cost_schedule_v4, initial_cost_schedule_v5,
-    },
-    units_types::CostTable,
-};
-
-/// If true, do not charge the entire budget on storage OOG
-pub fn dont_charge_budget_on_storage_oog(gas_model_version: u64) -> bool {
-    gas_model_version >= 4
-}
-
-/// If true, enable the check for gas price too high
-pub fn gas_price_too_high(gas_model_version: u64) -> bool {
-    gas_model_version >= 4
-}
-
-/// If true, input object bytes are treated as memory allocated in Move and
-/// charged according to the bucket they end up in.
-pub fn charge_input_as_memory(gas_model_version: u64) -> bool {
-    gas_model_version == 4
-}
-
-/// If true, calculate value sizes using the legacy size calculation.
-pub fn use_legacy_abstract_size(gas_model_version: u64) -> bool {
-    gas_model_version <= 7
-}
-
-// If true, charge differently for package upgrades
-pub fn charge_upgrades(gas_model_version: u64) -> bool {
-    gas_model_version >= 7
-}
+use crate::gas_model::{tables::initial_cost_schedule_v1, units_types::CostTable};
 
 // Return the version supported cost table
-pub fn cost_table_for_version(gas_model: u64) -> CostTable {
-    if gas_model <= 3 {
-        initial_cost_schedule_v1()
-    } else if gas_model == 4 {
-        initial_cost_schedule_v2()
-    } else if gas_model == 5 {
-        initial_cost_schedule_v3()
-    } else if gas_model <= 7 {
-        initial_cost_schedule_v4()
-    } else {
-        initial_cost_schedule_v5()
-    }
+pub fn cost_table_for_version(_gas_model: u64) -> CostTable {
+    initial_cost_schedule_v1()
 }
diff --git a/crates/iota-types/src/gas_model/gas_v2.rs b/crates/iota-types/src/gas_model/gas_v1.rs
similarity index 100%
rename from crates/iota-types/src/gas_model/gas_v2.rs
rename to crates/iota-types/src/gas_model/gas_v1.rs
diff --git a/crates/iota-types/src/gas_model/mod.rs b/crates/iota-types/src/gas_model/mod.rs
index 8e61cdcbc3a..22abf53106c 100644
--- a/crates/iota-types/src/gas_model/mod.rs
+++ b/crates/iota-types/src/gas_model/mod.rs
@@ -3,6 +3,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 pub mod gas_predicates;
-pub mod gas_v2;
+pub mod gas_v1;
 pub mod tables;
 pub mod units_types;
diff --git a/crates/iota-types/src/gas_model/tables.rs b/crates/iota-types/src/gas_model/tables.rs
index c4da744fb7b..749a97c7e64 100644
--- a/crates/iota-types/src/gas_model/tables.rs
+++ b/crates/iota-types/src/gas_model/tables.rs
@@ -18,7 +18,6 @@ use move_vm_types::{
 };
 use once_cell::sync::Lazy;
 
-use super::gas_predicates::{charge_input_as_memory, use_legacy_abstract_size};
 use crate::gas_model::units_types::{CostTable, Gas, GasCost};
 
 /// VM flat fee
@@ -125,7 +124,7 @@ impl GasStatus {
     /// system code that does not have to charge the user.
     pub fn new_unmetered() -> Self {
         Self {
-            gas_model_version: 4,
+            gas_model_version: 1,
             gas_left: InternalGas::new(0),
             gas_price: 1,
             initial_budget: InternalGas::new(0),
@@ -322,21 +321,12 @@ impl GasStatus {
     // As more bytes are read throughout the computation the cost per bytes is
     // increased.
     pub fn charge_bytes(&mut self, size: usize, cost_per_byte: u64) -> PartialVMResult<()> {
-        let computation_cost = if charge_input_as_memory(self.gas_model_version) {
-            self.increase_stack_size(size as u64)?;
-            self.stack_size_current_tier_mult * size as u64 * cost_per_byte
-        } else {
-            size as u64 * cost_per_byte
-        };
+        let computation_cost = size as u64 * cost_per_byte;
         self.deduct_units(computation_cost)
     }
 
     fn abstract_memory_size(&self, val: impl ValueView) -> AbstractMemorySize {
-        if use_legacy_abstract_size(self.gas_model_version) {
-            val.legacy_abstract_memory_size()
-        } else {
-            val.abstract_memory_size()
-        }
+        val.abstract_memory_size()
     }
 
     pub fn gas_price(&self) -> u64 {
@@ -717,186 +707,6 @@ pub fn unit_cost_schedule() -> CostTable {
 }
 
 pub fn initial_cost_schedule_v1() -> CostTable {
-    let instruction_tiers: BTreeMap<u64, u64> = vec![
-        (0, 1),
-        (3000, 2),
-        (6000, 3),
-        (8000, 5),
-        (9000, 9),
-        (9500, 16),
-        (10000, 29),
-        (10500, 50),
-    ]
-    .into_iter()
-    .collect();
-
-    let stack_height_tiers: BTreeMap<u64, u64> = vec![
-        (0, 1),
-        (400, 2),
-        (800, 3),
-        (1200, 5),
-        (1500, 9),
-        (1800, 16),
-        (2000, 29),
-        (2200, 50),
-    ]
-    .into_iter()
-    .collect();
-
-    let stack_size_tiers: BTreeMap<u64, u64> = vec![
-        (0, 1),
-        (2000, 2),
-        (5000, 3),
-        (8000, 5),
-        (10000, 9),
-        (11000, 16),
-        (11500, 29),
-        (11500, 50),
-    ]
-    .into_iter()
-    .collect();
-
-    CostTable {
-        instruction_tiers,
-        stack_size_tiers,
-        stack_height_tiers,
-    }
-}
-
-pub fn initial_cost_schedule_v2() -> CostTable {
-    let instruction_tiers: BTreeMap<u64, u64> = vec![
-        (0, 1),
-        (3000, 2),
-        (6000, 3),
-        (8000, 5),
-        (9000, 9),
-        (9500, 16),
-        (10000, 29),
-        (10500, 50),
-        (12000, 150),
-        (15000, 250),
-    ]
-    .into_iter()
-    .collect();
-
-    let stack_height_tiers: BTreeMap<u64, u64> = vec![
-        (0, 1),
-        (400, 2),
-        (800, 3),
-        (1200, 5),
-        (1500, 9),
-        (1800, 16),
-        (2000, 29),
-        (2200, 50),
-        (3000, 150),
-        (5000, 250),
-    ]
-    .into_iter()
-    .collect();
-
-    let stack_size_tiers: BTreeMap<u64, u64> = vec![
-        (0, 1),
-        (2000, 2),
-        (5000, 3),
-        (8000, 5),
-        (10000, 9),
-        (11000, 16),
-        (11500, 29),
-        (11500, 50),
-        (15000, 150),
-        (20000, 250),
-    ]
-    .into_iter()
-    .collect();
-
-    CostTable {
-        instruction_tiers,
-        stack_size_tiers,
-        stack_height_tiers,
-    }
-}
-
-pub fn initial_cost_schedule_v3() -> CostTable {
-    let instruction_tiers: BTreeMap<u64, u64> = vec![
-        (0, 1),
-        (3000, 2),
-        (6000, 3),
-        (8000, 5),
-        (9000, 9),
-        (9500, 16),
-        (10000, 29),
-        (10500, 50),
-        (15000, 100),
-    ]
-    .into_iter()
-    .collect();
-
-    let stack_height_tiers: BTreeMap<u64, u64> = vec![
-        (0, 1),
-        (400, 2),
-        (800, 3),
-        (1200, 5),
-        (1500, 9),
-        (1800, 16),
-        (2000, 29),
-        (2200, 50),
-        (5000, 100),
-    ]
-    .into_iter()
-    .collect();
-
-    let stack_size_tiers: BTreeMap<u64, u64> = vec![
-        (0, 1),
-        (2000, 2),
-        (5000, 3),
-        (8000, 5),
-        (10000, 9),
-        (11000, 16),
-        (11500, 29),
-        (11500, 50),
-        (20000, 100),
-    ]
-    .into_iter()
-    .collect();
-
-    CostTable {
-        instruction_tiers,
-        stack_size_tiers,
-        stack_height_tiers,
-    }
-}
-
-pub fn initial_cost_schedule_v4() -> CostTable {
-    let instruction_tiers: BTreeMap<u64, u64> = vec![
-        (0, 1),
-        (20_000, 2),
-        (50_000, 10),
-        (100_000, 50),
-        (200_000, 100),
-    ]
-    .into_iter()
-    .collect();
-
-    let stack_height_tiers: BTreeMap<u64, u64> =
-        vec![(0, 1), (1_000, 2), (10_000, 10)].into_iter().collect();
-
-    let stack_size_tiers: BTreeMap<u64, u64> = vec![
-        (0, 1),
-        (100_000, 2),     // ~100K
-        (500_000, 5),     // ~500K
-        (1_000_000, 100), // ~1M
-    ]
-    .into_iter()
-    .collect();
-
-    CostTable {
-        instruction_tiers,
-        stack_size_tiers,
-        stack_height_tiers,
-    }
-}
-
-pub fn initial_cost_schedule_v5() -> CostTable {
     let instruction_tiers: BTreeMap<u64, u64> = vec![
         (0, 1),
         (20_000, 2),
@@ -934,7 +744,7 @@ pub fn initial_cost_schedule_v5() -> CostTable {
 // instead we perform this translation from our gas units and cost schedule to
 // the one expected by the Move unit tests.
 pub fn initial_cost_schedule_for_unit_tests() -> move_vm_test_utils::gas_schedule::CostTable {
-    let table = initial_cost_schedule_v5();
+    let table = initial_cost_schedule_v1();
     move_vm_test_utils::gas_schedule::CostTable {
         instruction_tiers: table.instruction_tiers.into_iter().collect(),
         stack_height_tiers: table.stack_height_tiers.into_iter().collect(),
diff --git a/crates/iota-types/src/in_memory_storage.rs b/crates/iota-types/src/in_memory_storage.rs
index a0632a46109..a06b711d4e6 100644
--- a/crates/iota-types/src/in_memory_storage.rs
+++ b/crates/iota-types/src/in_memory_storage.rs
@@ -10,14 +10,14 @@ use move_bytecode_utils::module_cache::GetModule;
 use move_core_types::{language_storage::ModuleId, resolver::ModuleResolver};
 
 use crate::{
-    base_types::{ObjectID, ObjectRef, SequenceNumber, VersionNumber},
+    base_types::{ObjectID, SequenceNumber, VersionNumber},
     committee::EpochId,
     error::{IotaError, IotaResult},
     inner_temporary_store::WrittenObjects,
     object::{Object, Owner},
     storage::{
-        BackingPackageStore, ChildObjectResolver, ObjectStore, PackageObject, ParentSync,
-        get_module, get_module_by_id, load_package_object_from_object_store,
+        BackingPackageStore, ChildObjectResolver, ObjectStore, PackageObject, get_module,
+        get_module_by_id, load_package_object_from_object_store,
     },
     transaction::{
         InputObjectKind, InputObjects, ObjectReadResult, Transaction, TransactionDataAPI,
@@ -87,15 +87,6 @@ impl ChildObjectResolver for InMemoryStorage {
     }
 }
 
-impl ParentSync for InMemoryStorage {
-    fn get_latest_parent_entry_ref_deprecated(
-        &self,
-        _object_id: ObjectID,
-    ) -> IotaResult<Option<ObjectRef>> {
-        unreachable!("Should not be called for InMemoryStorage as it's deprecated.")
-    }
-}
-
 impl ModuleResolver for InMemoryStorage {
     type Error = IotaError;
 
diff --git a/crates/iota-types/src/iota_sdk2_conversions.rs b/crates/iota-types/src/iota_sdk2_conversions.rs
index abb2301f486..dc79e3e6973 100644
--- a/crates/iota-types/src/iota_sdk2_conversions.rs
+++ b/crates/iota-types/src/iota_sdk2_conversions.rs
@@ -11,42 +11,1585 @@
 //! directly to avoid going through the BCS machinery.
 
 use fastcrypto::traits::ToFromBytes;
-use iota_sdk2::types::*;
+use iota_sdk2::types::{
+    object::{MovePackage, MoveStruct},
+    *,
+};
+use move_core_types::language_storage::ModuleId;
 
-use crate::crypto::AuthorityPublicKeyBytes;
+use crate::transaction::TransactionDataAPI as _;
 
-macro_rules! bcs_convert_impl {
-    ($core:ty, $external:ty) => {
-        impl From<$core> for $external {
-            fn from(value: $core) -> Self {
-                let bytes = bcs::to_bytes(&value).unwrap();
-                bcs::from_bytes(&bytes).unwrap()
+impl From<crate::object::Object> for Object {
+    fn from(value: crate::object::Object) -> Self {
+        Self {
+            data: value.data.clone().into(),
+            owner: value.owner.into(),
+            previous_transaction: value.previous_transaction.into(),
+            storage_rebate: value.storage_rebate,
+        }
+    }
+}
+
+impl From<Object> for crate::object::Object {
+    fn from(value: Object) -> Self {
+        Self::new_from_genesis(
+            value.data.into(),
+            value.owner.into(),
+            value.previous_transaction.into(),
+        )
+    }
+}
+
+impl From<crate::object::Data> for ObjectData {
+    fn from(value: crate::object::Data) -> Self {
+        match value {
+            crate::object::Data::Move(move_object) => Self::Struct(move_object_to_sdk(move_object)),
+            crate::object::Data::Package(move_package) => {
+                Self::Package(move_package_to_sdk(move_package))
             }
         }
+    }
+}
+
+impl From<ObjectData> for crate::object::Data {
+    fn from(value: ObjectData) -> Self {
+        match value {
+            ObjectData::Struct(move_object) => Self::Move(sdk_object_to_move(move_object)),
+            ObjectData::Package(move_package) => Self::Package(sdk_package_to_move(move_package)),
+        }
+    }
+}
 
-        impl From<$external> for $core {
-            fn from(value: $external) -> Self {
-                let bytes = bcs::to_bytes(&value).unwrap();
-                bcs::from_bytes(&bytes).unwrap()
+fn move_type_tag_to_sdk(tt: move_core_types::language_storage::TypeTag) -> TypeTag {
+    use move_core_types::language_storage::TypeTag as MoveTypeTag;
+    match tt {
+        MoveTypeTag::Bool => TypeTag::Bool,
+        MoveTypeTag::U8 => TypeTag::U8,
+        MoveTypeTag::U64 => TypeTag::U64,
+        MoveTypeTag::U128 => TypeTag::U128,
+        MoveTypeTag::Address => TypeTag::Address,
+        MoveTypeTag::Signer => TypeTag::Signer,
+        MoveTypeTag::Vector(type_tag) => TypeTag::Vector(Box::new(move_type_tag_to_sdk(*type_tag))),
+        MoveTypeTag::Struct(struct_tag) => {
+            TypeTag::Struct(Box::new(move_struct_tag_to_sdk(*struct_tag)))
+        }
+        MoveTypeTag::U16 => TypeTag::U16,
+        MoveTypeTag::U32 => TypeTag::U32,
+        MoveTypeTag::U256 => TypeTag::U256,
+    }
+}
+
+fn move_struct_tag_to_sdk(st: move_core_types::language_storage::StructTag) -> StructTag {
+    StructTag {
+        address: Address::new(st.address.into_bytes()),
+        module: Identifier::new(st.module.as_str()).expect("module identifier conversion failed"),
+        name: Identifier::new(st.name.as_str()).expect("struct name identifier conversion failed"),
+        type_params: st
+            .type_params
+            .into_iter()
+            .map(move_type_tag_to_sdk)
+            .collect(),
+    }
+}
+
+fn move_package_to_sdk(package: crate::move_package::MovePackage) -> MovePackage {
+    MovePackage {
+        id: package.id().into(),
+        version: package.version().value(),
+        modules: package
+            .module_map
+            .into_iter()
+            .map(|(name, bytes)| {
+                (
+                    Identifier::new(name).expect("package name identifier conversion failed"),
+                    bytes,
+                )
+            })
+            .collect(),
+        type_origin_table: package
+            .type_origin_table
+            .into_iter()
+            .map(move_type_origin_to_sdk)
+            .collect(),
+        linkage_table: package
+            .linkage_table
+            .into_iter()
+            .map(|(id, info)| (id.into(), move_upgrade_info_to_sdk(info)))
+            .collect(),
+    }
+}
+
+fn sdk_package_to_move(package: MovePackage) -> crate::move_package::MovePackage {
+    crate::move_package::MovePackage {
+        id: package.id.into(),
+        version: package.version.into(),
+        module_map: package
+            .modules
+            .into_iter()
+            .map(|(name, bytes)| (name.to_string(), bytes))
+            .collect(),
+        type_origin_table: package
+            .type_origin_table
+            .into_iter()
+            .map(sdk_type_origin_to_move)
+            .collect(),
+        linkage_table: package
+            .linkage_table
+            .into_iter()
+            .map(|(id, info)| (id.into(), sdk_upgrade_info_to_move(info)))
+            .collect(),
+    }
+}
+
+fn move_object_to_sdk(obj: crate::object::MoveObject) -> MoveStruct {
+    MoveStruct {
+        type_: move_object_type_to_sdk(obj.type_),
+        has_public_transfer: obj.has_public_transfer,
+        version: obj.version.value(),
+        contents: obj.contents,
+    }
+}
+
+fn sdk_object_to_move(obj: MoveStruct) -> crate::object::MoveObject {
+    crate::object::MoveObject {
+        type_: sdk_object_type_to_move(obj.type_),
+        has_public_transfer: obj.has_public_transfer,
+        version: obj.version.into(),
+        contents: obj.contents,
+    }
+}
+
+fn move_object_type_to_sdk(type_: crate::base_types::MoveObjectType) -> StructTag {
+    move_struct_tag_to_sdk(move_core_types::language_storage::StructTag {
+        address: type_.address(),
+        module: type_.module().to_owned(),
+        name: type_.name().to_owned(),
+        type_params: type_.type_params(),
+    })
+}
+
+fn sdk_object_type_to_move(type_: StructTag) -> crate::base_types::MoveObjectType {
+    crate::base_types::MoveObjectType::from(move_core_types::language_storage::StructTag {
+        address: move_core_types::account_address::AccountAddress::new(type_.address.into_inner()),
+        module: crate::Identifier::new(type_.module.as_str())
+            .expect("struct module name conversion failed"),
+        name: crate::Identifier::new(type_.name.as_str()).expect("struct name conversion failed"),
+        type_params: type_
+            .type_params
+            .into_iter()
+            .map(type_tag_sdk_to_core)
+            .collect(),
+    })
+}
+
+fn move_type_origin_to_sdk(origin: crate::move_package::TypeOrigin) -> TypeOrigin {
+    TypeOrigin {
+        module_name: Identifier::new(&origin.module_name)
+            .expect("module identifier conversion failed"),
+        struct_name: Identifier::new(&origin.datatype_name)
+            .expect("struct identifier conversion failed"),
+        package: origin.package.into(),
+    }
+}
+
+fn sdk_type_origin_to_move(origin: TypeOrigin) -> crate::move_package::TypeOrigin {
+    crate::move_package::TypeOrigin {
+        module_name: origin.module_name.to_string(),
+        datatype_name: origin.struct_name.to_string(),
+        package: origin.package.into(),
+    }
+}
+
+fn move_upgrade_info_to_sdk(info: crate::move_package::UpgradeInfo) -> UpgradeInfo {
+    UpgradeInfo {
+        upgraded_id: info.upgraded_id.into(),
+        upgraded_version: info.upgraded_version.value(),
+    }
+}
+
+fn sdk_upgrade_info_to_move(info: UpgradeInfo) -> crate::move_package::UpgradeInfo {
+    crate::move_package::UpgradeInfo {
+        upgraded_id: info.upgraded_id.into(),
+        upgraded_version: info.upgraded_version.into(),
+    }
+}
+
+impl From<crate::transaction::TransactionData> for Transaction {
+    fn from(value: crate::transaction::TransactionData) -> Self {
+        Self {
+            sender: Address::new(value.sender().to_inner()),
+            gas_payment: GasPayment {
+                objects: value
+                    .gas()
+                    .iter()
+                    .map(|(id, seq, digest)| {
+                        ObjectReference::new((*id).into(), seq.value(), (*digest).into())
+                    })
+                    .collect(),
+                owner: Address::new(value.gas_data().owner.to_inner()),
+                price: value.gas_data().price,
+                budget: value.gas_data().budget,
+            },
+            expiration: match value.expiration() {
+                crate::transaction::TransactionExpiration::None => TransactionExpiration::None,
+                crate::transaction::TransactionExpiration::Epoch(e) => {
+                    TransactionExpiration::Epoch(*e)
+                }
+            },
+            kind: value.into_kind().into(),
+        }
+    }
+}
+
+impl From<Transaction> for crate::transaction::TransactionData {
+    fn from(value: Transaction) -> Self {
+        Self::new_with_gas_data(
+            value.kind.into(),
+            value.sender.into(),
+            crate::transaction::GasData {
+                payment: value
+                    .gas_payment
+                    .objects
+                    .into_iter()
+                    .map(ObjectReference::into_parts)
+                    .map(|(id, seq, digest)| (id.into(), seq.into(), digest.into()))
+                    .collect(),
+                owner: value.gas_payment.owner.into(),
+                price: value.gas_payment.price,
+                budget: value.gas_payment.budget,
+            },
+        )
+    }
+}
+
+impl From<crate::transaction::TransactionKind> for TransactionKind {
+    fn from(value: crate::transaction::TransactionKind) -> Self {
+        use crate::transaction::TransactionKind as InternalTxnKind;
+        match value {
+            InternalTxnKind::ProgrammableTransaction(programmable_transaction) => {
+                TransactionKind::ProgrammableTransaction(ProgrammableTransaction {
+                    inputs: programmable_transaction
+                        .inputs
+                        .into_iter()
+                        .map(Into::into)
+                        .collect(),
+                    commands: programmable_transaction
+                        .commands
+                        .into_iter()
+                        .map(Into::into)
+                        .collect(),
+                })
+            }
+            InternalTxnKind::Genesis(genesis_transaction) => {
+                TransactionKind::Genesis(GenesisTransaction {
+                    objects: genesis_transaction
+                        .objects
+                        .into_iter()
+                        .map(|obj| match obj {
+                            crate::transaction::GenesisObject::RawObject { data, owner } => {
+                                GenesisObject {
+                                    data: data.into(),
+                                    owner: owner.into(),
+                                }
+                            }
+                        })
+                        .collect(),
+                    events: genesis_transaction
+                        .events
+                        .into_iter()
+                        .map(|event| Event {
+                            package_id: event.package_id.into(),
+                            module: Identifier::new(event.transaction_module.as_str())
+                                .expect("invalid transaction module"),
+                            sender: event.sender.into(),
+                            type_: struct_tag_core_to_sdk(event.type_),
+                            contents: event.contents,
+                        })
+                        .collect(),
+                })
+            }
+            InternalTxnKind::ConsensusCommitPrologueV1(consensus_commit_prologue_v1) => {
+                let consensus_determined_version_assignments = match consensus_commit_prologue_v1.consensus_determined_version_assignments {
+                    crate::messages_consensus::ConsensusDeterminedVersionAssignments::CancelledTransactions(vec) =>
+                        ConsensusDeterminedVersionAssignments::CancelledTransactions {
+                            cancelled_transactions: vec.into_iter().map(|value| CancelledTransaction {
+                                digest: value.0.into(),
+                                version_assignments:
+                                    value
+                                        .1
+                                        .into_iter()
+                                        .map(|value| VersionAssignment { object_id: value.0.into(), version: value.1.value() })
+                                        .collect(),
+                            }).collect()
+                        },
+                };
+                TransactionKind::ConsensusCommitPrologueV1(ConsensusCommitPrologueV1 {
+                    epoch: consensus_commit_prologue_v1.epoch,
+                    round: consensus_commit_prologue_v1.round,
+                    sub_dag_index: consensus_commit_prologue_v1.sub_dag_index,
+                    commit_timestamp_ms: consensus_commit_prologue_v1.commit_timestamp_ms,
+                    consensus_commit_digest: consensus_commit_prologue_v1
+                        .consensus_commit_digest
+                        .into(),
+                    consensus_determined_version_assignments,
+                })
+            }
+            InternalTxnKind::AuthenticatorStateUpdateV1(authenticator_state_update_v1) => {
+                TransactionKind::AuthenticatorStateUpdateV1(AuthenticatorStateUpdateV1 {
+                    epoch: authenticator_state_update_v1.epoch,
+                    round: authenticator_state_update_v1.round,
+                    new_active_jwks: authenticator_state_update_v1
+                        .new_active_jwks
+                        .into_iter()
+                        .map(|jwk| ActiveJwk {
+                            jwk_id: JwkId {
+                                iss: jwk.jwk_id.iss,
+                                kid: jwk.jwk_id.kid,
+                            },
+                            jwk: Jwk {
+                                kty: jwk.jwk.kty,
+                                e: jwk.jwk.e,
+                                n: jwk.jwk.n,
+                                alg: jwk.jwk.alg,
+                            },
+                            epoch: jwk.epoch,
+                        })
+                        .collect(),
+                    authenticator_obj_initial_shared_version: authenticator_state_update_v1
+                        .authenticator_obj_initial_shared_version
+                        .value(),
+                })
+            }
+            InternalTxnKind::EndOfEpochTransaction(vec) => {
+                TransactionKind::EndOfEpoch(vec.into_iter().map(Into::into).collect())
+            }
+            InternalTxnKind::RandomnessStateUpdate(randomness_state_update) => {
+                TransactionKind::RandomnessStateUpdate(RandomnessStateUpdate {
+                    epoch: randomness_state_update.epoch,
+                    randomness_round: randomness_state_update.randomness_round.0,
+                    random_bytes: randomness_state_update.random_bytes,
+                    randomness_obj_initial_shared_version: randomness_state_update
+                        .randomness_obj_initial_shared_version
+                        .value(),
+                })
+            }
+        }
+    }
+}
+
+impl From<TransactionKind> for crate::transaction::TransactionKind {
+    fn from(value: TransactionKind) -> Self {
+        match value {
+            TransactionKind::ProgrammableTransaction(programmable_transaction) => {
+                Self::ProgrammableTransaction(crate::transaction::ProgrammableTransaction {
+                    inputs: programmable_transaction
+                        .inputs
+                        .into_iter()
+                        .map(Into::into)
+                        .collect(),
+                    commands: programmable_transaction
+                        .commands
+                        .into_iter()
+                        .map(Into::into)
+                        .collect(),
+                })
+            }
+            TransactionKind::Genesis(genesis_transaction) => {
+                Self::Genesis(crate::transaction::GenesisTransaction {
+                    objects: genesis_transaction
+                        .objects
+                        .into_iter()
+                        .map(|obj| crate::transaction::GenesisObject::RawObject {
+                            data: obj.data.into(),
+                            owner: obj.owner.into(),
+                        })
+                        .collect(),
+                    events: genesis_transaction
+                        .events
+                        .into_iter()
+                        .map(|event| crate::event::Event {
+                            package_id: event.package_id.into(),
+                            transaction_module: crate::Identifier::new(event.module.as_str())
+                                .expect("invalid transaction module"),
+                            sender: event.sender.into(),
+                            type_: struct_tag_sdk_to_core(event.type_),
+                            contents: event.contents,
+                        })
+                        .collect(),
+                })
+            }
+            TransactionKind::ConsensusCommitPrologueV1(consensus_commit_prologue_v1) => {
+                let consensus_determined_version_assignments = match consensus_commit_prologue_v1.consensus_determined_version_assignments {
+                    ConsensusDeterminedVersionAssignments::CancelledTransactions{ cancelled_transactions } =>
+                    crate::messages_consensus::ConsensusDeterminedVersionAssignments::CancelledTransactions(
+                        cancelled_transactions.into_iter().map(|value|
+                            (
+                                value.digest.into(),
+                                value
+                                    .version_assignments
+                                    .into_iter()
+                                    .map(|value| (value.object_id.into(), value.version.into()))
+                                    .collect()
+                            )
+                        ).collect()
+                    ),
+                };
+                Self::ConsensusCommitPrologueV1(
+                    crate::messages_consensus::ConsensusCommitPrologueV1 {
+                        epoch: consensus_commit_prologue_v1.epoch,
+                        round: consensus_commit_prologue_v1.round,
+                        sub_dag_index: consensus_commit_prologue_v1.sub_dag_index,
+                        commit_timestamp_ms: consensus_commit_prologue_v1.commit_timestamp_ms,
+                        consensus_commit_digest: consensus_commit_prologue_v1
+                            .consensus_commit_digest
+                            .into(),
+                        consensus_determined_version_assignments,
+                    },
+                )
+            }
+            TransactionKind::AuthenticatorStateUpdateV1(authenticator_state_update_v1) => {
+                Self::AuthenticatorStateUpdateV1(crate::transaction::AuthenticatorStateUpdateV1 {
+                    epoch: authenticator_state_update_v1.epoch,
+                    round: authenticator_state_update_v1.round,
+                    new_active_jwks: authenticator_state_update_v1
+                        .new_active_jwks
+                        .into_iter()
+                        .map(|jwk| crate::authenticator_state::ActiveJwk {
+                            jwk_id: crate::authenticator_state::JwkId {
+                                iss: jwk.jwk_id.iss,
+                                kid: jwk.jwk_id.kid,
+                            },
+                            jwk: crate::authenticator_state::JWK {
+                                kty: jwk.jwk.kty,
+                                e: jwk.jwk.e,
+                                n: jwk.jwk.n,
+                                alg: jwk.jwk.alg,
+                            },
+                            epoch: jwk.epoch,
+                        })
+                        .collect(),
+                    authenticator_obj_initial_shared_version: authenticator_state_update_v1
+                        .authenticator_obj_initial_shared_version
+                        .into(),
+                })
+            }
+            TransactionKind::EndOfEpoch(vec) => {
+                Self::EndOfEpochTransaction(vec.into_iter().map(Into::into).collect())
+            }
+            TransactionKind::RandomnessStateUpdate(randomness_state_update) => {
+                Self::RandomnessStateUpdate(crate::transaction::RandomnessStateUpdate {
+                    epoch: randomness_state_update.epoch,
+                    randomness_round: crate::crypto::RandomnessRound(
+                        randomness_state_update.randomness_round,
+                    ),
+                    random_bytes: randomness_state_update.random_bytes,
+                    randomness_obj_initial_shared_version: randomness_state_update
+                        .randomness_obj_initial_shared_version
+                        .into(),
+                })
+            }
+        }
+    }
+}
+
+impl From<crate::transaction::EndOfEpochTransactionKind> for EndOfEpochTransactionKind {
+    fn from(value: crate::transaction::EndOfEpochTransactionKind) -> Self {
+        match value {
+            crate::transaction::EndOfEpochTransactionKind::ChangeEpoch(change_epoch) => {
+                EndOfEpochTransactionKind::ChangeEpoch(ChangeEpoch {
+                    epoch: change_epoch.epoch,
+                    protocol_version: change_epoch.protocol_version.as_u64(),
+                    storage_charge: change_epoch.storage_charge,
+                    computation_charge: change_epoch.computation_charge,
+                    storage_rebate: change_epoch.storage_rebate,
+                    non_refundable_storage_fee: change_epoch.non_refundable_storage_fee,
+                    epoch_start_timestamp_ms: change_epoch.epoch_start_timestamp_ms,
+                    system_packages: change_epoch
+                        .system_packages
+                        .into_iter()
+                        .map(|(version, modules, dependencies)| SystemPackage {
+                            version: version.value(),
+                            modules,
+                            dependencies: dependencies.into_iter().map(Into::into).collect(),
+                        })
+                        .collect(),
+                })
+            }
+            crate::transaction::EndOfEpochTransactionKind::AuthenticatorStateCreate => {
+                EndOfEpochTransactionKind::AuthenticatorStateCreate
+            }
+            crate::transaction::EndOfEpochTransactionKind::AuthenticatorStateExpire(
+                authenticator_state_expire,
+            ) => EndOfEpochTransactionKind::AuthenticatorStateExpire(AuthenticatorStateExpire {
+                min_epoch: authenticator_state_expire.min_epoch,
+                authenticator_obj_initial_shared_version: authenticator_state_expire
+                    .authenticator_obj_initial_shared_version
+                    .value(),
+            }),
+            crate::transaction::EndOfEpochTransactionKind::BridgeStateCreate(chain_identifier) => {
+                EndOfEpochTransactionKind::BridgeStateCreate {
+                    chain_id: CheckpointDigest::new(chain_identifier.digest().into()),
+                }
+            }
+            crate::transaction::EndOfEpochTransactionKind::BridgeCommitteeInit(sequence_number) => {
+                EndOfEpochTransactionKind::BridgeCommitteeInit {
+                    bridge_object_version: sequence_number.value(),
+                }
+            }
+        }
+    }
+}
+
+impl From<EndOfEpochTransactionKind> for crate::transaction::EndOfEpochTransactionKind {
+    fn from(value: EndOfEpochTransactionKind) -> Self {
+        match value {
+            EndOfEpochTransactionKind::ChangeEpoch(change_epoch) => {
+                Self::ChangeEpoch(crate::transaction::ChangeEpoch {
+                    epoch: change_epoch.epoch,
+                    protocol_version: change_epoch.protocol_version.into(),
+                    storage_charge: change_epoch.storage_charge,
+                    computation_charge: change_epoch.computation_charge,
+                    storage_rebate: change_epoch.storage_rebate,
+                    non_refundable_storage_fee: change_epoch.non_refundable_storage_fee,
+                    epoch_start_timestamp_ms: change_epoch.epoch_start_timestamp_ms,
+                    system_packages: change_epoch
+                        .system_packages
+                        .into_iter()
+                        .map(|package| {
+                            (
+                                package.version.into(),
+                                package.modules,
+                                package.dependencies.into_iter().map(Into::into).collect(),
+                            )
+                        })
+                        .collect(),
+                })
+            }
+            EndOfEpochTransactionKind::AuthenticatorStateCreate => Self::AuthenticatorStateCreate,
+            EndOfEpochTransactionKind::AuthenticatorStateExpire(authenticator_state_expire) => {
+                Self::AuthenticatorStateExpire(crate::transaction::AuthenticatorStateExpire {
+                    min_epoch: authenticator_state_expire.min_epoch,
+                    authenticator_obj_initial_shared_version: authenticator_state_expire
+                        .authenticator_obj_initial_shared_version
+                        .into(),
+                })
+            }
+            EndOfEpochTransactionKind::BridgeStateCreate { chain_id } => {
+                Self::BridgeStateCreate(crate::digests::ChainIdentifier(chain_id.into()))
+            }
+            EndOfEpochTransactionKind::BridgeCommitteeInit {
+                bridge_object_version,
+            } => Self::BridgeCommitteeInit(bridge_object_version.into()),
+        }
+    }
+}
+
+impl From<crate::transaction::CallArg> for InputArgument {
+    fn from(value: crate::transaction::CallArg) -> Self {
+        match value {
+            crate::transaction::CallArg::Pure(vec) => Self::Pure { value: vec },
+            crate::transaction::CallArg::Object(object_arg) => match object_arg {
+                crate::transaction::ObjectArg::ImmOrOwnedObject(obj_ref) => {
+                    Self::ImmutableOrOwned(core_obj_ref_to_sdk(obj_ref))
+                }
+                crate::transaction::ObjectArg::SharedObject {
+                    id,
+                    initial_shared_version,
+                    mutable,
+                } => Self::Shared {
+                    object_id: id.into(),
+                    initial_shared_version: initial_shared_version.value(),
+                    mutable,
+                },
+                crate::transaction::ObjectArg::Receiving(obj_ref) => {
+                    Self::Receiving(core_obj_ref_to_sdk(obj_ref))
+                }
+            },
+        }
+    }
+}
+
+impl From<InputArgument> for crate::transaction::CallArg {
+    fn from(value: InputArgument) -> Self {
+        use crate::transaction::ObjectArg;
+        match value {
+            InputArgument::Pure { value } => Self::Pure(value),
+            InputArgument::ImmutableOrOwned(object_reference) => Self::Object(
+                ObjectArg::ImmOrOwnedObject(sdk_obj_ref_to_core(object_reference)),
+            ),
+            InputArgument::Shared {
+                object_id,
+                initial_shared_version,
+                mutable,
+            } => Self::Object(ObjectArg::SharedObject {
+                id: object_id.into(),
+                initial_shared_version: initial_shared_version.into(),
+                mutable,
+            }),
+            InputArgument::Receiving(object_reference) => {
+                Self::Object(ObjectArg::Receiving(sdk_obj_ref_to_core(object_reference)))
+            }
+        }
+    }
+}
+
+fn core_obj_ref_to_sdk(obj_ref: crate::base_types::ObjectRef) -> ObjectReference {
+    ObjectReference::new(obj_ref.0.into(), obj_ref.1.value(), obj_ref.2.into())
+}
+
+fn sdk_obj_ref_to_core(obj_ref: ObjectReference) -> crate::base_types::ObjectRef {
+    let (id, seq, digest) = obj_ref.into_parts();
+    (id.into(), seq.into(), digest.into())
+}
+
+impl From<crate::effects::TransactionEffects> for TransactionEffects {
+    fn from(value: crate::effects::TransactionEffects) -> Self {
+        match value {
+            crate::effects::TransactionEffects::V1(effects) => {
+                Self::V1(Box::new(TransactionEffectsV1 {
+                    epoch: effects.executed_epoch,
+                    gas_used: GasCostSummary::new(
+                        effects.gas_used.computation_cost,
+                        effects.gas_used.storage_cost,
+                        effects.gas_used.storage_rebate,
+                        effects.gas_used.non_refundable_storage_fee,
+                    ),
+                    gas_object_index: effects.gas_object_index,
+                    transaction_digest: effects.transaction_digest.into(),
+                    events_digest: effects.events_digest.map(Into::into),
+                    dependencies: effects.dependencies.into_iter().map(Into::into).collect(),
+                    lamport_version: effects.lamport_version.value(),
+                    changed_objects: effects
+                        .changed_objects
+                        .into_iter()
+                        .map(|(id, change)| ChangedObject {
+                            object_id: id.into(),
+                            change: EffectsObjectChange {
+                                input_state: match change.input_state {
+                                    crate::effects::ObjectIn::NotExist => ObjectIn::NotExist,
+                                    crate::effects::ObjectIn::Exist(((version, digest), owner)) => {
+                                        ObjectIn::Exist {
+                                            version: version.value(),
+                                            digest: digest.into(),
+                                            owner: owner.into(),
+                                        }
+                                    }
+                                },
+                                output_state: match change.output_state {
+                                    crate::effects::ObjectOut::NotExist => ObjectOut::NotExist,
+                                    crate::effects::ObjectOut::ObjectWrite((digest, owner)) => {
+                                        ObjectOut::ObjectWrite {
+                                            digest: digest.into(),
+                                            owner: owner.into(),
+                                        }
+                                    }
+                                    crate::effects::ObjectOut::PackageWrite((seq, digest)) => {
+                                        ObjectOut::PackageWrite {
+                                            version: seq.value(),
+                                            digest: digest.into(),
+                                        }
+                                    }
+                                },
+                                id_operation: match change.id_operation {
+                                    crate::effects::IDOperation::None => IdOperation::None,
+                                    crate::effects::IDOperation::Created => IdOperation::Created,
+                                    crate::effects::IDOperation::Deleted => IdOperation::Deleted,
+                                },
+                            },
+                        })
+                        .collect(),
+                    unchanged_shared_objects: effects
+                        .unchanged_shared_objects
+                        .into_iter()
+                        .map(|(id, kind)| UnchangedSharedObject {
+                            object_id: id.into(),
+                            kind: match kind {
+                                crate::effects::UnchangedSharedKind::ReadOnlyRoot((
+                                    version,
+                                    digest,
+                                )) => UnchangedSharedKind::ReadOnlyRoot {
+                                    version: version.value(),
+                                    digest: digest.into(),
+                                },
+                                crate::effects::UnchangedSharedKind::MutateDeleted(
+                                    sequence_number,
+                                ) => UnchangedSharedKind::MutateDeleted {
+                                    version: sequence_number.value(),
+                                },
+                                crate::effects::UnchangedSharedKind::ReadDeleted(
+                                    sequence_number,
+                                ) => UnchangedSharedKind::ReadDeleted {
+                                    version: sequence_number.value(),
+                                },
+                                crate::effects::UnchangedSharedKind::Cancelled(sequence_number) => {
+                                    UnchangedSharedKind::Cancelled {
+                                        version: sequence_number.value(),
+                                    }
+                                }
+                                crate::effects::UnchangedSharedKind::PerEpochConfig => {
+                                    UnchangedSharedKind::PerEpochConfig
+                                }
+                            },
+                        })
+                        .collect(),
+                    auxiliary_data_digest: effects.aux_data_digest.map(Into::into),
+                    status: effects.status.into(),
+                }))
+            }
+        }
+    }
+}
+
+impl From<TransactionEffects> for crate::effects::TransactionEffects {
+    fn from(value: TransactionEffects) -> Self {
+        match value {
+            TransactionEffects::V1(transaction_effects_v1) => {
+                crate::effects::effects_v1::TransactionEffectsV1 {
+                    status: transaction_effects_v1.status.into(),
+                    executed_epoch: transaction_effects_v1.epoch,
+                    gas_used: crate::gas::GasCostSummary::new(
+                        transaction_effects_v1.gas_used.computation_cost,
+                        transaction_effects_v1.gas_used.storage_cost,
+                        transaction_effects_v1.gas_used.storage_rebate,
+                        transaction_effects_v1.gas_used.non_refundable_storage_fee,
+                    ),
+                    transaction_digest: transaction_effects_v1.transaction_digest.into(),
+                    gas_object_index: transaction_effects_v1.gas_object_index,
+                    events_digest: transaction_effects_v1.events_digest.map(Into::into),
+                    dependencies: transaction_effects_v1
+                        .dependencies
+                        .into_iter()
+                        .map(Into::into)
+                        .collect(),
+                    lamport_version: transaction_effects_v1.lamport_version.into(),
+                    changed_objects: transaction_effects_v1
+                        .changed_objects
+                        .into_iter()
+                        .map(|obj| {
+                            (obj.object_id.into(), crate::effects::EffectsObjectChange {
+                                input_state: match obj.change.input_state {
+                                    ObjectIn::NotExist => crate::effects::ObjectIn::NotExist,
+                                    ObjectIn::Exist {
+                                        version,
+                                        digest,
+                                        owner,
+                                    } => crate::effects::ObjectIn::Exist((
+                                        (version.into(), digest.into()),
+                                        owner.into(),
+                                    )),
+                                },
+                                output_state: match obj.change.output_state {
+                                    ObjectOut::NotExist => crate::effects::ObjectOut::NotExist,
+                                    ObjectOut::ObjectWrite { digest, owner } => {
+                                        crate::effects::ObjectOut::ObjectWrite((
+                                            digest.into(),
+                                            owner.into(),
+                                        ))
+                                    }
+                                    ObjectOut::PackageWrite { version, digest } => {
+                                        crate::effects::ObjectOut::PackageWrite((
+                                            version.into(),
+                                            digest.into(),
+                                        ))
+                                    }
+                                },
+                                id_operation: match obj.change.id_operation {
+                                    IdOperation::None => crate::effects::IDOperation::None,
+                                    IdOperation::Created => crate::effects::IDOperation::Created,
+                                    IdOperation::Deleted => crate::effects::IDOperation::Deleted,
+                                },
+                            })
+                        })
+                        .collect(),
+                    unchanged_shared_objects: transaction_effects_v1
+                        .unchanged_shared_objects
+                        .into_iter()
+                        .map(|obj| {
+                            (obj.object_id.into(), match obj.kind {
+                                UnchangedSharedKind::ReadOnlyRoot { version, digest } => {
+                                    crate::effects::UnchangedSharedKind::ReadOnlyRoot((
+                                        version.into(),
+                                        digest.into(),
+                                    ))
+                                }
+                                UnchangedSharedKind::MutateDeleted { version } => {
+                                    crate::effects::UnchangedSharedKind::MutateDeleted(
+                                        version.into(),
+                                    )
+                                }
+                                UnchangedSharedKind::ReadDeleted { version } => {
+                                    crate::effects::UnchangedSharedKind::ReadDeleted(version.into())
+                                }
+                                UnchangedSharedKind::Cancelled { version } => {
+                                    crate::effects::UnchangedSharedKind::Cancelled(version.into())
+                                }
+                                UnchangedSharedKind::PerEpochConfig => {
+                                    crate::effects::UnchangedSharedKind::PerEpochConfig
+                                }
+                            })
+                        })
+                        .collect(),
+                    aux_data_digest: transaction_effects_v1.auxiliary_data_digest.map(Into::into),
+                }
+                .into()
+            }
+        }
+    }
+}
+
+macro_rules! impl_convert_digest {
+    ($name:ident) => {
+        impl From<crate::digests::$name> for $name {
+            fn from(value: crate::digests::$name) -> Self {
+                Self::new(value.into_inner())
+            }
+        }
+
+        impl From<$name> for crate::digests::$name {
+            fn from(value: $name) -> Self {
+                Self::new(value.into_inner())
             }
         }
     };
 }
 
-bcs_convert_impl!(crate::object::Object, Object);
-bcs_convert_impl!(crate::transaction::TransactionData, Transaction);
-bcs_convert_impl!(crate::effects::TransactionEffects, TransactionEffects);
-bcs_convert_impl!(
-    crate::messages_checkpoint::CheckpointContents,
-    CheckpointContents
-);
-bcs_convert_impl!(
-    crate::full_checkpoint_content::CheckpointData,
-    CheckpointData
-);
-bcs_convert_impl!(crate::signature::GenericSignature, UserSignature);
-bcs_convert_impl!(crate::effects::TransactionEvents, TransactionEvents);
-bcs_convert_impl!(crate::transaction::Command, Command);
+impl_convert_digest!(Digest);
+impl_convert_digest!(ObjectDigest);
+impl_convert_digest!(CheckpointDigest);
+impl_convert_digest!(TransactionDigest);
+impl_convert_digest!(TransactionEffectsDigest);
+impl_convert_digest!(TransactionEventsDigest);
+impl_convert_digest!(CheckpointContentsDigest);
+impl_convert_digest!(ConsensusCommitDigest);
+
+impl From<crate::digests::EffectsAuxDataDigest> for EffectsAuxiliaryDataDigest {
+    fn from(value: crate::digests::EffectsAuxDataDigest) -> Self {
+        Self::new(value.into_inner())
+    }
+}
+
+impl From<EffectsAuxiliaryDataDigest> for crate::digests::EffectsAuxDataDigest {
+    fn from(value: EffectsAuxiliaryDataDigest) -> Self {
+        Self::new(value.into_inner())
+    }
+}
+
+impl From<crate::execution_status::ExecutionStatus> for ExecutionStatus {
+    fn from(value: crate::execution_status::ExecutionStatus) -> Self {
+        match value {
+            crate::execution_status::ExecutionStatus::Success => Self::Success,
+            crate::execution_status::ExecutionStatus::Failure { error, command } => Self::Failure {
+                error: error.into(),
+                command: command.map(|v| v as u64),
+            },
+        }
+    }
+}
+
+impl From<ExecutionStatus> for crate::execution_status::ExecutionStatus {
+    fn from(value: ExecutionStatus) -> Self {
+        match value {
+            ExecutionStatus::Success => Self::Success,
+            ExecutionStatus::Failure { error, command } => Self::Failure {
+                error: error.into(),
+                command: command.map(|v| v as usize),
+            },
+        }
+    }
+}
+
+impl From<crate::execution_status::ExecutionFailureStatus> for ExecutionError {
+    fn from(value: crate::execution_status::ExecutionFailureStatus) -> Self {
+        use crate::execution_status::ExecutionFailureStatus;
+        match value {
+            ExecutionFailureStatus::InsufficientGas => Self::InsufficientGas,
+            ExecutionFailureStatus::InvalidGasObject => Self::InvalidGasObject,
+            ExecutionFailureStatus::InvariantViolation => Self::InvariantViolation,
+            ExecutionFailureStatus::FeatureNotYetSupported => Self::FeatureNotYetSupported,
+            ExecutionFailureStatus::MoveObjectTooBig {
+                object_size,
+                max_object_size,
+            } => Self::ObjectTooBig {
+                object_size,
+                max_object_size,
+            },
+            ExecutionFailureStatus::MovePackageTooBig {
+                object_size,
+                max_object_size,
+            } => Self::PackageTooBig {
+                object_size,
+                max_object_size,
+            },
+            ExecutionFailureStatus::CircularObjectOwnership { object } => {
+                Self::CircularObjectOwnership {
+                    object: object.into(),
+                }
+            }
+            ExecutionFailureStatus::InsufficientCoinBalance => Self::InsufficientCoinBalance,
+            ExecutionFailureStatus::CoinBalanceOverflow => Self::CoinBalanceOverflow,
+            ExecutionFailureStatus::PublishErrorNonZeroAddress => Self::PublishErrorNonZeroAddress,
+            ExecutionFailureStatus::IotaMoveVerificationError => Self::IotaMoveVerificationError,
+            ExecutionFailureStatus::MovePrimitiveRuntimeError(move_location_opt) => {
+                Self::MovePrimitiveRuntimeError {
+                    location: move_location_opt.0.map(Into::into),
+                }
+            }
+            ExecutionFailureStatus::MoveAbort(move_location, code) => Self::MoveAbort {
+                location: move_location.into(),
+                code,
+            },
+            ExecutionFailureStatus::VMVerificationOrDeserializationError => {
+                Self::VmVerificationOrDeserializationError
+            }
+            ExecutionFailureStatus::VMInvariantViolation => Self::VmInvariantViolation,
+            ExecutionFailureStatus::FunctionNotFound => Self::FunctionNotFound,
+            ExecutionFailureStatus::ArityMismatch => Self::ArityMismatch,
+            ExecutionFailureStatus::TypeArityMismatch => Self::TypeArityMismatch,
+            ExecutionFailureStatus::NonEntryFunctionInvoked => Self::NonEntryFunctionInvoked,
+            ExecutionFailureStatus::CommandArgumentError { arg_idx, kind } => {
+                use crate::execution_status::CommandArgumentError as InternalCmdArgErr;
+                Self::CommandArgumentError {
+                    argument: arg_idx,
+                    kind: match kind {
+                        InternalCmdArgErr::TypeMismatch => CommandArgumentError::TypeMismatch,
+                        InternalCmdArgErr::InvalidBCSBytes => CommandArgumentError::InvalidBcsBytes,
+                        InternalCmdArgErr::InvalidUsageOfPureArg => {
+                            CommandArgumentError::InvalidUsageOfPureArgument
+                        }
+                        InternalCmdArgErr::InvalidArgumentToPrivateEntryFunction => {
+                            CommandArgumentError::InvalidArgumentToPrivateEntryFunction
+                        }
+                        InternalCmdArgErr::IndexOutOfBounds { idx } => {
+                            CommandArgumentError::IndexOutOfBounds { index: idx }
+                        }
+                        InternalCmdArgErr::SecondaryIndexOutOfBounds {
+                            result_idx,
+                            secondary_idx,
+                        } => CommandArgumentError::SecondaryIndexOutOfBounds {
+                            result: result_idx,
+                            subresult: secondary_idx,
+                        },
+                        InternalCmdArgErr::InvalidResultArity { result_idx } => {
+                            CommandArgumentError::InvalidResultArity { result: result_idx }
+                        }
+                        InternalCmdArgErr::InvalidGasCoinUsage => {
+                            CommandArgumentError::InvalidGasCoinUsage
+                        }
+                        InternalCmdArgErr::InvalidValueUsage => {
+                            CommandArgumentError::InvalidValueUsage
+                        }
+                        InternalCmdArgErr::InvalidObjectByValue => {
+                            CommandArgumentError::InvalidObjectByValue
+                        }
+                        InternalCmdArgErr::InvalidObjectByMutRef => {
+                            CommandArgumentError::InvalidObjectByMutRef
+                        }
+                        InternalCmdArgErr::SharedObjectOperationNotAllowed => {
+                            CommandArgumentError::SharedObjectOperationNotAllowed
+                        }
+                    },
+                }
+            }
+            ExecutionFailureStatus::TypeArgumentError { argument_idx, kind } => {
+                use crate::execution_status::TypeArgumentError as InternalTypeArgErr;
+                Self::TypeArgumentError {
+                    type_argument: argument_idx,
+                    kind: match kind {
+                        InternalTypeArgErr::TypeNotFound => TypeArgumentError::TypeNotFound,
+                        InternalTypeArgErr::ConstraintNotSatisfied => {
+                            TypeArgumentError::ConstraintNotSatisfied
+                        }
+                    },
+                }
+            }
+            ExecutionFailureStatus::UnusedValueWithoutDrop {
+                result_idx,
+                secondary_idx,
+            } => Self::UnusedValueWithoutDrop {
+                result: result_idx,
+                subresult: secondary_idx,
+            },
+            ExecutionFailureStatus::InvalidPublicFunctionReturnType { idx } => {
+                Self::InvalidPublicFunctionReturnType { index: idx }
+            }
+            ExecutionFailureStatus::InvalidTransferObject => Self::InvalidTransferObject,
+            ExecutionFailureStatus::EffectsTooLarge {
+                current_size,
+                max_size,
+            } => Self::EffectsTooLarge {
+                current_size,
+                max_size,
+            },
+            ExecutionFailureStatus::PublishUpgradeMissingDependency => {
+                Self::PublishUpgradeMissingDependency
+            }
+            ExecutionFailureStatus::PublishUpgradeDependencyDowngrade => {
+                Self::PublishUpgradeDependencyDowngrade
+            }
+            ExecutionFailureStatus::PackageUpgradeError { upgrade_error } => {
+                use crate::execution_status::PackageUpgradeError as InternalPkgUpgradeErr;
+                Self::PackageUpgradeError {
+                    kind: match upgrade_error {
+                        InternalPkgUpgradeErr::UnableToFetchPackage { package_id } => {
+                            PackageUpgradeError::UnableToFetchPackage {
+                                package_id: package_id.into(),
+                            }
+                        }
+                        InternalPkgUpgradeErr::NotAPackage { object_id } => {
+                            PackageUpgradeError::NotAPackage {
+                                object_id: object_id.into(),
+                            }
+                        }
+                        InternalPkgUpgradeErr::IncompatibleUpgrade => {
+                            PackageUpgradeError::IncompatibleUpgrade
+                        }
+                        InternalPkgUpgradeErr::DigestDoesNotMatch { digest } => {
+                            PackageUpgradeError::DigestDoesNotMatch {
+                                digest: Digest::from_bytes(digest).expect("invalid digest bytes"),
+                            }
+                        }
+                        InternalPkgUpgradeErr::UnknownUpgradePolicy { policy } => {
+                            PackageUpgradeError::UnknownUpgradePolicy { policy }
+                        }
+                        InternalPkgUpgradeErr::PackageIDDoesNotMatch {
+                            package_id,
+                            ticket_id,
+                        } => PackageUpgradeError::PackageIdDoesNotMatch {
+                            package_id: package_id.into(),
+                            ticket_id: ticket_id.into(),
+                        },
+                    },
+                }
+            }
+            ExecutionFailureStatus::WrittenObjectsTooLarge {
+                current_size,
+                max_size,
+            } => Self::WrittenObjectsTooLarge {
+                object_size: current_size,
+                max_object_size: max_size,
+            },
+            ExecutionFailureStatus::CertificateDenied => Self::CertificateDenied,
+            ExecutionFailureStatus::IotaMoveVerificationTimeout => {
+                Self::IotaMoveVerificationTimeout
+            }
+            ExecutionFailureStatus::SharedObjectOperationNotAllowed => {
+                Self::SharedObjectOperationNotAllowed
+            }
+            ExecutionFailureStatus::InputObjectDeleted => Self::InputObjectDeleted,
+            ExecutionFailureStatus::ExecutionCancelledDueToSharedObjectCongestion {
+                congested_objects,
+            } => Self::ExecutionCancelledDueToSharedObjectCongestion {
+                congested_objects: congested_objects.0.into_iter().map(Into::into).collect(),
+            },
+            ExecutionFailureStatus::AddressDeniedForCoin { address, coin_type } => {
+                Self::AddressDeniedForCoin {
+                    address: address.into(),
+                    coin_type,
+                }
+            }
+            ExecutionFailureStatus::CoinTypeGlobalPause { coin_type } => {
+                Self::CoinTypeGlobalPause { coin_type }
+            }
+            ExecutionFailureStatus::ExecutionCancelledDueToRandomnessUnavailable => {
+                Self::ExecutionCancelledDueToRandomnessUnavailable
+            }
+        }
+    }
+}
+
+impl From<ExecutionError> for crate::execution_status::ExecutionFailureStatus {
+    fn from(value: ExecutionError) -> Self {
+        match value {
+            ExecutionError::InsufficientGas => Self::InsufficientGas,
+            ExecutionError::InvalidGasObject => Self::InvalidGasObject,
+            ExecutionError::InvariantViolation => Self::InvariantViolation,
+            ExecutionError::FeatureNotYetSupported => Self::FeatureNotYetSupported,
+            ExecutionError::ObjectTooBig {
+                object_size,
+                max_object_size,
+            } => Self::MoveObjectTooBig {
+                object_size,
+                max_object_size,
+            },
+            ExecutionError::PackageTooBig {
+                object_size,
+                max_object_size,
+            } => Self::MovePackageTooBig {
+                object_size,
+                max_object_size,
+            },
+            ExecutionError::CircularObjectOwnership { object } => Self::CircularObjectOwnership {
+                object: object.into(),
+            },
+            ExecutionError::InsufficientCoinBalance => Self::InsufficientCoinBalance,
+            ExecutionError::CoinBalanceOverflow => Self::CoinBalanceOverflow,
+            ExecutionError::PublishErrorNonZeroAddress => Self::PublishErrorNonZeroAddress,
+            ExecutionError::IotaMoveVerificationError => Self::IotaMoveVerificationError,
+            ExecutionError::MovePrimitiveRuntimeError { location } => {
+                Self::MovePrimitiveRuntimeError(crate::execution_status::MoveLocationOpt(
+                    location.map(Into::into),
+                ))
+            }
+            ExecutionError::MoveAbort { location, code } => Self::MoveAbort(location.into(), code),
+            ExecutionError::VmVerificationOrDeserializationError => {
+                Self::VMVerificationOrDeserializationError
+            }
+            ExecutionError::VmInvariantViolation => Self::VMInvariantViolation,
+            ExecutionError::FunctionNotFound => Self::FunctionNotFound,
+            ExecutionError::ArityMismatch => Self::ArityMismatch,
+            ExecutionError::TypeArityMismatch => Self::TypeArityMismatch,
+            ExecutionError::NonEntryFunctionInvoked => Self::NonEntryFunctionInvoked,
+            ExecutionError::CommandArgumentError { argument, kind } => {
+                use crate::execution_status::CommandArgumentError as InternalCmdArgErr;
+                Self::CommandArgumentError {
+                    arg_idx: argument,
+                    kind: match kind {
+                        CommandArgumentError::TypeMismatch => InternalCmdArgErr::TypeMismatch,
+                        CommandArgumentError::InvalidBcsBytes => InternalCmdArgErr::InvalidBCSBytes,
+                        CommandArgumentError::InvalidUsageOfPureArgument => {
+                            InternalCmdArgErr::InvalidUsageOfPureArg
+                        }
+                        CommandArgumentError::InvalidArgumentToPrivateEntryFunction => {
+                            InternalCmdArgErr::InvalidArgumentToPrivateEntryFunction
+                        }
+                        CommandArgumentError::IndexOutOfBounds { index } => {
+                            InternalCmdArgErr::IndexOutOfBounds { idx: index }
+                        }
+                        CommandArgumentError::SecondaryIndexOutOfBounds { result, subresult } => {
+                            InternalCmdArgErr::SecondaryIndexOutOfBounds {
+                                result_idx: result,
+                                secondary_idx: subresult,
+                            }
+                        }
+                        CommandArgumentError::InvalidResultArity { result } => {
+                            InternalCmdArgErr::InvalidResultArity { result_idx: result }
+                        }
+                        CommandArgumentError::InvalidGasCoinUsage => {
+                            InternalCmdArgErr::InvalidGasCoinUsage
+                        }
+                        CommandArgumentError::InvalidValueUsage => {
+                            InternalCmdArgErr::InvalidValueUsage
+                        }
+                        CommandArgumentError::InvalidObjectByValue => {
+                            InternalCmdArgErr::InvalidObjectByValue
+                        }
+                        CommandArgumentError::InvalidObjectByMutRef => {
+                            InternalCmdArgErr::InvalidObjectByMutRef
+                        }
+                        CommandArgumentError::SharedObjectOperationNotAllowed => {
+                            InternalCmdArgErr::SharedObjectOperationNotAllowed
+                        }
+                    },
+                }
+            }
+            ExecutionError::TypeArgumentError {
+                type_argument,
+                kind,
+            } => {
+                use crate::execution_status::TypeArgumentError as InternalTypeArgErr;
+                Self::TypeArgumentError {
+                    argument_idx: type_argument,
+                    kind: match kind {
+                        TypeArgumentError::TypeNotFound => InternalTypeArgErr::TypeNotFound,
+                        TypeArgumentError::ConstraintNotSatisfied => {
+                            InternalTypeArgErr::ConstraintNotSatisfied
+                        }
+                    },
+                }
+            }
+            ExecutionError::UnusedValueWithoutDrop { result, subresult } => {
+                Self::UnusedValueWithoutDrop {
+                    result_idx: result,
+                    secondary_idx: subresult,
+                }
+            }
+            ExecutionError::InvalidPublicFunctionReturnType { index } => {
+                Self::InvalidPublicFunctionReturnType { idx: index }
+            }
+            ExecutionError::InvalidTransferObject => Self::InvalidTransferObject,
+            ExecutionError::EffectsTooLarge {
+                current_size,
+                max_size,
+            } => Self::EffectsTooLarge {
+                current_size,
+                max_size,
+            },
+            ExecutionError::PublishUpgradeMissingDependency => {
+                Self::PublishUpgradeMissingDependency
+            }
+            ExecutionError::PublishUpgradeDependencyDowngrade => {
+                Self::PublishUpgradeDependencyDowngrade
+            }
+            ExecutionError::PackageUpgradeError { kind } => {
+                use crate::execution_status::PackageUpgradeError as InternalPkgUpgradeErr;
+                Self::PackageUpgradeError {
+                    upgrade_error: match kind {
+                        PackageUpgradeError::UnableToFetchPackage { package_id } => {
+                            InternalPkgUpgradeErr::UnableToFetchPackage {
+                                package_id: package_id.into(),
+                            }
+                        }
+                        PackageUpgradeError::NotAPackage { object_id } => {
+                            InternalPkgUpgradeErr::NotAPackage {
+                                object_id: object_id.into(),
+                            }
+                        }
+                        PackageUpgradeError::IncompatibleUpgrade => {
+                            InternalPkgUpgradeErr::IncompatibleUpgrade
+                        }
+                        PackageUpgradeError::DigestDoesNotMatch { digest } => {
+                            InternalPkgUpgradeErr::DigestDoesNotMatch {
+                                digest: digest.as_bytes().to_vec(),
+                            }
+                        }
+                        PackageUpgradeError::UnknownUpgradePolicy { policy } => {
+                            InternalPkgUpgradeErr::UnknownUpgradePolicy { policy }
+                        }
+                        PackageUpgradeError::PackageIdDoesNotMatch {
+                            package_id,
+                            ticket_id,
+                        } => InternalPkgUpgradeErr::PackageIDDoesNotMatch {
+                            package_id: package_id.into(),
+                            ticket_id: ticket_id.into(),
+                        },
+                    },
+                }
+            }
+            ExecutionError::WrittenObjectsTooLarge {
+                object_size,
+                max_object_size,
+            } => Self::WrittenObjectsTooLarge {
+                current_size: object_size,
+                max_size: max_object_size,
+            },
+            ExecutionError::CertificateDenied => Self::CertificateDenied,
+            ExecutionError::IotaMoveVerificationTimeout => Self::IotaMoveVerificationTimeout,
+            ExecutionError::SharedObjectOperationNotAllowed => {
+                Self::SharedObjectOperationNotAllowed
+            }
+            ExecutionError::InputObjectDeleted => Self::InputObjectDeleted,
+            ExecutionError::ExecutionCancelledDueToSharedObjectCongestion { congested_objects } => {
+                Self::ExecutionCancelledDueToSharedObjectCongestion {
+                    congested_objects: crate::execution_status::CongestedObjects(
+                        congested_objects.into_iter().map(Into::into).collect(),
+                    ),
+                }
+            }
+            ExecutionError::AddressDeniedForCoin { address, coin_type } => {
+                Self::AddressDeniedForCoin {
+                    address: address.into(),
+                    coin_type,
+                }
+            }
+            ExecutionError::CoinTypeGlobalPause { coin_type } => {
+                Self::CoinTypeGlobalPause { coin_type }
+            }
+            ExecutionError::ExecutionCancelledDueToRandomnessUnavailable => {
+                Self::ExecutionCancelledDueToRandomnessUnavailable
+            }
+        }
+    }
+}
+
+impl From<crate::execution_status::MoveLocation> for MoveLocation {
+    fn from(value: crate::execution_status::MoveLocation) -> Self {
+        Self {
+            package: ObjectId::new(value.module.address().into_bytes()),
+            module: Identifier::new(value.module.name().as_str()).expect("invalid module name"),
+            function: value.function,
+            instruction: value.instruction,
+            function_name: value
+                .function_name
+                .map(|name| Identifier::new(name).expect("invalid function name")),
+        }
+    }
+}
+
+impl From<MoveLocation> for crate::execution_status::MoveLocation {
+    fn from(value: MoveLocation) -> Self {
+        Self {
+            module: ModuleId::new(
+                move_core_types::account_address::AccountAddress::new(value.package.into_inner()),
+                crate::Identifier::new(value.module.as_str()).expect("invalid module name"),
+            ),
+            function: value.function,
+            instruction: value.instruction,
+            function_name: value.function_name.map(|name| name.to_string()),
+        }
+    }
+}
+
+impl From<crate::messages_checkpoint::CheckpointContents> for CheckpointContents {
+    fn from(value: crate::messages_checkpoint::CheckpointContents) -> Self {
+        Self(
+            value
+                .into_iter_with_signatures()
+                .map(|(digests, signatures)| CheckpointTransactionInfo {
+                    transaction: digests.transaction.into(),
+                    effects: digests.effects.into(),
+                    signatures: signatures.into_iter().map(Into::into).collect(),
+                })
+                .collect(),
+        )
+    }
+}
+
+impl From<CheckpointContents> for crate::messages_checkpoint::CheckpointContents {
+    fn from(value: CheckpointContents) -> Self {
+        let (transactions, user_signatures) = value.0.into_iter().fold(
+            (Vec::new(), Vec::new()),
+            |(mut transactions, mut user_signatures), info| {
+                transactions.push(crate::base_types::ExecutionDigests {
+                    transaction: info.transaction.into(),
+                    effects: info.effects.into(),
+                });
+                user_signatures.push(info.signatures.into_iter().map(Into::into).collect());
+                (transactions, user_signatures)
+            },
+        );
+        crate::messages_checkpoint::CheckpointContents::new_with_digests_and_signatures(
+            transactions,
+            user_signatures,
+        )
+    }
+}
+
+impl From<crate::full_checkpoint_content::CheckpointData> for CheckpointData {
+    fn from(value: crate::full_checkpoint_content::CheckpointData) -> Self {
+        Self {
+            checkpoint_summary: value.checkpoint_summary.into(),
+            checkpoint_contents: value.checkpoint_contents.into(),
+            transactions: value.transactions.into_iter().map(Into::into).collect(),
+        }
+    }
+}
+
+impl From<CheckpointData> for crate::full_checkpoint_content::CheckpointData {
+    fn from(value: CheckpointData) -> Self {
+        Self {
+            checkpoint_summary: value.checkpoint_summary.into(),
+            checkpoint_contents: value.checkpoint_contents.into(),
+            transactions: value.transactions.into_iter().map(Into::into).collect(),
+        }
+    }
+}
+
+impl From<crate::full_checkpoint_content::CheckpointTransaction> for CheckpointTransaction {
+    fn from(value: crate::full_checkpoint_content::CheckpointTransaction) -> Self {
+        Self {
+            transaction: value.transaction.into(),
+            effects: value.effects.into(),
+            events: value.events.map(Into::into),
+            input_objects: value.input_objects.into_iter().map(Into::into).collect(),
+            output_objects: value.output_objects.into_iter().map(Into::into).collect(),
+        }
+    }
+}
+
+impl From<CheckpointTransaction> for crate::full_checkpoint_content::CheckpointTransaction {
+    fn from(value: CheckpointTransaction) -> Self {
+        Self {
+            transaction: value.transaction.into(),
+            effects: value.effects.into(),
+            events: value.events.map(Into::into),
+            input_objects: value.input_objects.into_iter().map(Into::into).collect(),
+            output_objects: value.output_objects.into_iter().map(Into::into).collect(),
+        }
+    }
+}
+
+impl From<crate::signature::GenericSignature> for UserSignature {
+    fn from(value: crate::signature::GenericSignature) -> Self {
+        bcs::from_bytes(&bcs::to_bytes(&value).expect("invalid signature"))
+            .expect("invalid signature")
+    }
+}
+
+impl From<UserSignature> for crate::signature::GenericSignature {
+    fn from(value: UserSignature) -> Self {
+        bcs::from_bytes(&bcs::to_bytes(&value).expect("invalid signature"))
+            .expect("invalid signature")
+    }
+}
+
+impl From<crate::effects::TransactionEvents> for TransactionEvents {
+    fn from(value: crate::effects::TransactionEvents) -> Self {
+        Self(value.data.into_iter().map(Into::into).collect())
+    }
+}
+
+impl From<TransactionEvents> for crate::effects::TransactionEvents {
+    fn from(value: TransactionEvents) -> Self {
+        Self {
+            data: value.0.into_iter().map(Into::into).collect(),
+        }
+    }
+}
+
+impl From<crate::event::Event> for Event {
+    fn from(value: crate::event::Event) -> Self {
+        Self {
+            package_id: value.package_id.into(),
+            module: Identifier::new(value.transaction_module.as_str())
+                .expect("invalid event module identifier"),
+            sender: value.sender.into(),
+            type_: struct_tag_core_to_sdk(value.type_),
+            contents: value.contents,
+        }
+    }
+}
+
+impl From<Event> for crate::event::Event {
+    fn from(value: Event) -> Self {
+        Self {
+            package_id: value.package_id.into(),
+            transaction_module: crate::Identifier::new(value.module.as_str())
+                .expect("invalid event module identifier"),
+            sender: value.sender.into(),
+            type_: struct_tag_sdk_to_core(value.type_),
+            contents: value.contents,
+        }
+    }
+}
+
+impl From<crate::transaction::Command> for Command {
+    fn from(value: crate::transaction::Command) -> Self {
+        use crate::transaction::Command as InternalCmd;
+        match value {
+            InternalCmd::MoveCall(programmable_move_call) => Self::MoveCall(MoveCall {
+                package: programmable_move_call.package.into(),
+                module: Identifier::new(programmable_move_call.module.as_str())
+                    .expect("invalid move call module identifier"),
+                function: Identifier::new(programmable_move_call.function.as_str())
+                    .expect("invalid move call function identifier"),
+                type_arguments: programmable_move_call
+                    .type_arguments
+                    .into_iter()
+                    .map(type_tag_core_to_sdk)
+                    .collect(),
+                arguments: programmable_move_call
+                    .arguments
+                    .into_iter()
+                    .map(Into::into)
+                    .collect(),
+            }),
+            InternalCmd::TransferObjects(objects, address) => {
+                Self::TransferObjects(TransferObjects {
+                    objects: objects.into_iter().map(Into::into).collect(),
+                    address: address.into(),
+                })
+            }
+            InternalCmd::SplitCoins(coin, amounts) => Self::SplitCoins(SplitCoins {
+                coin: coin.into(),
+                amounts: amounts.into_iter().map(Into::into).collect(),
+            }),
+            InternalCmd::MergeCoins(argument, coins_to_merge) => Self::MergeCoins(MergeCoins {
+                coin: argument.into(),
+                coins_to_merge: coins_to_merge.into_iter().map(Into::into).collect(),
+            }),
+            InternalCmd::Publish(modules, dependencies) => Self::Publish(Publish {
+                modules,
+                dependencies: dependencies.into_iter().map(Into::into).collect(),
+            }),
+            InternalCmd::MakeMoveVec(type_tag, elements) => Self::MakeMoveVector(MakeMoveVector {
+                type_: type_tag.map(type_tag_core_to_sdk),
+                elements: elements.into_iter().map(Into::into).collect(),
+            }),
+            InternalCmd::Upgrade(modules, dependencies, package, ticket) => {
+                Self::Upgrade(Upgrade {
+                    modules,
+                    dependencies: dependencies.into_iter().map(Into::into).collect(),
+                    package: package.into(),
+                    ticket: ticket.into(),
+                })
+            }
+        }
+    }
+}
+
+impl From<Command> for crate::transaction::Command {
+    fn from(value: Command) -> Self {
+        match value {
+            Command::MoveCall(move_call) => {
+                Self::MoveCall(Box::new(crate::transaction::ProgrammableMoveCall {
+                    package: move_call.package.into(),
+                    module: crate::Identifier::new(move_call.module.as_str())
+                        .expect("invalid move call module identifier"),
+                    function: crate::Identifier::new(move_call.function.as_str())
+                        .expect("invalid move call function identifier"),
+                    type_arguments: move_call
+                        .type_arguments
+                        .into_iter()
+                        .map(type_tag_sdk_to_core)
+                        .collect(),
+                    arguments: move_call.arguments.into_iter().map(Into::into).collect(),
+                }))
+            }
+            Command::TransferObjects(transfer_objects) => Self::TransferObjects(
+                transfer_objects
+                    .objects
+                    .into_iter()
+                    .map(Into::into)
+                    .collect(),
+                transfer_objects.address.into(),
+            ),
+            Command::SplitCoins(split_coins) => Self::SplitCoins(
+                split_coins.coin.into(),
+                split_coins.amounts.into_iter().map(Into::into).collect(),
+            ),
+            Command::MergeCoins(merge_coins) => Self::MergeCoins(
+                merge_coins.coin.into(),
+                merge_coins
+                    .coins_to_merge
+                    .into_iter()
+                    .map(Into::into)
+                    .collect(),
+            ),
+            Command::Publish(publish) => Self::Publish(
+                publish.modules,
+                publish.dependencies.into_iter().map(Into::into).collect(),
+            ),
+            Command::MakeMoveVector(make_move_vector) => Self::MakeMoveVec(
+                make_move_vector.type_.map(type_tag_sdk_to_core),
+                make_move_vector
+                    .elements
+                    .into_iter()
+                    .map(Into::into)
+                    .collect(),
+            ),
+            Command::Upgrade(upgrade) => Self::Upgrade(
+                upgrade.modules,
+                upgrade.dependencies.into_iter().map(Into::into).collect(),
+                upgrade.package.into(),
+                upgrade.ticket.into(),
+            ),
+        }
+    }
+}
+
+impl From<crate::transaction::Argument> for Argument {
+    fn from(value: crate::transaction::Argument) -> Self {
+        match value {
+            crate::transaction::Argument::GasCoin => Self::Gas,
+            crate::transaction::Argument::Input(idx) => Self::Input(idx),
+            crate::transaction::Argument::Result(idx) => Self::Result(idx),
+            crate::transaction::Argument::NestedResult(idx1, idx2) => {
+                Self::NestedResult(idx1, idx2)
+            }
+        }
+    }
+}
+
+impl From<Argument> for crate::transaction::Argument {
+    fn from(value: Argument) -> Self {
+        match value {
+            Argument::Gas => Self::GasCoin,
+            Argument::Input(idx) => Self::Input(idx),
+            Argument::Result(idx) => Self::Result(idx),
+            Argument::NestedResult(idx1, idx2) => Self::NestedResult(idx1, idx2),
+        }
+    }
+}
 
 impl From<crate::gas::GasCostSummary> for GasCostSummary {
     fn from(value: crate::gas::GasCostSummary) -> Self {
@@ -98,12 +1641,7 @@ impl From<EndOfEpochData> for crate::messages_checkpoint::EndOfEpochData {
             next_epoch_committee: value
                 .next_epoch_committee
                 .into_iter()
-                .map(|v| {
-                    (
-                        AuthorityPublicKeyBytes::new(v.public_key.into_inner()),
-                        v.stake,
-                    )
-                })
+                .map(|v| (v.public_key.into(), v.stake))
                 .collect(),
             next_epoch_protocol_version: value.next_epoch_protocol_version.into(),
             epoch_commitments: value
@@ -135,18 +1673,6 @@ impl From<CheckpointCommitment> for crate::messages_checkpoint::CheckpointCommit
     }
 }
 
-impl From<crate::messages_checkpoint::CheckpointContentsDigest> for CheckpointContentsDigest {
-    fn from(value: crate::messages_checkpoint::CheckpointContentsDigest) -> Self {
-        Self::new(value.into_inner())
-    }
-}
-
-impl From<CheckpointContentsDigest> for crate::messages_checkpoint::CheckpointContentsDigest {
-    fn from(value: CheckpointContentsDigest) -> Self {
-        Self::new(value.into_inner())
-    }
-}
-
 impl From<crate::messages_checkpoint::CheckpointSummary> for CheckpointSummary {
     fn from(value: crate::messages_checkpoint::CheckpointSummary) -> Self {
         Self {
@@ -367,26 +1893,6 @@ pub fn type_tag_core_to_sdk(value: move_core_types::language_storage::TypeTag) -
     }
 }
 
-pub fn struct_tag_core_to_sdk(value: move_core_types::language_storage::StructTag) -> StructTag {
-    let move_core_types::language_storage::StructTag {
-        address,
-        module,
-        name,
-        type_params,
-    } = value;
-
-    let address = Address::new(address.into_bytes());
-    let module = Identifier::new(module.as_str()).unwrap();
-    let name = Identifier::new(name.as_str()).unwrap();
-    let type_params = type_params.into_iter().map(type_tag_core_to_sdk).collect();
-    StructTag {
-        address,
-        module,
-        name,
-        type_params,
-    }
-}
-
 pub fn type_tag_sdk_to_core(value: TypeTag) -> move_core_types::language_storage::TypeTag {
     match value {
         TypeTag::Bool => move_core_types::language_storage::TypeTag::Bool,
@@ -407,6 +1913,26 @@ pub fn type_tag_sdk_to_core(value: TypeTag) -> move_core_types::language_storage
     }
 }
 
+pub fn struct_tag_core_to_sdk(value: move_core_types::language_storage::StructTag) -> StructTag {
+    let move_core_types::language_storage::StructTag {
+        address,
+        module,
+        name,
+        type_params,
+    } = value;
+
+    let address = Address::new(address.into_bytes());
+    let module = Identifier::new(module.as_str()).unwrap();
+    let name = Identifier::new(name.as_str()).unwrap();
+    let type_params = type_params.into_iter().map(type_tag_core_to_sdk).collect();
+    StructTag {
+        address,
+        module,
+        name,
+        type_params,
+    }
+}
+
 pub fn struct_tag_sdk_to_core(value: StructTag) -> move_core_types::language_storage::StructTag {
     let StructTag {
         address,
@@ -427,42 +1953,6 @@ pub fn struct_tag_sdk_to_core(value: StructTag) -> move_core_types::language_sto
     }
 }
 
-impl From<crate::messages_checkpoint::CheckpointDigest> for CheckpointDigest {
-    fn from(value: crate::messages_checkpoint::CheckpointDigest) -> Self {
-        Self::new(value.into_inner())
-    }
-}
-
-impl From<CheckpointDigest> for crate::messages_checkpoint::CheckpointDigest {
-    fn from(value: CheckpointDigest) -> Self {
-        Self::new(value.into_inner())
-    }
-}
-
-impl From<crate::digests::TransactionDigest> for TransactionDigest {
-    fn from(value: crate::digests::TransactionDigest) -> Self {
-        Self::new(value.into_inner())
-    }
-}
-
-impl From<TransactionDigest> for crate::digests::TransactionDigest {
-    fn from(value: TransactionDigest) -> Self {
-        Self::new(value.into_inner())
-    }
-}
-
-impl From<crate::digests::ObjectDigest> for ObjectDigest {
-    fn from(value: crate::digests::ObjectDigest) -> Self {
-        Self::new(value.into_inner())
-    }
-}
-
-impl From<ObjectDigest> for crate::digests::ObjectDigest {
-    fn from(value: ObjectDigest) -> Self {
-        Self::new(value.into_inner())
-    }
-}
-
 impl From<crate::committee::Committee> for ValidatorCommittee {
     fn from(value: crate::committee::Committee) -> Self {
         Self {
diff --git a/crates/iota-types/src/iota_system_state/mod.rs b/crates/iota-types/src/iota_system_state/mod.rs
index bdadfcada9a..5e5634a53d5 100644
--- a/crates/iota-types/src/iota_system_state/mod.rs
+++ b/crates/iota-types/src/iota_system_state/mod.rs
@@ -36,7 +36,7 @@ mod simtest_iota_system_state_inner;
 #[cfg(msim)]
 use self::simtest_iota_system_state_inner::{
     SimTestIotaSystemStateDeepV1, SimTestIotaSystemStateShallowV1, SimTestIotaSystemStateV1,
-    SimTestValidatorDeepV2, SimTestValidatorV1,
+    SimTestValidatorDeepV1, SimTestValidatorV1,
 };
 
 const IOTA_SYSTEM_STATE_WRAPPER_STRUCT_NAME: &IdentStr = ident_str!("IotaSystemState");
@@ -193,9 +193,9 @@ pub enum IotaSystemState {
     #[cfg(msim)]
     SimTestV1(SimTestIotaSystemStateV1),
     #[cfg(msim)]
-    SimTestShallowV2(SimTestIotaSystemStateShallowV1),
+    SimTestShallowV1(SimTestIotaSystemStateShallowV1),
     #[cfg(msim)]
-    SimTestDeepV2(SimTestIotaSystemStateDeepV1),
+    SimTestDeepV1(SimTestIotaSystemStateDeepV1),
 }
 
 /// This is the fixed type used by genesis.
@@ -283,7 +283,7 @@ pub fn get_iota_system_state(object_store: &dyn ObjectStore) -> Result<IotaSyste
                         ))
                     },
                 )?;
-            Ok(IotaSystemState::SimTestShallowV2(result))
+            Ok(IotaSystemState::SimTestShallowV1(result))
         }
         #[cfg(msim)]
         IOTA_SYSTEM_STATE_SIM_TEST_DEEP_V1 => {
@@ -296,7 +296,7 @@ pub fn get_iota_system_state(object_store: &dyn ObjectStore) -> Result<IotaSyste
                         ))
                     },
                 )?;
-            Ok(IotaSystemState::SimTestDeepV2(result))
+            Ok(IotaSystemState::SimTestDeepV1(result))
         }
         _ => Err(IotaError::IotaSystemStateRead(format!(
             "Unsupported IotaSystemState version: {}",
@@ -352,7 +352,7 @@ where
         }
         #[cfg(msim)]
         IOTA_SYSTEM_STATE_SIM_TEST_DEEP_V1 => {
-            let validator: SimTestValidatorDeepV2 =
+            let validator: SimTestValidatorDeepV1 =
                 get_dynamic_field_from_store(object_store, versioned.id.id.bytes, &version)
                     .map_err(|err| {
                         IotaError::IotaSystemStateRead(format!(
diff --git a/crates/iota-types/src/iota_system_state/simtest_iota_system_state_inner.rs b/crates/iota-types/src/iota_system_state/simtest_iota_system_state_inner.rs
index fc1c17c9653..e5b5a5376f8 100644
--- a/crates/iota-types/src/iota_system_state/simtest_iota_system_state_inner.rs
+++ b/crates/iota-types/src/iota_system_state/simtest_iota_system_state_inner.rs
@@ -14,6 +14,7 @@ use crate::{
     committee::{CommitteeWithNetworkMetadata, NetworkMetadata},
     crypto::{AuthorityPublicKey, AuthorityPublicKeyBytes, NetworkPublicKey},
     error::IotaError,
+    gas_coin::IotaTreasuryCap,
     iota_system_state::{
         AdvanceEpochParams, IotaSystemStateTrait,
         epoch_start_iota_system_state::{EpochStartSystemState, EpochStartValidatorInfoV1},
@@ -27,6 +28,7 @@ pub struct SimTestIotaSystemStateV1 {
     pub epoch: u64,
     pub protocol_version: u64,
     pub system_state_version: u64,
+    pub iota_treasury_cap: IotaTreasuryCap,
     pub validators: SimTestValidatorSetV1,
     pub storage_fund: Balance,
     pub parameters: SimTestSystemParametersV1,
@@ -225,6 +227,7 @@ pub struct SimTestIotaSystemStateShallowV1 {
     pub epoch: u64,
     pub protocol_version: u64,
     pub system_state_version: u64,
+    pub iota_treasury_cap: IotaTreasuryCap,
     pub validators: SimTestValidatorSetV1,
     pub storage_fund: Balance,
     pub parameters: SimTestSystemParametersV1,
@@ -332,14 +335,14 @@ impl IotaSystemStateTrait for SimTestIotaSystemStateShallowV1 {
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)]
-pub struct SimTestValidatorSetDeepV2 {
-    pub active_validators: Vec<SimTestValidatorDeepV2>,
+pub struct SimTestValidatorSetDeepV1 {
+    pub active_validators: Vec<SimTestValidatorDeepV1>,
     pub inactive_validators: Table,
     pub extra_fields: Bag,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)]
-pub struct SimTestValidatorDeepV2 {
+pub struct SimTestValidatorDeepV1 {
     pub new_dummy_field: u64,
     metadata: SimTestValidatorMetadataV1,
     #[serde(skip)]
@@ -349,7 +352,7 @@ pub struct SimTestValidatorDeepV2 {
     pub extra_fields: Bag,
 }
 
-impl SimTestValidatorDeepV2 {
+impl SimTestValidatorDeepV1 {
     pub fn verified_metadata(&self) -> &VerifiedSimTestValidatorMetadataV1 {
         self.verified_metadata
             .get_or_init(|| self.metadata.verify())
@@ -366,7 +369,8 @@ pub struct SimTestIotaSystemStateDeepV1 {
     pub epoch: u64,
     pub protocol_version: u64,
     pub system_state_version: u64,
-    pub validators: SimTestValidatorSetDeepV2,
+    pub iota_treasury_cap: IotaTreasuryCap,
+    pub validators: SimTestValidatorSetDeepV1,
     pub storage_fund: Balance,
     pub parameters: SimTestSystemParametersV1,
     pub reference_gas_price: u64,
diff --git a/crates/iota-types/src/messages_checkpoint.rs b/crates/iota-types/src/messages_checkpoint.rs
index 69c61c53d7b..50a9f25d252 100644
--- a/crates/iota-types/src/messages_checkpoint.rs
+++ b/crates/iota-types/src/messages_checkpoint.rs
@@ -48,17 +48,6 @@ use iota_metrics::histogram::Histogram;
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct CheckpointRequest {
-    /// if a sequence number is specified, return the checkpoint with that
-    /// sequence number; otherwise if None returns the latest authenticated
-    /// checkpoint stored.
-    pub sequence_number: Option<CheckpointSequenceNumber>,
-    // A flag, if true also return the contents of the
-    // checkpoint besides the meta-data.
-    pub request_content: bool,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct CheckpointRequestV2 {
     /// if a sequence number is specified, return the checkpoint with that
     /// sequence number; otherwise if None returns the latest checkpoint
     /// stored (authenticated or pending, depending on the value of
@@ -90,13 +79,6 @@ impl CheckpointSummaryResponse {
 #[allow(clippy::large_enum_variant)]
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct CheckpointResponse {
-    pub checkpoint: Option<CertifiedCheckpointSummary>,
-    pub contents: Option<CheckpointContents>,
-}
-
-#[allow(clippy::large_enum_variant)]
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct CheckpointResponseV2 {
     pub checkpoint: Option<CheckpointSummaryResponse>,
     pub contents: Option<CheckpointContents>,
 }
@@ -442,13 +424,10 @@ pub struct CheckpointContentsV1 {
 }
 
 impl CheckpointContents {
-    pub fn new_with_digests_and_signatures<T>(
-        contents: T,
+    pub fn new_with_digests_and_signatures(
+        contents: impl IntoIterator<Item = ExecutionDigests>,
         user_signatures: Vec<Vec<GenericSignature>>,
-    ) -> Self
-    where
-        T: IntoIterator<Item = ExecutionDigests>,
-    {
+    ) -> Self {
         let transactions: Vec<_> = contents.into_iter().collect();
         assert_eq!(transactions.len(), user_signatures.len());
         Self::V1(CheckpointContentsV1 {
@@ -458,10 +437,9 @@ impl CheckpointContents {
         })
     }
 
-    pub fn new_with_causally_ordered_execution_data<'a, T>(contents: T) -> Self
-    where
-        T: IntoIterator<Item = &'a VerifiedExecutionData>,
-    {
+    pub fn new_with_causally_ordered_execution_data<'a>(
+        contents: impl IntoIterator<Item = &'a VerifiedExecutionData>,
+    ) -> Self {
         let (transactions, user_signatures): (Vec<_>, Vec<_>) = contents
             .into_iter()
             .map(|data| {
@@ -480,10 +458,9 @@ impl CheckpointContents {
     }
 
     #[cfg(any(test, feature = "test-utils"))]
-    pub fn new_with_digests_only_for_tests<T>(contents: T) -> Self
-    where
-        T: IntoIterator<Item = ExecutionDigests>,
-    {
+    pub fn new_with_digests_only_for_tests(
+        contents: impl IntoIterator<Item = ExecutionDigests>,
+    ) -> Self {
         let transactions: Vec<_> = contents.into_iter().collect();
         let user_signatures = transactions.iter().map(|_| vec![]).collect();
         Self::V1(CheckpointContentsV1 {
diff --git a/crates/iota-types/src/messages_consensus.rs b/crates/iota-types/src/messages_consensus.rs
index 4c0efa531ec..77323a54518 100644
--- a/crates/iota-types/src/messages_consensus.rs
+++ b/crates/iota-types/src/messages_consensus.rs
@@ -196,7 +196,6 @@ pub enum ConsensusTransactionKind {
     CapabilityNotificationV1(AuthorityCapabilitiesV1),
 
     NewJWKFetched(AuthorityName, JwkId, JWK),
-    RandomnessStateUpdate(u64, Vec<u8>), // deprecated
     // DKG is used to generate keys for use in the random beacon protocol.
     // `RandomnessDkgMessage` is sent out at start-of-epoch to initiate the process.
     // Contents are a serialized `fastcrypto_tbls::dkg::Message`.
@@ -220,20 +219,17 @@ impl ConsensusTransactionKind {
 #[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[allow(clippy::large_enum_variant)]
 pub enum VersionedDkgMessage {
-    V0(), // deprecated
     V1(dkg_v1::Message<bls12381::G2Element, bls12381::G2Element>),
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum VersionedDkgConfirmation {
-    V0(), // deprecated
     V1(dkg::Confirmation<bls12381::G2Element>),
 }
 
 impl Debug for VersionedDkgMessage {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
-            VersionedDkgMessage::V0() => write!(f, "Deprecated VersionedDkgMessage version 0"),
             VersionedDkgMessage::V1(msg) => write!(
                 f,
                 "DKG V1 Message with sender={}, vss_pk.degree={}, encrypted_shares.len()={}",
@@ -248,7 +244,6 @@ impl Debug for VersionedDkgMessage {
 impl VersionedDkgMessage {
     pub fn sender(&self) -> u16 {
         match self {
-            VersionedDkgMessage::V0() => panic!("BUG: invalid VersionedDkgMessage version"),
             VersionedDkgMessage::V1(msg) => msg.sender,
         }
     }
@@ -265,7 +260,6 @@ impl VersionedDkgMessage {
     pub fn unwrap_v1(self) -> dkg_v1::Message<bls12381::G2Element, bls12381::G2Element> {
         match self {
             VersionedDkgMessage::V1(msg) => msg,
-            _ => panic!("BUG: expected V1 message"),
         }
     }
 
@@ -277,18 +271,12 @@ impl VersionedDkgMessage {
 impl VersionedDkgConfirmation {
     pub fn sender(&self) -> u16 {
         match self {
-            VersionedDkgConfirmation::V0() => {
-                panic!("BUG: invalid VersionedDkgConfimation version")
-            }
             VersionedDkgConfirmation::V1(msg) => msg.sender,
         }
     }
 
     pub fn num_of_complaints(&self) -> usize {
         match self {
-            VersionedDkgConfirmation::V0() => {
-                panic!("BUG: invalid VersionedDkgConfimation version")
-            }
             VersionedDkgConfirmation::V1(msg) => msg.complaints.len(),
         }
     }
@@ -296,7 +284,6 @@ impl VersionedDkgConfirmation {
     pub fn unwrap_v1(&self) -> &dkg::Confirmation<bls12381::G2Element> {
         match self {
             VersionedDkgConfirmation::V1(msg) => msg,
-            _ => panic!("BUG: expected V1 confirmation"),
         }
     }
 
@@ -437,11 +424,6 @@ impl ConsensusTransaction {
                     key.clone(),
                 )))
             }
-            ConsensusTransactionKind::RandomnessStateUpdate(_, _) => {
-                unreachable!(
-                    "there should never be a RandomnessStateUpdate with SequencedConsensusTransactionKind::External"
-                )
-            }
             ConsensusTransactionKind::RandomnessDkgMessage(authority, _) => {
                 ConsensusTransactionKey::RandomnessDkgMessage(*authority)
             }
diff --git a/crates/iota-types/src/messages_grpc.rs b/crates/iota-types/src/messages_grpc.rs
index 7dec37bc5b3..a9e7a3ac273 100644
--- a/crates/iota-types/src/messages_grpc.rs
+++ b/crates/iota-types/src/messages_grpc.rs
@@ -161,19 +161,11 @@ pub struct TransactionInfoResponse {
     pub status: TransactionStatus,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct HandleCertificateResponseV2 {
-    pub signed_effects: SignedTransactionEffects,
-    pub events: TransactionEvents,
-    /// Not used. Full node local execution fast path was deprecated.
-    pub fastpath_input_objects: Vec<Object>,
-}
-
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct SubmitCertificateResponse {
     /// If transaction is already executed, return same result as
     /// handle_certificate
-    pub executed: Option<HandleCertificateResponseV2>,
+    pub executed: Option<HandleCertificateResponseV1>,
 }
 
 #[derive(Clone, Debug)]
@@ -188,27 +180,27 @@ pub struct SystemStateRequest {
     pub _unused: bool,
 }
 
-/// Response type for version 3 of the handle certifacte validator API.
+/// Response type for version 1 of the handle certificate validator API.
 ///
-/// The coorisponding version 3 request type allows for a client to request
+/// The corresponding version 1 request type allows for a client to request
 /// events as well as input/output objects from a transaction's execution. Given
 /// Validators operate with very aggressive object pruning, the return of
 /// input/output objects is only done immediately after the transaction has been
 /// executed locally on the validator and will not be returned for requests to
 /// previously executed transactions.
 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct HandleCertificateResponseV3 {
-    pub effects: SignedTransactionEffects,
+pub struct HandleCertificateResponseV1 {
+    pub signed_effects: SignedTransactionEffects,
     pub events: Option<TransactionEvents>,
 
-    /// If requested, will included all initial versions of objects modified in
+    /// If requested, will include all initial versions of objects modified in
     /// this transaction. This includes owned objects included as input into
     /// the transaction as well as the assigned versions of shared objects.
     // TODO: In the future we may want to include shared objects or child objects which were read
-    // but not modified during exectuion.
+    //  but not modified during execution.
     pub input_objects: Option<Vec<Object>>,
 
-    /// If requested, will included all changed objects, including mutated,
+    /// If requested, will include all changed objects, including mutated,
     /// created and unwrapped objects. In other words, all objects that
     /// still exist in the object state after this transaction.
     pub output_objects: Option<Vec<Object>>,
@@ -216,7 +208,7 @@ pub struct HandleCertificateResponseV3 {
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct HandleCertificateRequestV3 {
+pub struct HandleCertificateRequestV1 {
     pub certificate: CertifiedTransaction,
 
     pub include_events: bool,
@@ -225,14 +217,36 @@ pub struct HandleCertificateRequestV3 {
     pub include_auxiliary_data: bool,
 }
 
-impl From<HandleCertificateResponseV3> for HandleCertificateResponseV2 {
-    fn from(value: HandleCertificateResponseV3) -> Self {
+impl HandleCertificateRequestV1 {
+    pub fn new(certificate: CertifiedTransaction) -> Self {
         Self {
-            signed_effects: value.effects,
-            events: value.events.unwrap_or_default(),
-            fastpath_input_objects: Vec::new(),
+            certificate,
+            include_events: false,
+            include_input_objects: false,
+            include_output_objects: false,
+            include_auxiliary_data: false,
         }
     }
+
+    pub fn with_events(mut self) -> Self {
+        self.include_events = true;
+        self
+    }
+
+    pub fn with_input_objects(mut self) -> Self {
+        self.include_input_objects = true;
+        self
+    }
+
+    pub fn with_output_objects(mut self) -> Self {
+        self.include_output_objects = true;
+        self
+    }
+
+    pub fn with_auxiliary_data(mut self) -> Self {
+        self.include_auxiliary_data = true;
+        self
+    }
 }
 
 /// Response type for the handle Soft Bundle certificates validator API.
@@ -242,13 +256,13 @@ impl From<HandleCertificateResponseV3> for HandleCertificateResponseV2 {
 ///
 /// Otherwise, `responses` will be empty.
 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct HandleSoftBundleCertificatesResponseV3 {
-    pub responses: Vec<HandleCertificateResponseV3>,
+pub struct HandleSoftBundleCertificatesResponseV1 {
+    pub responses: Vec<HandleCertificateResponseV1>,
 }
 
 /// Soft Bundle request.  See [SIP-19](https://github.com/sui-foundation/sips/blob/main/sips/sip-19.md).
 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct HandleSoftBundleCertificatesRequestV3 {
+pub struct HandleSoftBundleCertificatesRequestV1 {
     pub certificates: Vec<CertifiedTransaction>,
 
     pub wait_for_effects: bool,
diff --git a/crates/iota-types/src/metrics.rs b/crates/iota-types/src/metrics.rs
index 4b7f2585cc7..e98b3aaab31 100644
--- a/crates/iota-types/src/metrics.rs
+++ b/crates/iota-types/src/metrics.rs
@@ -90,14 +90,6 @@ pub struct BytecodeVerifierMetrics {
 }
 
 impl BytecodeVerifierMetrics {
-    /// DEPRECATED in latest metered verifier, which only report overall success
-    /// or timeout.
-    pub const MOVE_VERIFIER_TAG: &'static str = "move_verifier";
-
-    /// DEPRECATED in latest metered verifier, which only report overall success
-    /// or timeout.
-    pub const IOTA_VERIFIER_TAG: &'static str = "iota_verifier";
-
     pub const OVERALL_TAG: &'static str = "overall";
     pub const SUCCESS_TAG: &'static str = "success";
     pub const TIMEOUT_TAG: &'static str = "failed";
diff --git a/crates/iota-types/src/move_package.rs b/crates/iota-types/src/move_package.rs
index 5790a7ad620..d5cb2d32232 100644
--- a/crates/iota-types/src/move_package.rs
+++ b/crates/iota-types/src/move_package.rs
@@ -88,7 +88,7 @@ pub struct UpgradeInfo {
 #[serde_as]
 #[derive(Eq, PartialEq, Debug, Clone, Deserialize, Serialize, Hash)]
 pub struct MovePackage {
-    id: ObjectID,
+    pub(crate) id: ObjectID,
     /// Most move packages are uniquely identified by their ID (i.e. there is
     /// only one version per ID), but the version is still stored because
     /// one package may be an upgrade of another (at a different ID), in
@@ -100,18 +100,18 @@ pub struct MovePackage {
     ///
     /// In all cases, packages are referred to by move calls using just their
     /// ID, and they are always loaded at their latest version.
-    version: SequenceNumber,
+    pub(crate) version: SequenceNumber,
     // TODO use session cache
     #[serde_as(as = "BTreeMap<_, Bytes>")]
-    module_map: BTreeMap<String, Vec<u8>>,
+    pub(crate) module_map: BTreeMap<String, Vec<u8>>,
 
     /// Maps struct/module to a package version where it was first defined,
     /// stored as a vector for simple serialization and deserialization.
-    type_origin_table: Vec<TypeOrigin>,
+    pub(crate) type_origin_table: Vec<TypeOrigin>,
 
     // For each dependency, maps original package ID to the info about the (upgraded) dependency
     // version that this package is using
-    linkage_table: BTreeMap<ObjectID, UpgradeInfo>,
+    pub(crate) linkage_table: BTreeMap<ObjectID, UpgradeInfo>,
 }
 
 // NB: do _not_ add `Serialize` or `Deserialize` to this enum. Convert to u8
diff --git a/crates/iota-types/src/object.rs b/crates/iota-types/src/object.rs
index 62000c6c304..9be8217a25d 100644
--- a/crates/iota-types/src/object.rs
+++ b/crates/iota-types/src/object.rs
@@ -50,18 +50,18 @@ pub const OBJECT_START_VERSION: SequenceNumber = SequenceNumber::from_u64(1);
 #[derive(Eq, PartialEq, Debug, Clone, Deserialize, Serialize, Hash)]
 pub struct MoveObject {
     /// The type of this object. Immutable
-    type_: MoveObjectType,
+    pub(crate) type_: MoveObjectType,
     /// DEPRECATED this field is no longer used to determine whether a tx can
     /// transfer this object. Instead, it is always calculated from the
     /// objects type when loaded in execution
-    has_public_transfer: bool,
+    pub(crate) has_public_transfer: bool,
     /// Number that increases each time a tx takes this object as a mutable
     /// input This is a lamport timestamp, not a sequentially increasing
     /// version
-    version: SequenceNumber,
+    pub(crate) version: SequenceNumber,
     /// BCS bytes of a Move struct value
     #[serde_as(as = "Bytes")]
-    contents: Vec<u8>,
+    pub(crate) contents: Vec<u8>,
 }
 
 /// Index marking the end of the object's ID + the beginning of its version
diff --git a/crates/iota-types/src/quorum_driver_types.rs b/crates/iota-types/src/quorum_driver_types.rs
index 8a8a0e15c15..f69e5bec8b7 100644
--- a/crates/iota-types/src/quorum_driver_types.rs
+++ b/crates/iota-types/src/quorum_driver_types.rs
@@ -20,7 +20,7 @@ use crate::{
     error::IotaError,
     messages_checkpoint::CheckpointSequenceNumber,
     object::Object,
-    transaction::{Transaction, VerifiedTransaction},
+    transaction::Transaction,
 };
 
 pub type QuorumDriverResult = Result<QuorumDriverResponse, QuorumDriverError>;
@@ -85,12 +85,6 @@ pub enum ExecuteTransactionRequestType {
     WaitForLocalExecution,
 }
 
-#[derive(Debug)]
-pub enum TransactionType {
-    SingleWriter, // Txes that only use owned objects and/or immutable objects
-    SharedObject, // Txes that use at least one shared object
-}
-
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub enum EffectsFinalityInfo {
     Certified(AuthorityStrongQuorumSignInfo),
@@ -103,22 +97,6 @@ pub enum EffectsFinalityInfo {
 /// is confirmed to be executed on this node before the response returns.
 pub type IsTransactionExecutedLocally = bool;
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
-pub enum ExecuteTransactionResponse {
-    EffectsCert(
-        Box<(
-            FinalizedEffects,
-            TransactionEvents,
-            IsTransactionExecutedLocally,
-        )>,
-    ),
-}
-
-#[derive(Clone, Debug)]
-pub struct QuorumDriverRequest {
-    pub transaction: VerifiedTransaction,
-}
-
 #[derive(Debug, Clone)]
 pub struct QuorumDriverResponse {
     pub effects_cert: VerifiedCertifiedTransactionEffects,
@@ -131,22 +109,6 @@ pub struct QuorumDriverResponse {
     pub auxiliary_data: Option<Vec<u8>>,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
-pub struct ExecuteTransactionRequest {
-    pub transaction: Transaction,
-    pub request_type: ExecuteTransactionRequestType,
-}
-
-impl ExecuteTransactionRequest {
-    pub fn transaction_type(&self) -> TransactionType {
-        if self.transaction.contains_shared_object() {
-            TransactionType::SharedObject
-        } else {
-            TransactionType::SingleWriter
-        }
-    }
-}
-
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct ExecuteTransactionRequestV1 {
     pub transaction: Transaction,
diff --git a/crates/iota-types/src/storage/mod.rs b/crates/iota-types/src/storage/mod.rs
index ae5fa86124f..e685f91d39f 100644
--- a/crates/iota-types/src/storage/mod.rs
+++ b/crates/iota-types/src/storage/mod.rs
@@ -160,8 +160,8 @@ pub enum ObjectChange {
     Delete(DeleteKindWithOldVersion),
 }
 
-pub trait StorageView: Storage + ParentSync + ChildObjectResolver {}
-impl<T: Storage + ParentSync + ChildObjectResolver> StorageView for T {}
+pub trait StorageView: Storage + ChildObjectResolver {}
+impl<T: Storage + ChildObjectResolver> StorageView for T {}
 
 /// An abstraction of the (possibly distributed) store for objects. This
 /// API only allows for the retrieval of objects, not any state changes
@@ -382,42 +382,6 @@ impl BackingPackageStore for PostExecutionPackageResolver {
     }
 }
 
-pub trait ParentSync {
-    /// This function is only called by older protocol versions.
-    /// It creates an explicit dependency to tombstones, which is not desired.
-    fn get_latest_parent_entry_ref_deprecated(
-        &self,
-        object_id: ObjectID,
-    ) -> IotaResult<Option<ObjectRef>>;
-}
-
-impl<S: ParentSync> ParentSync for std::sync::Arc<S> {
-    fn get_latest_parent_entry_ref_deprecated(
-        &self,
-        object_id: ObjectID,
-    ) -> IotaResult<Option<ObjectRef>> {
-        ParentSync::get_latest_parent_entry_ref_deprecated(self.as_ref(), object_id)
-    }
-}
-
-impl<S: ParentSync> ParentSync for &S {
-    fn get_latest_parent_entry_ref_deprecated(
-        &self,
-        object_id: ObjectID,
-    ) -> IotaResult<Option<ObjectRef>> {
-        ParentSync::get_latest_parent_entry_ref_deprecated(*self, object_id)
-    }
-}
-
-impl<S: ParentSync> ParentSync for &mut S {
-    fn get_latest_parent_entry_ref_deprecated(
-        &self,
-        object_id: ObjectID,
-    ) -> IotaResult<Option<ObjectRef>> {
-        ParentSync::get_latest_parent_entry_ref_deprecated(*self, object_id)
-    }
-}
-
 impl<S: ChildObjectResolver> ChildObjectResolver for std::sync::Arc<S> {
     fn read_child_object(
         &self,
@@ -589,9 +553,7 @@ impl Display for DeleteKind {
     }
 }
 
-pub trait BackingStore:
-    BackingPackageStore + ChildObjectResolver + ObjectStore + ParentSync
-{
+pub trait BackingStore: BackingPackageStore + ChildObjectResolver + ObjectStore {
     fn as_object_store(&self) -> &dyn ObjectStore;
 }
 
@@ -600,7 +562,6 @@ where
     T: BackingPackageStore,
     T: ChildObjectResolver,
     T: ObjectStore,
-    T: ParentSync,
 {
     fn as_object_store(&self) -> &dyn ObjectStore {
         self
diff --git a/crates/iota-types/tests/staged/exec_failure_status.yaml b/crates/iota-types/tests/staged/exec_failure_status.yaml
index 5ddf42a34da..00e684c3fa7 100644
--- a/crates/iota-types/tests/staged/exec_failure_status.yaml
+++ b/crates/iota-types/tests/staged/exec_failure_status.yaml
@@ -29,7 +29,7 @@
 27: PackageUpgradeError
 28: WrittenObjectsTooLarge
 29: CertificateDenied
-30: IotaMoveVerificationTimedout
+30: IotaMoveVerificationTimeout
 31: SharedObjectOperationNotAllowed
 32: InputObjectDeleted
 33: ExecutionCancelledDueToSharedObjectCongestion
diff --git a/crates/iota-upgrade-compatibility-transactional-tests/Cargo.toml b/crates/iota-upgrade-compatibility-transactional-tests/Cargo.toml
index 9dc55b3714c..bb5940619f4 100644
--- a/crates/iota-upgrade-compatibility-transactional-tests/Cargo.toml
+++ b/crates/iota-upgrade-compatibility-transactional-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-upgrade-compatibility-transactional-tests"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota-util-mem-derive/Cargo.toml b/crates/iota-util-mem-derive/Cargo.toml
index 50d1798f3f7..6243cbeb6fb 100644
--- a/crates/iota-util-mem-derive/Cargo.toml
+++ b/crates/iota-util-mem-derive/Cargo.toml
@@ -1,11 +1,10 @@
 [package]
 name = "iota-util-mem-derive"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
 publish = false
-repository = "https://github.com/mystenlabs/mysten-infra"
 rust-version = "1.56.1"
 description = "Crate for memory reporting"
 
diff --git a/crates/iota-util-mem/Cargo.toml b/crates/iota-util-mem/Cargo.toml
index 45c0c7d8d87..3aa8608f96d 100644
--- a/crates/iota-util-mem/Cargo.toml
+++ b/crates/iota-util-mem/Cargo.toml
@@ -1,11 +1,10 @@
 [package]
 name = "iota-util-mem"
-version = "0.11.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
 publish = false
-repository = "https://github.com/mystenlabs/mysten-infra"
 rust-version = "1.56.1"
 description = "Collection of memory related utilities"
 
diff --git a/crates/iota-verifier-transactional-tests/Cargo.toml b/crates/iota-verifier-transactional-tests/Cargo.toml
index 4e1b638658a..767e3f1e938 100644
--- a/crates/iota-verifier-transactional-tests/Cargo.toml
+++ b/crates/iota-verifier-transactional-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iota-verifier-transactional-tests"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/iota/Cargo.toml b/crates/iota/Cargo.toml
index 9f0339a2604..cdd190c361f 100644
--- a/crates/iota/Cargo.toml
+++ b/crates/iota/Cargo.toml
@@ -106,6 +106,7 @@ shlex = "1.3.0"
 
 # internal dependencies
 iota-macros.workspace = true
+iota-metrics.workspace = true
 iota-simulator.workspace = true
 iota-test-transaction-builder.workspace = true
 move-cli.workspace = true
diff --git a/crates/iota/genesis.md b/crates/iota/genesis.md
index d8bd8082abc..f76dd67fc4b 100644
--- a/crates/iota/genesis.md
+++ b/crates/iota/genesis.md
@@ -77,16 +77,28 @@ $ iota genesis-ceremony add-validator \
     --project-url https://www.iota.org
 ```
 
-3. Add token allocation for the faucet
+3. Initialize token-distribution schedule
 
-Add allocation for any faucet that might have been launched.
+Set the initial token-distribution schedule through a csv file. E.g.
 
+```csv
+recipient-address,amount-nanos,staked-with-validator,staked-with-timelock-expiration
+<faucet-address>,1500000000000000,,
+<validator-1-address>,1500000000000000,<validator-1-address>,
+<validator-2-address>,1500000000000000,<validator-2-address>,
 ```
-$ iota genesis-ceremony add-token-allocation \
-    --recipient-address <IotaAddress> \
-    --amount-nanos <# of iota coins>
+
+This is useful for allocating funds for a faucet, or for distributing the initial
+stake to validators.
+
+The resulting distribution schedule is amended only if any migration sources are
+passed in the "Build Genesis" step.
+
+```
+$ iota genesis-ceremony init-token-distribution-schedule \
+    --token-allocations-path <path-to-token-allocations-csv-file>
 $ git add .
-$ git commit -m "add faucet token allocation"
+$ git commit -m "initialize token distribution schedule"
 $ git push
 ```
 
diff --git a/crates/iota/src/genesis_ceremony.rs b/crates/iota/src/genesis_ceremony.rs
index 413f17d1fea..162acf416ce 100644
--- a/crates/iota/src/genesis_ceremony.rs
+++ b/crates/iota/src/genesis_ceremony.rs
@@ -2,7 +2,7 @@
 // Modifications Copyright (c) 2024 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use std::path::PathBuf;
+use std::{fs::File, path::PathBuf};
 
 use anyhow::Result;
 use camino::Utf8PathBuf;
@@ -10,7 +10,7 @@ use clap::Parser;
 use fastcrypto::encoding::{Encoding, Hex};
 use iota_config::{
     IOTA_GENESIS_FILENAME,
-    genesis::{TokenAllocation, TokenDistributionScheduleBuilder, UnsignedGenesis},
+    genesis::{TokenDistributionScheduleBuilder, UnsignedGenesis},
 };
 use iota_genesis_builder::{
     Builder, GENESIS_BUILDER_PARAMETERS_FILE, SnapshotSource, SnapshotUrl,
@@ -95,12 +95,14 @@ pub enum CeremonyCommand {
         #[clap(long)]
         project_url: Option<String>,
     },
-    /// Add token allocation for the given address.
-    AddTokenAllocation {
-        #[clap(long)]
-        recipient_address: IotaAddress,
-        #[clap(long)]
-        amount_nanos: u64,
+    /// Initialize token distribution schedule.
+    InitTokenDistributionSchedule {
+        #[clap(
+            long,
+            help = "The path to the csv file with the token allocations",
+            name = "token_allocations.csv"
+        )]
+        token_allocations_path: PathBuf,
     },
     /// List the current validators in the Genesis builder.
     ListValidators,
@@ -113,12 +115,7 @@ pub enum CeremonyCommand {
         )]
         #[arg(num_args(0..))]
         local_migration_snapshots: Vec<PathBuf>,
-        #[clap(
-            long,
-            name = "iota|<full-url>",
-            help = "Remote migration snapshots.",
-            default_values_t = vec![SnapshotUrl::Iota],
-        )]
+        #[clap(long, name = "iota|<full-url>", help = "Remote migration snapshots.")]
         #[arg(num_args(0..))]
         remote_migration_snapshots: Vec<SnapshotUrl>,
     },
@@ -163,21 +160,19 @@ pub async fn run(cmd: Ceremony) -> Result<()> {
             );
         }
 
-        CeremonyCommand::AddTokenAllocation {
-            recipient_address,
-            amount_nanos,
+        CeremonyCommand::InitTokenDistributionSchedule {
+            token_allocations_path,
         } => {
             let mut builder = Builder::load(&dir).await?;
-            let token_allocation = TokenAllocation {
-                recipient_address,
-                amount_nanos,
-                staked_with_validator: None,
-                staked_with_timelock_expiration: None,
-            };
             let mut schedule_builder = TokenDistributionScheduleBuilder::new();
-            schedule_builder.add_allocation(token_allocation);
-            builder = builder.with_token_distribution_schedule(schedule_builder.build());
 
+            let token_allocations_csv = File::open(token_allocations_path)?;
+            let mut reader = csv::Reader::from_reader(token_allocations_csv);
+            for allocation in reader.deserialize() {
+                schedule_builder.add_allocation(allocation?);
+            }
+
+            builder = builder.with_token_distribution_schedule(schedule_builder.build());
             builder.save(dir)?;
         }
 
diff --git a/crates/iota/src/keytool.rs b/crates/iota/src/keytool.rs
index 059eccb635d..2c9eaf01877 100644
--- a/crates/iota/src/keytool.rs
+++ b/crates/iota/src/keytool.rs
@@ -4,8 +4,7 @@
 
 use std::{
     fmt::{Debug, Display, Formatter},
-    fs,
-    path::{Path, PathBuf},
+    path::PathBuf,
     sync::Arc,
 };
 
@@ -150,12 +149,6 @@ pub enum KeyToolCommand {
         #[clap(long, short = 's')]
         sort_by_alias: bool,
     },
-    /// This reads the content at the provided file path. The accepted format
-    /// is a Bech32 encoded [enum IotaKeyPair] or `type AuthorityKeyPair`
-    /// (Base64 encoded `privkey`). This prints out the account keypair as
-    /// Base64 encoded `flag || privkey`, the network keypair, protocol
-    /// keypair, authority keypair as Base64 encoded `privkey`.
-    LoadKeypair { file: PathBuf },
     /// To MultiSig Iota Address. Pass in a list of all public keys `flag || pk`
     /// in Base64. See `keytool list` for example public keys.
     MultiSigAddress {
@@ -220,11 +213,6 @@ pub enum KeyToolCommand {
         #[clap(long)]
         base64pk: String,
     },
-    /// This takes a bech32 encoded [enum IotaKeyPair]. It outputs the keypair
-    /// into a file at the current directory where the address is the
-    /// filename, and prints out its Iota address, Base64 encoded public
-    /// key, the key scheme, and the key scheme flag.
-    Unpack { keypair: String },
     // Commented for now: https://github.com/iotaledger/iota/issues/1777
     // /// Given the max_epoch, generate an OAuth url, ask user to paste the
     // /// redirect with id_token, call salt server, then call the prover server,
@@ -356,15 +344,6 @@ pub struct ExportedKey {
     key: Key,
 }
 
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct KeypairData {
-    account_keypair: String,
-    network_keypair: Option<String>,
-    protocol_keypair: Option<String>,
-    key_scheme: String,
-}
-
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct MultiSigAddress {
@@ -456,7 +435,6 @@ pub enum CommandOutput {
     Import(Key),
     Export(ExportedKey),
     List(Vec<Key>),
-    LoadKeypair(KeypairData),
     MultiSigAddress(MultiSigAddress),
     MultiSigCombinePartialSig(MultiSigCombinePartialSig),
     Show(Key),
@@ -665,44 +643,6 @@ impl KeyToolCommand {
                 }
                 CommandOutput::List(keys)
             }
-            KeyToolCommand::LoadKeypair { file } => {
-                let output = match read_keypair_from_file(&file) {
-                    Ok(keypair) => {
-                        // Account keypair is encoded with the key scheme flag {},
-                        // and network and protocol keypair are not.
-                        let network_protocol_keypair = match &keypair {
-                            IotaKeyPair::Ed25519(kp) => kp.encode_base64(),
-                            IotaKeyPair::Secp256k1(kp) => kp.encode_base64(),
-                            IotaKeyPair::Secp256r1(kp) => kp.encode_base64(),
-                        };
-                        KeypairData {
-                            account_keypair: keypair.encode_base64(),
-                            network_keypair: Some(network_protocol_keypair.clone()),
-                            protocol_keypair: Some(network_protocol_keypair),
-                            key_scheme: keypair.public().scheme().to_string(),
-                        }
-                    }
-                    Err(_) => {
-                        // Authority keypair file is not stored with the flag, it will try read as
-                        // BLS keypair..
-                        match read_authority_keypair_from_file(&file) {
-                            Ok(keypair) => KeypairData {
-                                account_keypair: keypair.encode_base64(),
-                                network_keypair: None,
-                                protocol_keypair: None,
-                                key_scheme: SignatureScheme::BLS12381.to_string(),
-                            },
-                            Err(e) => {
-                                return Err(anyhow!(format!(
-                                    "Failed to read keypair at path {:?} err: {:?}",
-                                    file, e
-                                )));
-                            }
-                        }
-                    }
-                };
-                CommandOutput::LoadKeypair(output)
-            }
             KeyToolCommand::MultiSigAddress {
                 threshold,
                 pks,
@@ -854,16 +794,7 @@ impl KeyToolCommand {
                     serialized_sig_base64: serialized_sig,
                 })
             }
-            KeyToolCommand::Unpack { keypair } => {
-                let key = Key::from(
-                    &IotaKeyPair::decode(&keypair)
-                        .map_err(|_| anyhow!("Invalid Bech32 encoded keypair"))?,
-                );
-                let path_str = format!("{}.key", key.iota_address).to_lowercase();
-                let path = Path::new(&path_str);
-                fs::write(path, keypair)?;
-                CommandOutput::Show(key)
-            } /* Commented for now: https://github.com/iotaledger/iota/issues/1777
+            /* Commented for now: https://github.com/iotaledger/iota/issues/1777
                * KeyToolCommand::ZkLoginInsecureSignPersonalMessage { data, max_epoch } => {
                *     let msg = PersonalMessage {
                *         message: data.as_bytes().to_vec(),
diff --git a/crates/iota/tests/cli_tests.rs b/crates/iota/tests/cli_tests.rs
index cc2ce6ec14f..a82107f46c5 100644
--- a/crates/iota/tests/cli_tests.rs
+++ b/crates/iota/tests/cli_tests.rs
@@ -26,7 +26,7 @@ use iota::{
     key_identity::{KeyIdentity, get_identity_address},
 };
 use iota_config::{
-    Config, IOTA_CLIENT_CONFIG, IOTA_FULLNODE_CONFIG, IOTA_GENESIS_FILENAME,
+    IOTA_CLIENT_CONFIG, IOTA_FULLNODE_CONFIG, IOTA_GENESIS_FILENAME,
     IOTA_KEYSTORE_ALIASES_FILENAME, IOTA_KEYSTORE_FILENAME, IOTA_NETWORK_CONFIG, PersistedConfig,
 };
 use iota_json::IotaJsonValue;
@@ -4144,15 +4144,7 @@ async fn test_faucet() -> Result<(), anyhow::Error> {
 
     // Wait for the faucet to be up
     sleep(Duration::from_secs(1)).await;
-
-    let wallet_config = tmp.path().join("walletconfig");
-    let mut keystore = iota_keys::keystore::FileBasedKeystore::new(&tmp.path().join("keystore"))?;
-    keystore
-        .generate_and_add_new_key(SignatureScheme::ED25519, None, None, None)
-        .unwrap();
-    let mut client_config = IotaClientConfig::new(keystore.into());
-    client_config.add_env(iota_sdk::iota_client_config::IotaEnv::localnet());
-    client_config.save(&wallet_config)?;
+    let wallet_config = test_cluster.swarm.dir().join(IOTA_CLIENT_CONFIG);
     let mut context = WalletContext::new(&wallet_config, None, None)?;
 
     let faucet_result = IotaClientCommands::Faucet {
@@ -4170,6 +4162,7 @@ async fn test_faucet() -> Result<(), anyhow::Error> {
     Ok(())
 }
 
+#[ignore = "until the repo is public https://github.com/iotaledger/iota/issues/3741"]
 #[tokio::test]
 async fn test_move_new() -> Result<(), anyhow::Error> {
     let current_dir = std::env::current_dir()?;
diff --git a/crates/prometheus-closure-metric/Cargo.toml b/crates/prometheus-closure-metric/Cargo.toml
index 0557a081041..0f1bfaf9531 100644
--- a/crates/prometheus-closure-metric/Cargo.toml
+++ b/crates/prometheus-closure-metric/Cargo.toml
@@ -1,11 +1,10 @@
 [package]
 name = "prometheus-closure-metric"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/mystenlabs/mysten-infra"
 description = "Library for a Prometheus metric that computes its value by given closure at collection time"
 
 [dependencies]
diff --git a/crates/shared-crypto/Cargo.toml b/crates/shared-crypto/Cargo.toml
index d4cf0bae5d5..c0da759a017 100644
--- a/crates/shared-crypto/Cargo.toml
+++ b/crates/shared-crypto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shared-crypto"
-version = "0.0.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/shared-crypto/src/intent.rs b/crates/shared-crypto/src/intent.rs
index 493c2f8e7c8..9bbd9234232 100644
--- a/crates/shared-crypto/src/intent.rs
+++ b/crates/shared-crypto/src/intent.rs
@@ -28,7 +28,7 @@ impl TryFrom<u8> for IntentVersion {
 }
 
 /// This enums specifies the application ID. Two intents in two different
-/// applications (i.e., Narwhal, Iota, Ethereum etc) should never collide, so
+/// applications (i.e., Iota, Ethereum etc) should never collide, so
 /// that even when a signing key is reused, nobody can take a signature
 /// designated for app_1 and present it as a valid signature for an (any) intent
 /// in app_2.
@@ -36,8 +36,7 @@ impl TryFrom<u8> for IntentVersion {
 #[repr(u8)]
 pub enum AppId {
     Iota = 0,
-    Narwhal = 1,
-    Consensus = 2,
+    Consensus = 1,
 }
 
 // TODO(joyqvq): Use num_derive
@@ -67,9 +66,8 @@ pub enum IntentScope {
     SenderSignedTransaction = 4, // Used for an authority signature on a user signed transaction.
     ProofOfPossession = 5,       /* Used as a signature representing an authority's proof of
                                   * possession of its authority key. */
-    HeaderDigest = 6,      // Used for narwhal authority signature on header digest.
-    BridgeEventUnused = 7, // for bridge purposes but it's currently not included in messages.
-    ConsensusBlock = 8,    // Used for consensus authority signature on block's digest
+    BridgeEventUnused = 6, // for bridge purposes but it's currently not included in messages.
+    ConsensusBlock = 7,    // Used for consensus authority signature on block's digest
 }
 
 impl TryFrom<u8> for IntentScope {
@@ -144,14 +142,6 @@ impl Intent {
         }
     }
 
-    pub fn narwhal_app(scope: IntentScope) -> Self {
-        Self {
-            scope,
-            version: IntentVersion::V0,
-            app_id: AppId::Narwhal,
-        }
-    }
-
     pub fn consensus_app(scope: IntentScope) -> Self {
         Self {
             scope,
diff --git a/crates/simulacrum/Cargo.toml b/crates/simulacrum/Cargo.toml
index 1218a2c8dea..8480e289088 100644
--- a/crates/simulacrum/Cargo.toml
+++ b/crates/simulacrum/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "simulacrum"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/simulacrum/src/store/in_mem_store.rs b/crates/simulacrum/src/store/in_mem_store.rs
index e704f797259..cd05dc3e8a4 100644
--- a/crates/simulacrum/src/store/in_mem_store.rs
+++ b/crates/simulacrum/src/store/in_mem_store.rs
@@ -18,8 +18,8 @@ use iota_types::{
     },
     object::{Object, Owner},
     storage::{
-        BackingPackageStore, ChildObjectResolver, ObjectStore, PackageObject, ParentSync,
-        get_module, load_package_object_from_object_store,
+        BackingPackageStore, ChildObjectResolver, ObjectStore, PackageObject, get_module,
+        load_package_object_from_object_store,
     },
     transaction::VerifiedTransaction,
 };
@@ -326,15 +326,6 @@ impl ObjectStore for InMemoryStore {
     }
 }
 
-impl ParentSync for InMemoryStore {
-    fn get_latest_parent_entry_ref_deprecated(
-        &self,
-        _object_id: ObjectID,
-    ) -> iota_types::error::IotaResult<Option<iota_types::base_types::ObjectRef>> {
-        panic!("Never called in newer protocol versions")
-    }
-}
-
 #[derive(Debug)]
 pub struct KeyStore {
     validator_keys: BTreeMap<AuthorityName, AuthorityKeyPair>,
diff --git a/crates/simulacrum/src/store/mod.rs b/crates/simulacrum/src/store/mod.rs
index b6a2b92fc7f..0da62903796 100644
--- a/crates/simulacrum/src/store/mod.rs
+++ b/crates/simulacrum/src/store/mod.rs
@@ -16,7 +16,7 @@ use iota_types::{
         VerifiedCheckpoint,
     },
     object::Object,
-    storage::{BackingStore, ChildObjectResolver, ParentSync},
+    storage::{BackingStore, ChildObjectResolver},
     transaction::{
         InputObjectKind, InputObjects, ObjectReadResult, ReceivingObjectReadResult,
         ReceivingObjects, VerifiedTransaction,
@@ -25,10 +25,7 @@ use iota_types::{
 pub mod in_mem_store;
 
 pub trait SimulatorStore:
-    iota_types::storage::BackingPackageStore
-    + iota_types::storage::ObjectStore
-    + ParentSync
-    + ChildObjectResolver
+    iota_types::storage::BackingPackageStore + iota_types::storage::ObjectStore + ChildObjectResolver
 {
     fn init_with_genesis(&mut self, genesis: &genesis::Genesis) {
         self.insert_checkpoint(genesis.checkpoint());
diff --git a/crates/telemetry-subscribers/Cargo.toml b/crates/telemetry-subscribers/Cargo.toml
index 10a0bfe8bfb..0c72ef2a852 100644
--- a/crates/telemetry-subscribers/Cargo.toml
+++ b/crates/telemetry-subscribers/Cargo.toml
@@ -1,11 +1,10 @@
 [package]
 name = "telemetry-subscribers"
-version = "0.2.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/mystenlabs/mysten-infra"
 description = "Library for common telemetry and observability functionality"
 
 [dependencies]
diff --git a/crates/test-cluster/Cargo.toml b/crates/test-cluster/Cargo.toml
index 8daa823b3d3..0d2d1c2f3cf 100644
--- a/crates/test-cluster/Cargo.toml
+++ b/crates/test-cluster/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "test-cluster"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -50,3 +50,4 @@ iota-simulator.workspace = true
 [dev-dependencies]
 iota-json-rpc-api.workspace = true
 iota-macros.workspace = true
+iota-metrics.workspace = true
diff --git a/crates/test-cluster/src/lib.rs b/crates/test-cluster/src/lib.rs
index f65967780ae..c0167e5b082 100644
--- a/crates/test-cluster/src/lib.rs
+++ b/crates/test-cluster/src/lib.rs
@@ -79,6 +79,7 @@ use iota_types::{
         epoch_start_iota_system_state::EpochStartSystemStateTrait,
     },
     message_envelope::Message,
+    messages_grpc::HandleCertificateRequestV1,
     object::Object,
     quorum_driver_types::ExecuteTransactionRequestType,
     supported_protocol_versions::SupportedProtocolVersions,
@@ -755,7 +756,14 @@ impl TestCluster {
                 })
                 .map(|client| {
                     let cert = certificate.clone();
-                    async move { client.handle_certificate_v2(cert, None).await }
+                    async move {
+                        client
+                            .handle_certificate_v1(
+                                HandleCertificateRequestV1::new(cert).with_events(),
+                                None,
+                            )
+                            .await
+                    }
                 })
                 .collect();
 
@@ -778,9 +786,9 @@ impl TestCluster {
         let mut all_events = HashMap::new();
         for reply in replies {
             let effects = reply.signed_effects.into_data();
+            let events = reply.events.unwrap_or_default();
             all_effects.insert(effects.digest(), effects);
-            all_events.insert(reply.events.digest(), reply.events);
-            // reply.fastpath_input_objects is unused.
+            all_events.insert(events.digest(), events);
         }
         assert_eq!(all_effects.len(), 1);
         assert_eq!(all_events.len(), 1);
diff --git a/crates/transaction-fuzzer/Cargo.toml b/crates/transaction-fuzzer/Cargo.toml
index 97b1df784d4..60523fe6424 100644
--- a/crates/transaction-fuzzer/Cargo.toml
+++ b/crates/transaction-fuzzer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "transaction-fuzzer"
-version = "0.1.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/transaction-fuzzer/src/account_universe/transfer_gen.rs b/crates/transaction-fuzzer/src/account_universe/transfer_gen.rs
index 255445d50c5..7bdeb9adfdc 100644
--- a/crates/transaction-fuzzer/src/account_universe/transfer_gen.rs
+++ b/crates/transaction-fuzzer/src/account_universe/transfer_gen.rs
@@ -365,7 +365,7 @@ impl RunInfo {
         let gas_budget_too_low = p2p.gas < PROTOCOL_CONFIG.base_tx_cost_fixed() * p2p.gas_price;
         let not_enough_gas = p2p.gas < p2p_success_gas(p2p.gas_price);
         let gas_price_too_low = p2p.gas_price < rgp;
-        let gas_price_too_high = p2p.gas_price >= PROTOCOL_CONFIG.max_gas_price();
+        let gas_price_too_high = p2p.gas_price > PROTOCOL_CONFIG.max_gas_price();
         let gas_price_greater_than_budget = p2p.gas_price > p2p.gas;
         let gas_units_too_low = p2p.gas_price > 0
             && p2p.gas / p2p.gas_price < INSUFFICIENT_GAS_UNITS_THRESHOLD
diff --git a/crates/typed-store-derive/Cargo.toml b/crates/typed-store-derive/Cargo.toml
index f355b808f50..5e0e1bddbc7 100644
--- a/crates/typed-store-derive/Cargo.toml
+++ b/crates/typed-store-derive/Cargo.toml
@@ -1,11 +1,10 @@
 [package]
 name = "typed-store-derive"
-version = "0.3.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/mystenlabs/mysten-infra"
 description = "macros for the typed-store crate"
 
 [lib]
diff --git a/crates/typed-store-error/Cargo.toml b/crates/typed-store-error/Cargo.toml
index ab14978016d..053debfe3c4 100644
--- a/crates/typed-store-error/Cargo.toml
+++ b/crates/typed-store-error/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "typed-store-error"
-version = "0.4.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/crates/typed-store-workspace-hack/Cargo.toml b/crates/typed-store-workspace-hack/Cargo.toml
index b6d7587f629..b5ce61668d5 100644
--- a/crates/typed-store-workspace-hack/Cargo.toml
+++ b/crates/typed-store-workspace-hack/Cargo.toml
@@ -6,7 +6,7 @@
 # dependencies that were relevant for rocksdb.
 [package]
 name = "typed-store-workspace-hack"
-version = "0.0.0"
+version.workspace = true
 edition = "2021"
 license = "Apache-2.0"
 publish = false
diff --git a/crates/typed-store/Cargo.toml b/crates/typed-store/Cargo.toml
index 48389f44d0b..603c728be05 100644
--- a/crates/typed-store/Cargo.toml
+++ b/crates/typed-store/Cargo.toml
@@ -1,11 +1,10 @@
 [package]
 name = "typed-store"
-version = "0.4.0"
+version.workspace = true
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/mystenlabs/mysten-infra"
 description = "a typed database interface"
 
 [dependencies]
diff --git a/deny.toml b/deny.toml
index c9b6cb32a5d..d572a2fd3cf 100644
--- a/deny.toml
+++ b/deny.toml
@@ -83,6 +83,7 @@ allow = [
   "Unlicense",
   "BSL-1.0",
   "Unicode-DFS-2016",
+  "OpenSSL",
   # "Apache-2.0 WITH LLVM-exception",
 ]
 # The confidence threshold for detecting a license from license text.
@@ -93,7 +94,7 @@ confidence-threshold = 0.8
 # Allow 1 or more licenses on a per-crate basis, so that particular licenses
 # aren't accepted for every possible crate as with the normal allow list
 exceptions = [
-
+  { allow = ["GPL-2.0"], name = "mysqlclient-src" },
 
   # Each entry is the crate and version constraint, and its specific allow
   # list
diff --git a/docker/iota-bridge-indexer/Dockerfile b/docker/iota-bridge-indexer/Dockerfile
index 34f693ebedf..cfef887f5a6 100644
--- a/docker/iota-bridge-indexer/Dockerfile
+++ b/docker/iota-bridge-indexer/Dockerfile
@@ -33,7 +33,6 @@ COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
 COPY iota-execution iota-execution
-COPY narwhal narwhal
 COPY external-crates external-crates
 COPY docs docs
 
diff --git a/docker/iota-graphql-rpc/Dockerfile b/docker/iota-graphql-rpc/Dockerfile
index f80a680b239..ef3f3f71f32 100644
--- a/docker/iota-graphql-rpc/Dockerfile
+++ b/docker/iota-graphql-rpc/Dockerfile
@@ -30,7 +30,6 @@ COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
 COPY iota-execution iota-execution
-COPY narwhal narwhal
 COPY external-crates external-crates
 COPY docs docs
 
diff --git a/docker/iota-indexer-tidb/Dockerfile b/docker/iota-indexer-tidb/Dockerfile
index cbdb7d88274..3b959e6aeb3 100644
--- a/docker/iota-indexer-tidb/Dockerfile
+++ b/docker/iota-indexer-tidb/Dockerfile
@@ -33,7 +33,6 @@ COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
 COPY iota-execution iota-execution
-COPY narwhal narwhal
 COPY external-crates external-crates
 COPY docs docs
 
diff --git a/docker/iota-indexer/Dockerfile b/docker/iota-indexer/Dockerfile
index 94938ff3426..6f2f35f61fd 100644
--- a/docker/iota-indexer/Dockerfile
+++ b/docker/iota-indexer/Dockerfile
@@ -33,7 +33,6 @@ COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
 COPY iota-execution iota-execution
-COPY narwhal narwhal
 COPY external-crates external-crates
 COPY docs docs
 
diff --git a/docker/iota-network/docker-compose.yaml b/docker/iota-network/docker-compose.yaml
index 11d76e05d7b..a541342445b 100644
--- a/docker/iota-network/docker-compose.yaml
+++ b/docker/iota-network/docker-compose.yaml
@@ -10,7 +10,7 @@ services:
     hostname: validator1
     environment:
       - RUST_BACKTRACE=1
-      - RUST_LOG=info,iota_core=debug,iota_network=debug,iota_node=debug,narwhal=debug,narwhal-primary::helper=info,jsonrpsee=error
+      - RUST_LOG=info,iota_core=debug,iota_network=debug,iota_node=debug,jsonrpsee=error
       - RPC_WORKER_THREAD=12
       - NEW_CHECKPOINT_WARNING_TIMEOUT_MS=30000
       - NEW_CHECKPOINT_PANIC_TIMEOUT_MS=60000
@@ -39,7 +39,7 @@ services:
     hostname: validator2
     environment:
       - RUST_BACKTRACE=1
-      - RUST_LOG=info,iota_core=debug,iota_network=debug,iota_node=debug,narwhal=debug,narwhal-primary::helper=info,jsonrpsee=error
+      - RUST_LOG=info,iota_core=debug,iota_network=debug,iota_node=debug,jsonrpsee=error
       - RPC_WORKER_THREAD=12
       - NEW_CHECKPOINT_WARNING_TIMEOUT_MS=30000
       - NEW_CHECKPOINT_PANIC_TIMEOUT_MS=60000
@@ -68,7 +68,7 @@ services:
     hostname: validator3
     environment:
       - RUST_BACKTRACE=1
-      - RUST_LOG=info,iota_core=debug,iota_network=debug,iota_node=debug,narwhal=debug,narwhal-primary::helper=info,jsonrpsee=error
+      - RUST_LOG=info,iota_core=debug,iota_network=debug,iota_node=debug,jsonrpsee=error
       - RPC_WORKER_THREAD=12
       - NEW_CHECKPOINT_WARNING_TIMEOUT_MS=30000
       - NEW_CHECKPOINT_PANIC_TIMEOUT_MS=60000
@@ -97,7 +97,7 @@ services:
     hostname: validator4
     environment:
       - RUST_BACKTRACE=1
-      - RUST_LOG=info,iota_core=debug,iota_network=debug,iota_node=debug,narwhal=debug,narwhal-primary::helper=info,jsonrpsee=error
+      - RUST_LOG=info,iota_core=debug,iota_network=debug,iota_node=debug,jsonrpsee=error
       - RPC_WORKER_THREAD=12
       - NEW_CHECKPOINT_WARNING_TIMEOUT_MS=30000
       - NEW_CHECKPOINT_PANIC_TIMEOUT_MS=60000
@@ -126,7 +126,7 @@ services:
     container_name: fullnode1
     environment:
       - RUST_BACKTRACE=1
-      - RUST_LOG=info,iota_core=debug,iota_network=debug,iota_node=debug,narwhal=debug,narwhal-primary::helper=info,jsonrpsee=error
+      - RUST_LOG=info,iota_core=debug,iota_network=debug,iota_node=debug,jsonrpsee=error
       - RPC_WORKER_THREAD=12
       - NEW_CHECKPOINT_WARNING_TIMEOUT_MS=30000
       - NEW_CHECKPOINT_PANIC_TIMEOUT_MS=60000
diff --git a/docker/iota-network/genesis/overlays/common.yaml b/docker/iota-network/genesis/overlays/common.yaml
index 7a0fc8f9c69..ee6b9b7f0d8 100644
--- a/docker/iota-network/genesis/overlays/common.yaml
+++ b/docker/iota-network/genesis/overlays/common.yaml
@@ -8,8 +8,6 @@ validator:
   db-path: /opt/iota/db/authorities_db
   consensus-config:
     db-path: /opt/iota/db/consensus_db
-    narwhal-config:
-      max_header_delay: 2000ms
   expensive-safety-check-config:
     enable-epoch-iota-conservation-check: false
     enable-deep-per-tx-iota-conservation-check: false
diff --git a/docker/iota-node/Dockerfile b/docker/iota-node/Dockerfile
index 1d700a3c566..5b39641cb2c 100644
--- a/docker/iota-node/Dockerfile
+++ b/docker/iota-node/Dockerfile
@@ -30,7 +30,6 @@ COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
 COPY iota-execution iota-execution
-COPY narwhal narwhal
 COPY external-crates external-crates
 COPY docs docs
 
diff --git a/docker/iota-private-network/bootstrap.sh b/docker/iota-private-network/bootstrap.sh
index bd705da6109..8f58aaa6ed7 100755
--- a/docker/iota-private-network/bootstrap.sh
+++ b/docker/iota-private-network/bootstrap.sh
@@ -47,7 +47,6 @@ generate_genesis_files() {
         .genesis.genesis-file-location = $overlay.genesis.genesis-file-location |
         .db-path = $overlay.db-path |
         .consensus-config.db-path = $overlay.consensus-config.db-path |
-        .consensus-config.narwhal-config.max_header_delay = $overlay.consensus-config.narwhal-config.max_header_delay |
         .expensive-safety-check-config = $overlay.expensive-safety-check-config |
         .epoch_duration_ms = $overlay.epoch_duration_ms
       ' "$file" "$OVERLAY_PATH" >"${file}.tmp" && mv "${file}.tmp" "$file"
diff --git a/docker/iota-private-network/configs/validator-common.yaml b/docker/iota-private-network/configs/validator-common.yaml
index 7a0fc8f9c69..ee6b9b7f0d8 100644
--- a/docker/iota-private-network/configs/validator-common.yaml
+++ b/docker/iota-private-network/configs/validator-common.yaml
@@ -8,8 +8,6 @@ validator:
   db-path: /opt/iota/db/authorities_db
   consensus-config:
     db-path: /opt/iota/db/consensus_db
-    narwhal-config:
-      max_header_delay: 2000ms
   expensive-safety-check-config:
     enable-epoch-iota-conservation-check: false
     enable-deep-per-tx-iota-conservation-check: false
diff --git a/docker/iota-private-network/docker-compose.yaml b/docker/iota-private-network/docker-compose.yaml
index 5cce4086610..73e889cddbe 100644
--- a/docker/iota-private-network/docker-compose.yaml
+++ b/docker/iota-private-network/docker-compose.yaml
@@ -4,7 +4,7 @@ x-common-validator: &common-validator
   image: iota-node
   environment: &common-env
     - RUST_BACKTRACE=1
-    - RUST_LOG=info,iota_core=debug,iota_network=debug,iota_node=debug,narwhal=debug,narwhal-primary::helper=info,jsonrpsee=error
+    - RUST_LOG=info,iota_core=debug,iota_network=debug,iota_node=debug,jsonrpsee=error
     - RPC_WORKER_THREAD=12
     - NEW_CHECKPOINT_WARNING_TIMEOUT_MS=30000
     - NEW_CHECKPOINT_PANIC_TIMEOUT_MS=60000
diff --git a/docker/iota-services/Dockerfile b/docker/iota-services/Dockerfile
index 8a33a195429..21708c1861d 100644
--- a/docker/iota-services/Dockerfile
+++ b/docker/iota-services/Dockerfile
@@ -28,7 +28,6 @@ COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
 COPY iota-execution iota-execution
-COPY narwhal narwhal
 COPY external-crates external-crates
 COPY docs docs
 
diff --git a/docker/iota-source-service/Dockerfile b/docker/iota-source-service/Dockerfile
index 7fd848c56fb..f36c18b6672 100644
--- a/docker/iota-source-service/Dockerfile
+++ b/docker/iota-source-service/Dockerfile
@@ -28,7 +28,6 @@ COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
 COPY iota-execution iota-execution
-COPY narwhal narwhal
 COPY external-crates external-crates
 COPY docs docs
 
diff --git a/docker/iota-tools/Dockerfile b/docker/iota-tools/Dockerfile
index 3766da842a1..85a4d15a2a1 100644
--- a/docker/iota-tools/Dockerfile
+++ b/docker/iota-tools/Dockerfile
@@ -30,7 +30,6 @@ COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
 COPY iota-execution iota-execution
-COPY narwhal narwhal
 COPY external-crates external-crates
 COPY docs docs
 
diff --git a/docker/iota/Dockerfile b/docker/iota/Dockerfile
index 574daec1b2b..0d474f96404 100644
--- a/docker/iota/Dockerfile
+++ b/docker/iota/Dockerfile
@@ -31,7 +31,6 @@ COPY Cargo.toml Cargo.lock ./
 COPY consensus consensus
 COPY crates crates
 COPY iota-execution iota-execution
-COPY narwhal narwhal
 COPY external-crates external-crates
 COPY docs docs
 
diff --git a/docker/pg-services-local/docker-compose.yaml b/docker/pg-services-local/docker-compose.yaml
index 413de506ecd..fe8e31ab08a 100644
--- a/docker/pg-services-local/docker-compose.yaml
+++ b/docker/pg-services-local/docker-compose.yaml
@@ -29,7 +29,7 @@ services:
       - "127.0.0.1:9000:9000"
       - "127.0.0.1:9123:9123"
     healthcheck:
-      test: "curl -f http://local-network:9000/rest/"
+      test: "curl -f http://local-network:9000/api/v1/"
       interval: 1s
       start_period: 5s
       timeout: 2s
diff --git a/docs/content/developer/advanced/iota-repository.mdx b/docs/content/developer/advanced/iota-repository.mdx
index 4837ac4190a..c9ed46a047e 100644
--- a/docs/content/developer/advanced/iota-repository.mdx
+++ b/docs/content/developer/advanced/iota-repository.mdx
@@ -36,8 +36,6 @@ overview of the most important folders:
   programming language.
 - [kiosk](https://github.com/iotaledger/iota/tree/develop/kiosk): Contains the source code of the `IOTA Kiosk`
   extensions and rules, as well as examples.
-- [narwhal](https://github.com/iotaledger/iota/tree/develop/narwhal): Contains the source code of Narwhal and partially
-  synchronous Bullshark, a DAG-based mempool, and efficient BFT consensus.
 - [nre](https://github.com/iotaledger/iota/tree/develop/nre): Contains information about node and network reliability
   engineering.
 - [scripts](https://github.com/iotaledger/iota/tree/develop/scripts): Contains a number of scripts that are used
@@ -51,7 +49,6 @@ overview of the most important folders:
 The following primary directories offer a good starting point for exploring the IOTA codebase:
 
 - [move](https://github.com/iotaledger/iota/tree/develop/external-crates/move) - Move VM, compiler, and tools.
-- [narwhal](https://github.com/iotaledger/iota/tree/develop/narwhal) - Mempool and consensus.
 - [typescript-sdk](https://github.com/iotaledger/iota/tree/develop/sdk/typescript/) - the IOTA TypeScript SDK.
 - [wallet](https://github.com/iotaledger/iota/tree/develop/apps/wallet) - Chrome extension wallet for IOTA.
 - [iota](https://github.com/iotaledger/iota/tree/develop/crates/iota) - the IOTA command line tool.
diff --git a/docs/content/operator/telemetry/iota-metrics.mdx b/docs/content/operator/telemetry/iota-metrics.mdx
index 0bb8ffbb7e0..89d886e28b1 100644
--- a/docs/content/operator/telemetry/iota-metrics.mdx
+++ b/docs/content/operator/telemetry/iota-metrics.mdx
@@ -141,7 +141,7 @@ It works as follows:
             .unwrap();
 
         // Create another registry and add a metric to it
-        let registry_1 = Registry::new_custom(Some("narwhal".to_string()), None).unwrap();
+        let registry_1 = Registry::new_custom(Some("consensus".to_string()), None).unwrap();
         registry_1
             .register(Box::new(
                 IntCounter::new("counter_1", "counter_1_desc").unwrap(),
@@ -165,7 +165,7 @@ It works as follows:
 
         // Check the second metric
         let metric_2 = metrics.remove(0);
-        assert_eq!(metric_2.get_name(), "narwhal_counter_1");
+        assert_eq!(metric_2.get_name(), "consensus_counter_1");
         assert_eq!(metric_2.get_help(), "counter_1_desc");
 ```
 
diff --git a/docs/content/references/cli/ceremony.mdx b/docs/content/references/cli/ceremony.mdx
index 5f6943ba522..cee2316d766 100644
--- a/docs/content/references/cli/ceremony.mdx
+++ b/docs/content/references/cli/ceremony.mdx
@@ -3,7 +3,7 @@ title: IOTA Genesis Ceremony CLI
 description: The IOTA Genesis Ceremony CLI provides commands for building a Genesis blob file.
 ---
 
-The IOTA CLI `genesis-ceremony` command allows the orchestration of an IOTA Genesis Ceremony, 
+The IOTA CLI `genesis-ceremony` command allows the orchestration of an IOTA Genesis Ceremony,
 where multiple remote validators can sign a genesis blob. Each step persists in a file structure
 that can be shared (for instance, via GitHub) with the validators.
 
@@ -41,7 +41,7 @@ The following example demonstrates how to build a genesis blob.
 
 ### Initialize the Genesis Builder
 
-This command creates a structure in the file system to persist the genesis builder. 
+This command creates a structure in the file system to persist the genesis builder.
 Afterward, the below commands can be used to set additional configurations.
 
 ```shell
@@ -126,15 +126,26 @@ validator1     0xba55e3ce221bb7edfbbef4d59b68893f5550b6302a9456b738ad8cf06919be0
 
 </details>
 
-### Add Token Allocation
+### Initialize the Token Distribution Schedule
 
-This command allocates tokens to a given address for the genesis transaction, 
-and can be used to provide tokens to the faucet address.
+Set the initial token distribution schedule through a `.csv` file:
+
+```csv
+recipient-address,amount-nanos,staked-with-validator,staked-with-timelock-expiration
+<faucet-address>,1500000000000000,,
+<validator-1-address>,1500000000000000,<validator-1-address>,
+<validator-2-address>,1500000000000000,<validator-2-address>,
+```
+
+This is useful for allocating funds for a faucet, or for distributing the initial
+stake to validators.
+
+The resulting distribution schedule is amended only if any migration sources are
+passed in the [Build the Unsigned Checkpoint](#build-the-unsigned-checkpoint) step.
 
 ```shell
-iota genesis-ceremony add-token-allocation \
-    --recipient-address 0x923f43e0d325cd298c28a148858bb755921cfb032deeb0d2fb7772d6b4b168e0 \
-    --amount-nanos 1500000000000000
+$ iota genesis-ceremony init-token-distribution-schedule \
+    --token-allocations-path <path-to-token-allocations-csv-file>
 ```
 
 ### Validate the Genesis State
@@ -153,7 +164,7 @@ iota genesis-ceremony build-unsigned-checkpoint
 
 ### Examine the Genesis Checkpoint
 
-This command opens the Genesis Inspector, a responsive command-line tool which allows viewing various 
+This command opens the Genesis Inspector, a responsive command-line tool which allows viewing various
 attributes of the current built checkpoint.
 
 ```shell
diff --git a/docs/content/references/cli/keytool.mdx b/docs/content/references/cli/keytool.mdx
index f9ab9bcddc2..77a4581fe3b 100644
--- a/docs/content/references/cli/keytool.mdx
+++ b/docs/content/references/cli/keytool.mdx
@@ -29,9 +29,6 @@ Commands:
                                      provided, the tool will automatically generate one
   export                         Output the private key of the given key identity in Iota CLI Keystore as Bech32 encoded string starting with `iotaprivkey`
   list                           List all keys by its Iota address, Base64 encoded public key, key scheme name in iota.keystore
-  load-keypair                   This reads the content at the provided file path. The accepted format can be [enum IotaKeyPair] (Base64 encoded of 33-byte `flag || privkey`) or `type
-                                     AuthorityKeyPair` (Base64 encoded `privkey`). This prints out the account keypair as Base64 encoded `flag || privkey`, the network keypair, protocol keypair,
-                                     authority keypair as Base64 encoded `privkey`
   multi-sig-address              To MultiSig Iota Address. Pass in a list of all public keys `flag || pk` in Base64. See `keytool list` for example public keys
   multi-sig-combine-partial-sig  Provides a list of participating signatures (`flag || sig || pk` encoded in Base64), threshold, a list of all public keys and a list of their weights that
                                      define the MultiSig address. Returns a valid MultiSig signature and its sender address. The result can be used as signature field for `iota client
@@ -43,8 +40,6 @@ Commands:
   sign-kms                       Creates a signature by leveraging AWS KMS. Pass in a key-id to leverage Amazon KMS to sign a message and the base64 pubkey. Generate PubKey from pem using
                                      iotaledger/base64pemkey Any signature commits to a [struct IntentMessage] consisting of the Base64 encoded of the BCS serialized transaction bytes itself and
                                      its intent. If intent is absent, default will be used
-  unpack                         This takes [enum IotaKeyPair] of Base64 encoded of 33-byte `flag || privkey`). It outputs the keypair into a file at the current directory where the address is
-                                     the filename, and prints out its Iota address, Base64 encoded public key, the key scheme, and the key scheme flag
   help                           Print this message or the help of the given subcommand(s)
 
 Options:
diff --git a/external-crates/move/crates/bytecode-verifier-prop-tests/Cargo.toml b/external-crates/move/crates/bytecode-verifier-prop-tests/Cargo.toml
index 819600b4d7f..eb7214686bb 100644
--- a/external-crates/move/crates/bytecode-verifier-prop-tests/Cargo.toml
+++ b/external-crates/move/crates/bytecode-verifier-prop-tests/Cargo.toml
@@ -3,11 +3,9 @@ name = "bytecode-verifier-prop-tests"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
-description = "Diem bytecode verifier tests"
+description = "Move bytecode verifier tests"
 
 [dev-dependencies]
 hex.workspace = true
diff --git a/external-crates/move/crates/bytecode-verifier-tests/Cargo.toml b/external-crates/move/crates/bytecode-verifier-tests/Cargo.toml
index 6659eeb238f..37dd473d1ae 100644
--- a/external-crates/move/crates/bytecode-verifier-tests/Cargo.toml
+++ b/external-crates/move/crates/bytecode-verifier-tests/Cargo.toml
@@ -3,11 +3,9 @@ name = "bytecode-verifier-tests"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
-description = "Diem bytecode verifier tests"
+description = "Move bytecode verifier tests"
 
 [dev-dependencies]
 hex.workspace = true
diff --git a/external-crates/move/crates/invalid-mutations/Cargo.toml b/external-crates/move/crates/invalid-mutations/Cargo.toml
index 531d1c1f0e3..7021c23a31b 100644
--- a/external-crates/move/crates/invalid-mutations/Cargo.toml
+++ b/external-crates/move/crates/invalid-mutations/Cargo.toml
@@ -3,11 +3,9 @@ name = "invalid-mutations"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
-description = "Diem invalid mutations"
+description = "Move invalid mutations"
 
 [dependencies]
 move-binary-format.workspace = true
diff --git a/external-crates/move/crates/language-benchmarks/Cargo.toml b/external-crates/move/crates/language-benchmarks/Cargo.toml
index 493fd835976..582979bdcd2 100644
--- a/external-crates/move/crates/language-benchmarks/Cargo.toml
+++ b/external-crates/move/crates/language-benchmarks/Cargo.toml
@@ -3,10 +3,8 @@ name = "language-benchmarks"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "Move language benchmarks"
 
 [dependencies]
diff --git a/external-crates/move/crates/module-generation/Cargo.toml b/external-crates/move/crates/module-generation/Cargo.toml
index 650f3c1d3c2..f7a131cf8ac 100644
--- a/external-crates/move/crates/module-generation/Cargo.toml
+++ b/external-crates/move/crates/module-generation/Cargo.toml
@@ -3,11 +3,9 @@ name = "module-generation"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
-description = "Diem binary module generation"
+description = "Move binary module generation"
 
 [dependencies]
 rand.workspace = true
diff --git a/external-crates/move/crates/move-analyzer/Cargo.toml b/external-crates/move/crates/move-analyzer/Cargo.toml
index 359f21bc70c..2ff11f4caaf 100644
--- a/external-crates/move/crates/move-analyzer/Cargo.toml
+++ b/external-crates/move/crates/move-analyzer/Cargo.toml
@@ -5,7 +5,6 @@ authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/move-language/move"
 description = "A language server for Move"
 
 [dependencies]
diff --git a/external-crates/move/crates/move-analyzer/editors/code/package-lock.json b/external-crates/move/crates/move-analyzer/editors/code/package-lock.json
index ebb58e03531..05ce33f9371 100644
--- a/external-crates/move/crates/move-analyzer/editors/code/package-lock.json
+++ b/external-crates/move/crates/move-analyzer/editors/code/package-lock.json
@@ -1,12 +1,12 @@
 {
-  "name": "move",
-  "version": "1.0.10",
+  "name": "iota-move",
+  "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "move",
-      "version": "1.0.10",
+      "name": "iota-move",
+      "version": "1.0.0",
       "license": "Apache-2.0",
       "dependencies": {
         "command-exists": "^1.2.9",
@@ -23,7 +23,7 @@
         "@types/vscode": "^1.61.0",
         "@typescript-eslint/eslint-plugin": "^6.10.0",
         "@typescript-eslint/parser": "^6.10.0",
-        "@vscode/test-electron": "^2.0.0",
+        "@vscode/test-electron": "^2.4.1",
         "copyfiles": "2.4.1",
         "cross-env": "^7.0.3",
         "eslint": "^8.53.0",
@@ -463,20 +463,63 @@
       "dev": true
     },
     "node_modules/@vscode/test-electron": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.6.tgz",
-      "integrity": "sha512-M31xGH0RgqNU6CZ4/9g39oUMJ99nLzfjA+4UbtIQ6TcXQ6+2qkjOOxedmPBDDCg26/3Al5ubjY80hIoaMwKYSw==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.4.1.tgz",
+      "integrity": "sha512-Gc6EdaLANdktQ1t+zozoBVRynfIsMKMc94Svu1QreOBC8y76x4tvaK32TljrLi1LI2+PK58sDVbL7ALdqf3VRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
+        "http-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.5",
         "jszip": "^3.10.1",
-        "semver": "^7.5.2"
+        "ora": "^7.0.1",
+        "semver": "^7.6.2"
       },
       "engines": {
         "node": ">=16"
       }
     },
+    "node_modules/@vscode/test-electron/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@vscode/test-electron/node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/@vscode/test-electron/node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/acorn": {
       "version": "8.11.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz",
@@ -915,6 +958,35 @@
       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
       "dev": true
     },
+    "node_modules/cli-cursor": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz",
+      "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "restore-cursor": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-spinners": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
+      "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
@@ -1231,6 +1303,13 @@
         "readable-stream": "^2.0.2"
       }
     },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/editorconfig": {
       "version": "0.15.3",
       "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
@@ -2093,6 +2172,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-interactive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz",
+      "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -2381,6 +2473,16 @@
         "node": ">=4"
       }
     },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/mimic-response": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
@@ -2690,6 +2792,22 @@
         "wrappy": "1"
       }
     },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/optionator": {
       "version": "0.9.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
@@ -2707,6 +2825,127 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/ora": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-7.0.1.tgz",
+      "integrity": "sha512-0TUxTiFJWv+JnjWm4o9yvuskpEJLXTcng8MJuKd+SzAzp2o+OP3HWqNhB4OdJRt1Vsd9/mR0oyaEYlOnL7XIRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^5.3.0",
+        "cli-cursor": "^4.0.0",
+        "cli-spinners": "^2.9.0",
+        "is-interactive": "^2.0.0",
+        "is-unicode-supported": "^1.3.0",
+        "log-symbols": "^5.1.0",
+        "stdin-discarder": "^0.1.0",
+        "string-width": "^6.1.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/ora/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/ora/node_modules/emoji-regex": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ora/node_modules/is-unicode-supported": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz",
+      "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/log-symbols": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-5.1.0.tgz",
+      "integrity": "sha512-l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^5.0.0",
+        "is-unicode-supported": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/string-width": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-6.1.0.tgz",
+      "integrity": "sha512-k01swCJAgQmuADB0YIc+7TuatfNvTBVOoaUWJjTB9R4VJzR5vNWzf5t42ESVZFPS8xTySF7CAdV4t/aaIm3UnQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^10.2.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
     "node_modules/p-limit": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -3061,6 +3300,23 @@
         "node": ">=4"
       }
     },
+    "node_modules/restore-cursor": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz",
+      "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -3203,6 +3459,13 @@
       "integrity": "sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==",
       "dev": true
     },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/simple-concat": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
@@ -3257,6 +3520,74 @@
         "node": ">=8"
       }
     },
+    "node_modules/stdin-discarder": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.1.0.tgz",
+      "integrity": "sha512-xhV7w8S+bUwlPTb4bAOUQhv8/cSS5offJuX8GQGq32ONF0ZtDWKfkdomM3HMRA+LhX6um/FZ0COqlwsjD53LeQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bl": "^5.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/stdin-discarder/node_modules/bl": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz",
+      "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer": "^6.0.3",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/stdin-discarder/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
+      }
+    },
+    "node_modules/stdin-discarder/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
diff --git a/external-crates/move/crates/move-analyzer/editors/code/package.json b/external-crates/move/crates/move-analyzer/editors/code/package.json
index e5242702ddb..0f6737c2c29 100644
--- a/external-crates/move/crates/move-analyzer/editors/code/package.json
+++ b/external-crates/move/crates/move-analyzer/editors/code/package.json
@@ -1,11 +1,11 @@
 {
-  "name": "move",
-  "displayName": "Move",
-  "description": "A Move language integrated development environment for Iota.",
-  "publisher": "IOTA Foundation",
+  "name": "iota-move",
+  "displayName": "IOTA Move",
+  "description": "A Move language integrated development environment for IOTA.",
+  "publisher": "iota-foundation",
   "icon": "images/move.png",
   "license": "Apache-2.0",
-  "version": "1.0.11",
+  "version": "1.0.0",
   "preview": true,
   "repository": {
     "url": "https://github.com/iotaledger/iota.git",
@@ -33,17 +33,17 @@
   "contributes": {
     "commands": [
       {
-        "command": "move.serverVersion",
+        "command": "iota-move.serverVersion",
         "title": "Show Server Version",
         "category": "Move"
       },
       {
-        "command": "move.build",
+        "command": "iota-move.build",
         "title": "Build a Move package",
         "category": "Move"
       },
       {
-        "command": "move.test",
+        "command": "iota-move.test",
         "title": "Test a Move package",
         "category": "Move"
       }
@@ -52,17 +52,17 @@
       "type": "object",
       "title": "Move",
       "properties": {
-        "move.inlay-hints.type": {
+        "iota-move.inlay-hints.type": {
           "type": "boolean",
           "default": true,
           "markdownDescription": "Enable/disable type inlay hints"
         },
-        "move.inlay-hints.param": {
+        "iota-move.inlay-hints.param": {
           "type": "boolean",
           "default": true,
           "markdownDescription": "Enable/disable parameter inlay hints"
         },
-        "move.lint": {
+        "iota-move.lint": {
           "type": "string",
           "enum": [
             "default",
@@ -72,7 +72,7 @@
           "default": "default",
           "markdownDescription": "Move source code linting level."
         },
-        "move.server.path": {
+        "iota-move.server.path": {
           "type": [
             "null",
             "string"
@@ -81,16 +81,16 @@
           "default": null,
           "markdownDescription": "Path to rust-analyzer executable (points to `~/.iota/bin/move-analyzer` by default)."
         },
-        "move.iota.path": {
+        "iota-move.iota.path": {
           "type": [
             "null",
             "string"
           ],
           "scope": "machine-overridable",
           "default": null,
-          "markdownDescription": "Path to Iota executable (by default assumes that `iota` is on the systems path)."
+          "markdownDescription": "Path to IOTA executable (by default assumes that `iota` is on the systems path)."
         },
-        "move.trace.server": {
+        "iota-move.trace.server": {
           "type": "string",
           "scope": "window",
           "enum": [
@@ -145,7 +145,7 @@
     "test": "node ./out/tests/runTests.js",
     "dev": "npm run pretest && cross-env mode=dev node ./out/tests/runTests.js",
     "vscode:prepublish": "npm run pretest",
-    "package": "npm run pretest && vsce package -o move.vsix",
+    "package": "npm run pretest && vsce package -o iota-move.vsix",
     "publish": "npm run pretest && npm run test && vsce publish"
   },
   "extensionDependencies": [
@@ -166,7 +166,7 @@
     "@types/vscode": "^1.61.0",
     "@typescript-eslint/eslint-plugin": "^6.10.0",
     "@typescript-eslint/parser": "^6.10.0",
-    "@vscode/test-electron": "^2.0.0",
+    "@vscode/test-electron": "^2.4.1",
     "copyfiles": "2.4.1",
     "cross-env": "^7.0.3",
     "eslint": "^8.53.0",
@@ -180,9 +180,9 @@
     "vscode-test": "^1.6.1"
   },
   "__metadata": {
-    "id": "71e74fc8-23c2-47b7-8594-ed00192d96a6",
-    "publisherDisplayName": "move",
-    "publisherId": "40d7def1-c662-4965-9ead-c06109c7cc6d",
+    "id": "227cd049-67e6-468e-bc8f-b60e02b79e36",
+    "publisherDisplayName": "iota-move",
+    "publisherId": "af4b9db3-cc45-4876-a5ad-e9ec96971b48",
     "isPreReleaseVersion": false
   }
 }
diff --git a/external-crates/move/crates/move-analyzer/editors/code/scripts/create.sh b/external-crates/move/crates/move-analyzer/editors/code/scripts/create.sh
index 9102fff8e8d..a63c8adc9fa 100755
--- a/external-crates/move/crates/move-analyzer/editors/code/scripts/create.sh
+++ b/external-crates/move/crates/move-analyzer/editors/code/scripts/create.sh
@@ -33,7 +33,7 @@ do
         exit 0
     elif [[ "$cmd" == "-pkg" ]]; then
         OP="package"
-        OPTS="-omove-VSCODE_OS.vsix"
+        OPTS="-oiota-move-VSCODE_OS.vsix"
     elif [[ "$cmd" == "-pub" ]]; then
         OP="publish"
         OPTS=""
@@ -44,16 +44,16 @@ do
 done
 
 # these will have to change if we want a different network/version
-NETWORK="testnet"
-VERSION="1.13.0"
+NETWORK="alphanet"
+VERSION="0.4.0"
 
 # a map from os version identifiers in Iota's binary distribution to os version identifiers
 # representing VSCode's target platforms used for creating platform-specific plugin distributions
 declare -A SUPPORTED_OS
 SUPPORTED_OS[macos-arm64]=darwin-arm64
-SUPPORTED_OS[macos-x86_64]=darwin-x64
-SUPPORTED_OS[ubuntu-x86_64]=linux-x64
-SUPPORTED_OS[windows-x86_64]=win32-x64
+#SUPPORTED_OS[macos-x86_64]=darwin-x64
+SUPPORTED_OS[linux-x86_64]=linux-x64
+#SUPPORTED_OS[windows-x86_64]=win32-x64
 
 TMP_DIR=$( mktemp -d -t vscode-create )
 trap "clean_tmp_dir $TMP_DIR" EXIT
@@ -66,7 +66,7 @@ mkdir $LANG_SERVER_DIR
 for DIST_OS VSCODE_OS in "${(@kv)SUPPORTED_OS}"; do
     # Iota distribution identifier
     IOTA_DISTRO=$NETWORK"-v"$VERSION
-    # name of the Iota distribution archive file, for example iota-testnet-v1.13.0-macos-arm64.tgz
+    # name of the Iota distribution archive file, for example iota-testnet-v1.0.0-macos-arm64.tgz
     IOTA_ARCHIVE="iota-"$IOTA_DISTRO"-"$DIST_OS".tgz"
     # a path to downloaded Iota archive
     IOTA_ARCHIVE_PATH=$TMP_DIR"/"$IOTA_ARCHIVE
diff --git a/external-crates/move/crates/move-analyzer/editors/code/src/configuration.ts b/external-crates/move/crates/move-analyzer/editors/code/src/configuration.ts
index a9a711598c0..919d8086ad7 100644
--- a/external-crates/move/crates/move-analyzer/editors/code/src/configuration.ts
+++ b/external-crates/move/crates/move-analyzer/editors/code/src/configuration.ts
@@ -7,7 +7,7 @@ import * as os from 'os';
 import * as vscode from 'vscode';
 import * as path from 'path';
 
-export const MOVE_CONF_NAME = 'move';
+export const MOVE_CONF_NAME = 'iota-move';
 export const LINT_OPT = 'lint';
 export const TYPE_HINTS_OPT = 'inlay-hints.type';
 export const PARAM_HINTS_OPT = 'inlay-hints.param';
diff --git a/external-crates/move/crates/move-analyzer/editors/code/src/context.ts b/external-crates/move/crates/move-analyzer/editors/code/src/context.ts
index bee84b633e6..686af1638a2 100644
--- a/external-crates/move/crates/move-analyzer/editors/code/src/context.ts
+++ b/external-crates/move/crates/move-analyzer/editors/code/src/context.ts
@@ -124,7 +124,7 @@ export class Context {
         command: (context: Readonly<Context>, ...args: Array<any>) => any,
     ): void {
         const disposable = vscode.commands.registerCommand(
-            `move.${name}`,
+            `iota-move.${name}`,
             async (...args: Array<any>) : Promise<any> => {
                 const ret = await command(this, ...args);
                 return ret;
diff --git a/external-crates/move/crates/move-analyzer/editors/code/src/extension.ts b/external-crates/move/crates/move-analyzer/editors/code/src/extension.ts
index c1a989885de..a414f1827a6 100644
--- a/external-crates/move/crates/move-analyzer/editors/code/src/extension.ts
+++ b/external-crates/move/crates/move-analyzer/editors/code/src/extension.ts
@@ -9,7 +9,7 @@ import * as vscode from 'vscode';
 /** Information related to this extension itself, such as its identifier and version. */
 export class Extension {
     /** The string used to uniquely identify this particular extension to VS Code. */
-    readonly identifier = 'iota.move';
+    readonly identifier = 'iota-foundation.iota-move';
 
     private readonly extension: vscode.Extension<unknown>;
 
diff --git a/external-crates/move/crates/move-analyzer/editors/code/src/log.ts b/external-crates/move/crates/move-analyzer/editors/code/src/log.ts
index ef2eab95cd1..dc52e5ff21e 100644
--- a/external-crates/move/crates/move-analyzer/editors/code/src/log.ts
+++ b/external-crates/move/crates/move-analyzer/editors/code/src/log.ts
@@ -14,7 +14,7 @@ import * as vscode from 'vscode';
  * server, which appear in a separate output channel.
  **/
 export const log = new class {
-    private readonly output = vscode.window.createOutputChannel('Move Client');
+    private readonly output = vscode.window.createOutputChannel('IOTA Move Client');
 
     /** Log an informational message (as opposed to an error or a warning). */
     info(message: string): void {
diff --git a/external-crates/move/crates/move-analyzer/editors/code/tests/ext.test.ts b/external-crates/move/crates/move-analyzer/editors/code/tests/ext.test.ts
index 80de75368fc..093d0b24f62 100644
--- a/external-crates/move/crates/move-analyzer/editors/code/tests/ext.test.ts
+++ b/external-crates/move/crates/move-analyzer/editors/code/tests/ext.test.ts
@@ -8,7 +8,7 @@ import * as vscode from 'vscode';
 
 Mocha.suite('ext', () => {
     Mocha.test('ext_exists', () => {
-        const ext = vscode.extensions.getExtension('move.move-analyzer');
+        const ext = vscode.extensions.getExtension('iota-foundation.iota-move');
         assert.ok(ext);
     });
 });
diff --git a/external-crates/move/crates/move-analyzer/editors/code/tests/lsp.test.ts b/external-crates/move/crates/move-analyzer/editors/code/tests/lsp.test.ts
index c07e29730f4..0dc0512d528 100644
--- a/external-crates/move/crates/move-analyzer/editors/code/tests/lsp.test.ts
+++ b/external-crates/move/crates/move-analyzer/editors/code/tests/lsp.test.ts
@@ -24,7 +24,7 @@ const PRIMITIVE_TYPES = ['u8', 'u16', 'u32', 'u64', 'u128', 'u256', 'bool', 'vec
 
 Mocha.suite('LSP', () => {
     Mocha.test('textDocument/documentSymbol', async () => {
-        const ext = vscode.extensions.getExtension('move.move-analyzer');
+        const ext = vscode.extensions.getExtension('iota-foundation.iota-move');
         assert.ok(ext);
 
         await ext.activate(); // Synchronous waiting for activation to complete
@@ -45,7 +45,7 @@ Mocha.suite('LSP', () => {
 
         const syms: Array<lc.DocumentSymbol> | undefined = await
             vscode.commands.executeCommand(
-                'move-analyzer.textDocumentDocumentSymbol', params,
+                'iota-move.textDocumentDocumentSymbol', params,
             );
 
         assert.ok(syms);
@@ -69,7 +69,7 @@ Mocha.suite('LSP', () => {
     });
 
     Mocha.test('textDocument/hover for definition in the same module', async () => {
-        const ext = vscode.extensions.getExtension('move.move-analyzer');
+        const ext = vscode.extensions.getExtension('iota-foundation.iota-move');
         assert.ok(ext);
 
         await ext.activate(); // Synchronous waiting for activation to complete
@@ -96,19 +96,19 @@ Mocha.suite('LSP', () => {
 
         const hoverResult: lc.Hover | undefined =
             await vscode.commands.executeCommand(
-                'move-analyzer.textDocumentHover',
+                'iota-move.textDocumentHover',
                 params,
             );
 
         assert.ok(hoverResult);
         assert.deepStrictEqual((hoverResult.contents as MarkupContent).value,
             // eslint-disable-next-line max-len
-            'fun Symbols::M2::other_doc_struct(): Symbols::M3::OtherDocStruct\n\n\nThis is a multiline docstring\n\nThis docstring has empty lines.\n\nIt uses the ** format instead of ///\n\n');
+            '```rust\nfun Symbols::M2::other_doc_struct(): Symbols::M3::OtherDocStruct\n```\n\nThis is a multiline docstring\n\nThis docstring has empty lines.\n\nIt uses the ** format instead of ///\n\n');
 
     });
 
     Mocha.test('textDocument/hover for definition in an external module', async () => {
-        const ext = vscode.extensions.getExtension('move.move-analyzer');
+        const ext = vscode.extensions.getExtension('iota-foundation.iota-move');
         assert.ok(ext);
 
         await ext.activate(); // Synchronous waiting for activation to complete
@@ -135,18 +135,19 @@ Mocha.suite('LSP', () => {
 
         const hoverResult: lc.Hover | undefined =
             await vscode.commands.executeCommand(
-                'move-analyzer.textDocumentHover',
+                'iota-move.textDocumentHover',
                 params,
             );
 
 
         assert.ok(hoverResult);
         assert.deepStrictEqual((hoverResult.contents as MarkupContent).value,
-            'Symbols::M3::OtherDocStruct\n\nDocumented struct in another module\n');
+            // eslint-disable-next-line max-len
+            '```rust\nstruct Symbols::M3::OtherDocStruct has drop {\n\tsome_field: u64\n}\n```\nDocumented struct in another module\n');
     });
 
     Mocha.test('textDocument/completion', async () => {
-        const ext = vscode.extensions.getExtension('move.move-analyzer');
+        const ext = vscode.extensions.getExtension('iota-foundation.iota-move');
         assert.ok(ext);
 
         await ext.activate(); // Synchronous waiting for activation to complete
@@ -172,7 +173,7 @@ Mocha.suite('LSP', () => {
         };
 
         const items = await vscode.commands.executeCommand<Array<vscode.CompletionItem>>(
-            'move-analyzer.textDocumentCompletion',
+            'iota-move.textDocumentCompletion',
             params,
         );
 
@@ -188,31 +189,31 @@ Mocha.suite('LSP', () => {
             assert.strictEqual(isKeywordInCompletionItems(primitive, items), true);
         });
 
-        const colonParams: lc.CompletionParams = {
+        const parameterTypeParams: lc.CompletionParams = {
             textDocument: {
                 uri: docs.uri.toString(),
             },
-            // The position of the character ":"
+            // The position of the character "u"
             position: {
                 line: 9,
-                character: 15,
+                character: 17,
             },
         };
 
-        const itemsOnColon = await vscode.commands.executeCommand<Array<vscode.CompletionItem>>(
-            'move-analyzer.textDocumentCompletion',
-            colonParams,
+        const itemsOnParameterType = await vscode.commands.executeCommand<Array<vscode.CompletionItem>>(
+            'iota-move.textDocumentCompletion',
+            parameterTypeParams,
         );
 
-        assert.ok(itemsOnColon);
+        assert.ok(itemsOnParameterType);
 
-        const keywordsOnColon = itemsOnColon.filter(i => i.kind === CompletionItemKind.Keyword);
-        // Primitive types are the only keywords returned after inserting the colon
-        assert.strictEqual(keywordsOnColon.length, PRIMITIVE_TYPES.length);
+        const keywordsOnParameterType = itemsOnParameterType.filter(i => i.kind === CompletionItemKind.Keyword);
+        // Primitive types + `address` are the only keywords returned
+        assert.strictEqual(keywordsOnParameterType.length, PRIMITIVE_TYPES.length + 1);
 
         // Final safety check
         PRIMITIVE_TYPES.forEach((primitive) => {
-            assert.strictEqual(isKeywordInCompletionItems(primitive, keywordsOnColon), true);
+            assert.strictEqual(isKeywordInCompletionItems(primitive, keywordsOnParameterType), true);
         });
     });
 });
diff --git a/external-crates/move/crates/move-analyzer/editors/code/tests/runTests.ts b/external-crates/move/crates/move-analyzer/editors/code/tests/runTests.ts
index e1769fea29b..ae2c120f8a5 100644
--- a/external-crates/move/crates/move-analyzer/editors/code/tests/runTests.ts
+++ b/external-crates/move/crates/move-analyzer/editors/code/tests/runTests.ts
@@ -74,8 +74,7 @@ async function runVSCodeTest(vscodeVersion: string): Promise<void> {
 }
 
 async function main(): Promise<void> {
-    await runVSCodeTest('1.64.0'); // Test with vscode v1.64.0
-    await runVSCodeTest('1.69.2'); // Test with vscode v1.69.2
+    await runVSCodeTest('1.82.0'); // Test with vscode v1.82.0, the minimal supported version
 }
 
 void main();
diff --git a/external-crates/move/crates/move-binary-format/Cargo.toml b/external-crates/move/crates/move-binary-format/Cargo.toml
index 7a26d5ab334..ffbadb4e2a1 100644
--- a/external-crates/move/crates/move-binary-format/Cargo.toml
+++ b/external-crates/move/crates/move-binary-format/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-binary-format"
 version = "0.0.3"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = ["crates-io"]
-repository = "https://github.com/diem/diem"
 description = "Move Binary Format"
 
 [dependencies]
diff --git a/external-crates/move/crates/move-bytecode-utils/Cargo.toml b/external-crates/move/crates/move-bytecode-utils/Cargo.toml
index 5e441d4f26b..67c7089e7ce 100644
--- a/external-crates/move/crates/move-bytecode-utils/Cargo.toml
+++ b/external-crates/move/crates/move-bytecode-utils/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-bytecode-utils"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "Libraries for working with sets of Move bytecode modules"
 
 [dependencies]
diff --git a/external-crates/move/crates/move-bytecode-verifier-meter/Cargo.toml b/external-crates/move/crates/move-bytecode-verifier-meter/Cargo.toml
index 3184abe4247..f3e1389235d 100644
--- a/external-crates/move/crates/move-bytecode-verifier-meter/Cargo.toml
+++ b/external-crates/move/crates/move-bytecode-verifier-meter/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-bytecode-verifier-meter"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "Traits for metering the bytecode verifier"
 
 [dependencies]
diff --git a/external-crates/move/crates/move-bytecode-verifier/Cargo.toml b/external-crates/move/crates/move-bytecode-verifier/Cargo.toml
index 4b299d1fcf4..c1201ed60a2 100644
--- a/external-crates/move/crates/move-bytecode-verifier/Cargo.toml
+++ b/external-crates/move/crates/move-bytecode-verifier/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-bytecode-verifier"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "Move bytecode verifier"
 
 [dependencies]
diff --git a/external-crates/move/crates/move-cli/Cargo.toml b/external-crates/move/crates/move-cli/Cargo.toml
index 14aea8bf704..1a9adfd1a7f 100644
--- a/external-crates/move/crates/move-cli/Cargo.toml
+++ b/external-crates/move/crates/move-cli/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-cli"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "CLI frontend for the Move compiler and VM"
 
 [dependencies]
diff --git a/external-crates/move/crates/move-command-line-common/Cargo.toml b/external-crates/move/crates/move-command-line-common/Cargo.toml
index 4ee43bc801d..e5a5fe5fcf8 100644
--- a/external-crates/move/crates/move-command-line-common/Cargo.toml
+++ b/external-crates/move/crates/move-command-line-common/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-command-line-common"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "Move shared command line and file tools"
 
 [dependencies]
diff --git a/external-crates/move/crates/move-core-types/Cargo.toml b/external-crates/move/crates/move-core-types/Cargo.toml
index 05fad72c937..8b9af6cfa9c 100644
--- a/external-crates/move/crates/move-core-types/Cargo.toml
+++ b/external-crates/move/crates/move-core-types/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-core-types"
 version = "0.0.4"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = ["crates-io"]
-repository = "https://github.com/diem/diem"
 description = "Core types for Move"
 
 [dependencies]
diff --git a/external-crates/move/crates/move-coverage/Cargo.toml b/external-crates/move/crates/move-coverage/Cargo.toml
index ef6d15a05d6..b3a0ea529af 100644
--- a/external-crates/move/crates/move-coverage/Cargo.toml
+++ b/external-crates/move/crates/move-coverage/Cargo.toml
@@ -3,11 +3,9 @@ name = "move-coverage"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
-description = "Diem Move VM code coverage"
+description = "Move VM code coverage"
 
 [dependencies]
 anyhow.workspace = true
diff --git a/external-crates/move/crates/move-docgen/Cargo.toml b/external-crates/move/crates/move-docgen/Cargo.toml
index 509e85cb75d..4158a2b7ab8 100644
--- a/external-crates/move/crates/move-docgen/Cargo.toml
+++ b/external-crates/move/crates/move-docgen/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 publish = false
 
 [dependencies]
-# diem dependencies
+# internal dependencies
 move-compiler.workspace = true
 move-model.workspace = true
 
diff --git a/external-crates/move/crates/move-ir-compiler/Cargo.toml b/external-crates/move/crates/move-ir-compiler/Cargo.toml
index e998222ef18..ed54783080b 100644
--- a/external-crates/move/crates/move-ir-compiler/Cargo.toml
+++ b/external-crates/move/crates/move-ir-compiler/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-ir-compiler"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "Move IR to bytecode compiler"
 
 [dependencies]
diff --git a/external-crates/move/crates/move-ir-to-bytecode-syntax/Cargo.toml b/external-crates/move/crates/move-ir-to-bytecode-syntax/Cargo.toml
index b529c0cd38f..5295e34237e 100644
--- a/external-crates/move/crates/move-ir-to-bytecode-syntax/Cargo.toml
+++ b/external-crates/move/crates/move-ir-to-bytecode-syntax/Cargo.toml
@@ -3,11 +3,9 @@ name = "move-ir-to-bytecode-syntax"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
-description = "Diem ir to bytecode syntax"
+description = "Move ir to bytecode syntax"
 
 [dependencies]
 anyhow.workspace = true
diff --git a/external-crates/move/crates/move-ir-to-bytecode/Cargo.toml b/external-crates/move/crates/move-ir-to-bytecode/Cargo.toml
index f2aa67c8a2b..6a883c661d3 100644
--- a/external-crates/move/crates/move-ir-to-bytecode/Cargo.toml
+++ b/external-crates/move/crates/move-ir-to-bytecode/Cargo.toml
@@ -3,11 +3,9 @@ name = "move-ir-to-bytecode"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
-description = "Diem ir to bytecode"
+description = "Move ir to bytecode"
 
 [dependencies]
 anyhow.workspace = true
diff --git a/external-crates/move/crates/move-ir-types/Cargo.toml b/external-crates/move/crates/move-ir-types/Cargo.toml
index 7bf0c291e12..7565ed8771a 100644
--- a/external-crates/move/crates/move-ir-types/Cargo.toml
+++ b/external-crates/move/crates/move-ir-types/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-ir-types"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "Types for Move IR"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/external-crates/move/crates/move-model/Cargo.toml b/external-crates/move/crates/move-model/Cargo.toml
index 2f8a3592d4d..45364281f76 100644
--- a/external-crates/move/crates/move-model/Cargo.toml
+++ b/external-crates/move/crates/move-model/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 publish = false
 
 [dependencies]
-# diem dependencies
+# internal dependencies
 move-binary-format.workspace = true
 move-bytecode-source-map.workspace = true
 move-command-line-common.workspace = true
diff --git a/external-crates/move/crates/move-stackless-bytecode/Cargo.toml b/external-crates/move/crates/move-stackless-bytecode/Cargo.toml
index cfa58174eb6..a5f7cd3d4d8 100644
--- a/external-crates/move/crates/move-stackless-bytecode/Cargo.toml
+++ b/external-crates/move/crates/move-stackless-bytecode/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-stackless-bytecode"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "Move stackless bytecode"
 
 [dependencies]
diff --git a/external-crates/move/crates/move-stackless-bytecode/src/function_target_pipeline.rs b/external-crates/move/crates/move-stackless-bytecode/src/function_target_pipeline.rs
index 337c5c5a23d..6b10f0f78f8 100644
--- a/external-crates/move/crates/move-stackless-bytecode/src/function_target_pipeline.rs
+++ b/external-crates/move/crates/move-stackless-bytecode/src/function_target_pipeline.rs
@@ -5,8 +5,7 @@
 
 use core::fmt;
 use std::{
-    cmp::Ordering,
-    collections::{btree_map::Entry as MapEntry, BTreeMap, BTreeSet},
+    collections::{BTreeMap, BTreeSet, btree_map::Entry as MapEntry},
     fmt::Formatter,
     fs,
 };
@@ -14,10 +13,7 @@ use std::{
 use itertools::{Either, Itertools};
 use log::{debug, info};
 use move_model::model::{FunId, FunctionEnv, GlobalEnv, QualifiedId};
-use petgraph::{
-    algo::has_path_connecting,
-    graph::{DiGraph, NodeIndex},
-};
+use petgraph::graph::{DiGraph, NodeIndex};
 
 use crate::{
     function_target::{FunctionData, FunctionTarget},
@@ -345,12 +341,19 @@ impl FunctionTargetPipeline {
     }
 
     /// Collect strongly connected components (SCCs) from the call graph.
+    /// Returns a list of node SCCs in reverse topological order, and a map from
+    /// function id to other functions in the same SCC.
     fn derive_call_graph_sccs(
         env: &GlobalEnv,
         graph: &DiGraph<QualifiedId<FunId>, ()>,
-    ) -> BTreeMap<QualifiedId<FunId>, Option<BTreeSet<QualifiedId<FunId>>>> {
+    ) -> (
+        Vec<Vec<NodeIndex>>,
+        BTreeMap<QualifiedId<FunId>, Option<BTreeSet<QualifiedId<FunId>>>>,
+    ) {
         let mut sccs = BTreeMap::new();
-        for scc in petgraph::algo::tarjan_scc(graph) {
+        // Returned SCCs are in reverse topological order.
+        let scc_nodes = petgraph::algo::tarjan_scc(graph);
+        for scc in scc_nodes.clone() {
             let mut part = BTreeSet::new();
             let mut is_cyclic = scc.len() > 1;
             for node_idx in scc {
@@ -374,7 +377,7 @@ impl FunctionTargetPipeline {
                 assert!(existing.is_none());
             }
         }
-        sccs
+        (scc_nodes, sccs)
     }
 
     /// Sort the call graph in topological order with strongly connected
@@ -384,11 +387,11 @@ impl FunctionTargetPipeline {
         targets: &FunctionTargetsHolder,
     ) -> Vec<Either<QualifiedId<FunId>, Vec<QualifiedId<FunId>>>> {
         // collect sccs
-        let (graph, nodes) = Self::build_call_graph(env, targets);
-        let sccs = Self::derive_call_graph_sccs(env, &graph);
+        let (graph, _nodes) = Self::build_call_graph(env, targets);
+        let (scc_nodes, scc_map) = Self::derive_call_graph_sccs(env, &graph);
 
         let mut scc_staging = BTreeMap::new();
-        for scc_opt in sccs.values() {
+        for scc_opt in scc_map.values() {
             match scc_opt.as_ref() {
                 None => (),
                 Some(scc) => {
@@ -397,51 +400,30 @@ impl FunctionTargetPipeline {
             }
         }
 
-        // construct the work list (with a deterministic ordering)
+        // Construct the work list from a deterministic topological ordering.
         let mut worklist = vec![];
-        for fun in targets.get_funs() {
-            let fun_env = env.get_function(fun);
-            worklist.push((
-                fun,
-                fun_env.get_called_functions().into_iter().collect_vec(),
-            ));
+        for scc in scc_nodes.into_iter().rev() {
+            for node_idx in scc {
+                let fun_id = *graph.node_weight(node_idx).unwrap();
+                let fun_env = env.get_function(fun_id);
+                worklist.push((
+                    fun_id,
+                    fun_env.get_called_functions().into_iter().collect_vec(),
+                ));
+            }
         }
 
         // analyze bottom-up from the leaves of the call graph
         // NOTE: this algorithm produces a deterministic ordering of functions to be
         // analyzed
         let mut dep_ordered = vec![];
-        while !worklist.is_empty() {
-            worklist.sort_by(|(caller1, callees1), (caller2, callees2)| {
-                // rules of ordering:
-                // - if function A depends on B (i.e., calls B), put B towards the end of the
-                //   worklist
-                // - if there are no dependencies among A and B, rank them by callee size
-
-                let node1 = *nodes.get(caller1).unwrap();
-                let node2 = *nodes.get(caller2).unwrap();
-                match (
-                    has_path_connecting(&graph, node1, node2, None),
-                    has_path_connecting(&graph, node2, node1, None),
-                ) {
-                    (true, true) => Ordering::Equal,
-                    (true, false) => Ordering::Less,
-                    (false, true) => Ordering::Greater,
-                    (false, false) => {
-                        // Put functions with 0 calls first in line, at the end of the vector
-                        callees2.len().cmp(&callees1.len())
-                    }
-                }
-            });
-
-            let (call_id, callees) = worklist.pop().unwrap();
-
+        while let Some((call_id, callees)) = worklist.pop() {
             // At this point, one of two things is true:
             // 1. callees is empty (common case)
             // 2. callees is nonempty and call_id is part of a recursive or mutually
             //    recursive function group
 
-            match sccs.get(&call_id).unwrap().as_ref() {
+            match scc_map.get(&call_id).unwrap().as_ref() {
                 None => {
                     // case 1: non-recursive call
                     assert!(callees.is_empty());
@@ -589,14 +571,11 @@ impl FunctionTargetPipeline {
         targets: &FunctionTargetsHolder,
         processor: &dyn FunctionTargetProcessor,
     ) -> String {
-        let mut dump = format!(
-            "{}",
-            ProcessorResultDisplay {
-                env,
-                targets,
-                processor,
-            }
-        );
+        let mut dump = format!("{}", ProcessorResultDisplay {
+            env,
+            targets,
+            processor,
+        });
         if !processor.is_single_run() {
             if !dump.is_empty() {
                 dump = format!("\n\n{}", dump);
diff --git a/external-crates/move/crates/move-stdlib-natives/Cargo.toml b/external-crates/move/crates/move-stdlib-natives/Cargo.toml
index 62720419805..5d6c8c40cdf 100644
--- a/external-crates/move/crates/move-stdlib-natives/Cargo.toml
+++ b/external-crates/move/crates/move-stdlib-natives/Cargo.toml
@@ -1,13 +1,11 @@
 [package]
 name = "move-stdlib-natives"
 version = "0.1.1"
-authors = ["Diem Association <opensource@diem.com>"]
+authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
-description = "Diem stdlib"
+description = "Move stdlib"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
diff --git a/external-crates/move/crates/move-stdlib/Cargo.toml b/external-crates/move/crates/move-stdlib/Cargo.toml
index 88957796257..9055b18e6e2 100644
--- a/external-crates/move/crates/move-stdlib/Cargo.toml
+++ b/external-crates/move/crates/move-stdlib/Cargo.toml
@@ -3,11 +3,9 @@ name = "move-stdlib"
 version = "0.1.1"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
-description = "Diem stdlib"
+description = "Move stdlib"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
diff --git a/external-crates/move/crates/move-symbol-pool/Cargo.toml b/external-crates/move/crates/move-symbol-pool/Cargo.toml
index aa5cf4123a3..348df2609f2 100644
--- a/external-crates/move/crates/move-symbol-pool/Cargo.toml
+++ b/external-crates/move/crates/move-symbol-pool/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-symbol-pool"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "A static, global string table for Move tools"
 
 [dependencies]
diff --git a/external-crates/move/crates/move-transactional-test-runner/Cargo.toml b/external-crates/move/crates/move-transactional-test-runner/Cargo.toml
index 37523947ff0..af7bb1efde6 100644
--- a/external-crates/move/crates/move-transactional-test-runner/Cargo.toml
+++ b/external-crates/move/crates/move-transactional-test-runner/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-transactional-test-runner"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "Transactional testing framework for Move"
 
 [dependencies]
diff --git a/external-crates/move/crates/move-unit-test/Cargo.toml b/external-crates/move/crates/move-unit-test/Cargo.toml
index b6a7dba6eee..4ba2fbaabb0 100644
--- a/external-crates/move/crates/move-unit-test/Cargo.toml
+++ b/external-crates/move/crates/move-unit-test/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-unit-test"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "Unit testing framework for Move code"
 
 [dependencies]
diff --git a/external-crates/move/crates/move-vm-config/Cargo.toml b/external-crates/move/crates/move-vm-config/Cargo.toml
index 8aa524e0b40..6780cd878ab 100644
--- a/external-crates/move/crates/move-vm-config/Cargo.toml
+++ b/external-crates/move/crates/move-vm-config/Cargo.toml
@@ -5,7 +5,6 @@ authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/move-language/move"
 
 [dependencies]
 move-binary-format.workspace = true
diff --git a/external-crates/move/crates/move-vm-integration-tests/Cargo.toml b/external-crates/move/crates/move-vm-integration-tests/Cargo.toml
index ec8810d6be0..27c282a2606 100644
--- a/external-crates/move/crates/move-vm-integration-tests/Cargo.toml
+++ b/external-crates/move/crates/move-vm-integration-tests/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-vm-integration-tests"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "Move VM Integration Tests"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/external-crates/move/crates/move-vm-runtime/Cargo.toml b/external-crates/move/crates/move-vm-runtime/Cargo.toml
index c79837df399..7348e2ef37f 100644
--- a/external-crates/move/crates/move-vm-runtime/Cargo.toml
+++ b/external-crates/move/crates/move-vm-runtime/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-vm-runtime"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "Core Move execution logic"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/external-crates/move/crates/move-vm-test-utils/Cargo.toml b/external-crates/move/crates/move-vm-test-utils/Cargo.toml
index 86b96f29e4d..a69b5f0f42f 100644
--- a/external-crates/move/crates/move-vm-test-utils/Cargo.toml
+++ b/external-crates/move/crates/move-vm-test-utils/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-vm-test-utils"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "Move VM Test Utils"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/external-crates/move/crates/move-vm-types/Cargo.toml b/external-crates/move/crates/move-vm-types/Cargo.toml
index 00ed9ad4347..0804f5fb672 100644
--- a/external-crates/move/crates/move-vm-types/Cargo.toml
+++ b/external-crates/move/crates/move-vm-types/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-vm-types"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "Types for Move VM"
 
 [dependencies]
diff --git a/external-crates/move/crates/serializer-tests/Cargo.toml b/external-crates/move/crates/serializer-tests/Cargo.toml
index 3796ab7ffbc..a78452e154a 100644
--- a/external-crates/move/crates/serializer-tests/Cargo.toml
+++ b/external-crates/move/crates/serializer-tests/Cargo.toml
@@ -3,11 +3,9 @@ name = "serializer-tests"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
-description = "Diem serializer tests"
+description = "Move serializer tests"
 
 [dev-dependencies]
 move-binary-format = { workspace = true, features = ["fuzzing"] }
diff --git a/external-crates/move/crates/test-generation/Cargo.toml b/external-crates/move/crates/test-generation/Cargo.toml
index b3934bdffe9..7a5188c5de0 100644
--- a/external-crates/move/crates/test-generation/Cargo.toml
+++ b/external-crates/move/crates/test-generation/Cargo.toml
@@ -3,10 +3,8 @@ name = "test-generation"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "Tool for generating tests for the bytecode verifier and Move VM runtime"
 
 [dependencies]
diff --git a/external-crates/move/move-execution/v0/crates/bytecode-verifier-tests/Cargo.toml b/external-crates/move/move-execution/v0/crates/bytecode-verifier-tests/Cargo.toml
index 764251d2cb6..e6484d36ef7 100644
--- a/external-crates/move/move-execution/v0/crates/bytecode-verifier-tests/Cargo.toml
+++ b/external-crates/move/move-execution/v0/crates/bytecode-verifier-tests/Cargo.toml
@@ -3,11 +3,9 @@ name = "bytecode-verifier-tests-v0"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
-description = "Diem bytecode verifier tests"
+description = "Move bytecode verifier tests"
 
 [dev-dependencies]
 hex.workspace = true
diff --git a/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/Cargo.toml b/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/Cargo.toml
index a94ead8cd7c..66e4d921646 100644
--- a/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/Cargo.toml
+++ b/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-bytecode-verifier-v0"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "Move bytecode verifier"
 
 [dependencies]
diff --git a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/Cargo.toml b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/Cargo.toml
index 38298e19277..e6329818aba 100644
--- a/external-crates/move/move-execution/v0/crates/move-stdlib-natives/Cargo.toml
+++ b/external-crates/move/move-execution/v0/crates/move-stdlib-natives/Cargo.toml
@@ -1,13 +1,11 @@
 [package]
 name = "move-stdlib-natives-v0"
 version = "0.1.1"
-authors = ["Diem Association <opensource@diem.com>"]
+authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
-description = "Diem stdlib"
+description = "Move stdlib"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
diff --git a/external-crates/move/move-execution/v0/crates/move-vm-runtime/Cargo.toml b/external-crates/move/move-execution/v0/crates/move-vm-runtime/Cargo.toml
index 49585cc02bc..a1fb83b233c 100644
--- a/external-crates/move/move-execution/v0/crates/move-vm-runtime/Cargo.toml
+++ b/external-crates/move/move-execution/v0/crates/move-vm-runtime/Cargo.toml
@@ -3,10 +3,8 @@ name = "move-vm-runtime-v0"
 version = "0.1.0"
 authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
-homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/diem/diem"
 description = "Core Move execution logic"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/iota-execution/latest/iota-adapter/src/execution_engine.rs b/iota-execution/latest/iota-adapter/src/execution_engine.rs
index e40a42debb1..26353e36d0a 100644
--- a/iota-execution/latest/iota-adapter/src/execution_engine.rs
+++ b/iota-execution/latest/iota-adapter/src/execution_engine.rs
@@ -38,7 +38,7 @@ mod checked {
         digests::{ChainIdentifier, get_mainnet_chain_identifier, get_testnet_chain_identifier},
         effects::TransactionEffects,
         error::{ExecutionError, ExecutionErrorKind},
-        execution::{ExecutionResults, ExecutionResultsV2, is_certificate_denied},
+        execution::{ExecutionResults, ExecutionResultsV1, is_certificate_denied},
         execution_config_utils::to_binary_config,
         execution_status::{CongestedObjects, ExecutionStatus},
         gas::{GasCostSummary, IotaGasStatus},
@@ -624,8 +624,8 @@ mod checked {
                     }
                 }
 
-                temporary_store.record_execution_results(ExecutionResults::V2(
-                    ExecutionResultsV2 {
+                temporary_store.record_execution_results(ExecutionResults::V1(
+                    ExecutionResultsV1 {
                         user_events: events,
                         ..Default::default()
                     },
diff --git a/iota-execution/latest/iota-adapter/src/gas_charger.rs b/iota-execution/latest/iota-adapter/src/gas_charger.rs
index 1c07ea77de5..d83e38ba39b 100644
--- a/iota-execution/latest/iota-adapter/src/gas_charger.rs
+++ b/iota-execution/latest/iota-adapter/src/gas_charger.rs
@@ -15,10 +15,7 @@ pub mod checked {
         digests::TransactionDigest,
         error::ExecutionError,
         gas::{GasCostSummary, IotaGasStatus, deduct_gas},
-        gas_model::{
-            gas_predicates::{charge_upgrades, dont_charge_budget_on_storage_oog},
-            tables::GasStatus,
-        },
+        gas_model::tables::GasStatus,
         is_system_package,
         object::Data,
     };
@@ -35,6 +32,7 @@ pub mod checked {
     /// version. 2- Isolate all gas accounting into a single implementation.
     /// Gas objects are not    passed around, and they are retrieved from
     /// this instance.
+    #[allow(dead_code)]
     #[derive(Debug)]
     pub struct GasCharger {
         tx_digest: TransactionDigest,
@@ -66,7 +64,7 @@ pub mod checked {
         pub fn new_unmetered(tx_digest: TransactionDigest) -> Self {
             Self {
                 tx_digest,
-                gas_model_version: 6, // pick any of the latest, it should not matter
+                gas_model_version: 1, // pick any of the latest, it should not matter
                 gas_coins: vec![],
                 smashed_gas_coin: None,
                 gas_status: IotaGasStatus::new_unmetered(),
@@ -223,11 +221,7 @@ pub mod checked {
         }
 
         pub fn charge_upgrade_package(&mut self, size: usize) -> Result<(), ExecutionError> {
-            if charge_upgrades(self.gas_model_version) {
-                self.gas_status.charge_publish_package(size)
-            } else {
-                Ok(())
-            }
+            self.gas_status.charge_publish_package(size)
         }
 
         pub fn charge_input_objects(
@@ -325,11 +319,7 @@ pub mod checked {
             // charge for storage, however they track storage values to check
             // for conservation rules
             if let Some(gas_object_id) = self.smashed_gas_coin {
-                if dont_charge_budget_on_storage_oog(self.gas_model_version) {
-                    self.handle_storage_and_rebate_v2(temporary_store, execution_result)
-                } else {
-                    self.handle_storage_and_rebate_v1(temporary_store, execution_result)
-                }
+                self.handle_storage_and_rebate(temporary_store, execution_result);
 
                 let cost_summary = self.gas_status.summary();
                 let gas_used = cost_summary.net_gas_usage();
@@ -346,23 +336,7 @@ pub mod checked {
             }
         }
 
-        fn handle_storage_and_rebate_v1<T>(
-            &mut self,
-            temporary_store: &mut TemporaryStore<'_>,
-            execution_result: &mut Result<T, ExecutionError>,
-        ) {
-            if let Err(err) = self.gas_status.charge_storage_and_rebate() {
-                self.reset(temporary_store);
-                self.gas_status.adjust_computation_on_out_of_gas();
-                temporary_store.ensure_active_inputs_mutated();
-                temporary_store.collect_rebate(self);
-                if execution_result.is_ok() {
-                    *execution_result = Err(err);
-                }
-            }
-        }
-
-        fn handle_storage_and_rebate_v2<T>(
+        fn handle_storage_and_rebate<T>(
             &mut self,
             temporary_store: &mut TemporaryStore<'_>,
             execution_result: &mut Result<T, ExecutionError>,
diff --git a/iota-execution/latest/iota-adapter/src/programmable_transactions/context.rs b/iota-execution/latest/iota-adapter/src/programmable_transactions/context.rs
index d8048eefd9e..3881633441a 100644
--- a/iota-execution/latest/iota-adapter/src/programmable_transactions/context.rs
+++ b/iota-execution/latest/iota-adapter/src/programmable_transactions/context.rs
@@ -22,7 +22,7 @@ mod checked {
         coin::Coin,
         error::{ExecutionError, ExecutionErrorKind, command_argument_error},
         event::Event,
-        execution::{ExecutionResults, ExecutionResultsV2},
+        execution::{ExecutionResults, ExecutionResultsV1},
         execution_status::CommandArgumentError,
         metrics::LimitsMetrics,
         move_package::MovePackage,
@@ -841,7 +841,7 @@ mod checked {
                 })
                 .collect();
 
-            Ok(ExecutionResults::V2(ExecutionResultsV2 {
+            Ok(ExecutionResults::V1(ExecutionResultsV1 {
                 written_objects,
                 modified_objects: loaded_runtime_objects
                     .into_iter()
diff --git a/iota-execution/latest/iota-adapter/src/temporary_store.rs b/iota-execution/latest/iota-adapter/src/temporary_store.rs
index 8f2f6b1da22..10f5a7304f5 100644
--- a/iota-execution/latest/iota-adapter/src/temporary_store.rs
+++ b/iota-execution/latest/iota-adapter/src/temporary_store.rs
@@ -16,7 +16,7 @@ use iota_types::{
     effects::{EffectsObjectChange, TransactionEffects, TransactionEvents},
     error::{ExecutionError, IotaError, IotaResult},
     execution::{
-        DynamicallyLoadedObjectMetadata, ExecutionResults, ExecutionResultsV2, SharedInput,
+        DynamicallyLoadedObjectMetadata, ExecutionResults, ExecutionResultsV1, SharedInput,
     },
     execution_config_utils::to_binary_config,
     execution_status::ExecutionStatus,
@@ -29,7 +29,7 @@ use iota_types::{
     object::{Data, Object, Owner},
     storage::{
         BackingPackageStore, BackingStore, ChildObjectResolver, DenyListResult, PackageObject,
-        ParentSync, Storage,
+        Storage,
     },
     transaction::InputObjects,
 };
@@ -53,7 +53,7 @@ pub struct TemporaryStore<'backing> {
     /// this store.
     lamport_timestamp: SequenceNumber,
     mutable_input_refs: BTreeMap<ObjectID, (VersionDigest, Owner)>, // Inputs that are mutable
-    execution_results: ExecutionResultsV2,
+    execution_results: ExecutionResultsV1,
     /// Objects that were loaded during execution (dynamic fields + received
     /// objects).
     loaded_runtime_objects: BTreeMap<ObjectID, DynamicallyLoadedObjectMetadata>,
@@ -117,7 +117,7 @@ impl<'backing> TemporaryStore<'backing> {
             input_objects: objects,
             lamport_timestamp,
             mutable_input_refs,
-            execution_results: ExecutionResultsV2::default(),
+            execution_results: ExecutionResultsV1::default(),
             protocol_config,
             loaded_runtime_objects: BTreeMap::new(),
             wrapped_object_containers: BTreeMap::new(),
@@ -257,7 +257,7 @@ impl<'backing> TemporaryStore<'backing> {
         let loaded_per_epoch_config_objects = self.loaded_per_epoch_config_objects.read().clone();
         let inner = self.into_inner();
 
-        let effects = TransactionEffects::new_from_execution_v2(
+        let effects = TransactionEffects::new_from_execution_v1(
             status,
             epoch,
             gas_cost_summary,
@@ -444,7 +444,7 @@ impl<'backing> TemporaryStore<'backing> {
     }
 
     pub fn estimate_effects_size_upperbound(&self) -> usize {
-        TransactionEffects::estimate_effects_size_upperbound_v2(
+        TransactionEffects::estimate_effects_size_upperbound_v1(
             self.execution_results.written_objects.len(),
             self.execution_results.modified_objects.len(),
             self.input_objects.len(),
@@ -1025,12 +1025,10 @@ impl<'backing> Storage for TemporaryStore<'backing> {
         TemporaryStore::read_object(self, id)
     }
 
-    /// Take execution results v2, and translate it back to be compatible with
-    /// effects v1.
+    /// Take execution results v1.
     fn record_execution_results(&mut self, results: ExecutionResults) {
-        let ExecutionResults::V2(results) = results else {
-            panic!("ExecutionResults::V2 expected in iota-execution v1 and above");
-        };
+        let ExecutionResults::V1(results) = results;
+
         // It's important to merge instead of override results because it's
         // possible to execute PT more than once during tx execution.
         self.execution_results.merge_results(results);
@@ -1141,12 +1139,3 @@ impl<'backing> ResourceResolver for TemporaryStore<'backing> {
         }
     }
 }
-
-impl<'backing> ParentSync for TemporaryStore<'backing> {
-    fn get_latest_parent_entry_ref_deprecated(
-        &self,
-        _object_id: ObjectID,
-    ) -> IotaResult<Option<ObjectRef>> {
-        unreachable!("Never called in newer protocol versions")
-    }
-}
diff --git a/iota-execution/latest/iota-move-natives/src/object_runtime/mod.rs b/iota-execution/latest/iota-move-natives/src/object_runtime/mod.rs
index 88466de596f..9244a158540 100644
--- a/iota-execution/latest/iota-move-natives/src/object_runtime/mod.rs
+++ b/iota-execution/latest/iota-move-natives/src/object_runtime/mod.rs
@@ -693,15 +693,15 @@ pub fn get_all_uids(
     bcs_bytes: &[u8],
 ) -> Result<BTreeSet<ObjectID>, /* invariant violation */ String> {
     let mut ids = BTreeSet::new();
-    struct UIDTraversalV2<'i>(&'i mut BTreeSet<ObjectID>);
-    struct UIDCollectorV2<'i>(&'i mut BTreeSet<ObjectID>);
+    struct UIDTraversalV1<'i>(&'i mut BTreeSet<ObjectID>);
+    struct UIDCollectorV1<'i>(&'i mut BTreeSet<ObjectID>);
 
-    impl<'i> AV::Traversal for UIDTraversalV2<'i> {
+    impl<'i> AV::Traversal for UIDTraversalV1<'i> {
         type Error = AV::Error;
 
         fn traverse_struct(&mut self, driver: &mut AV::StructDriver) -> Result<(), Self::Error> {
             if driver.struct_layout().type_ == UID::type_() {
-                while driver.next_field(&mut UIDCollectorV2(self.0))?.is_some() {}
+                while driver.next_field(&mut UIDCollectorV1(self.0))?.is_some() {}
             } else {
                 while driver.next_field(self)?.is_some() {}
             }
@@ -709,7 +709,7 @@ pub fn get_all_uids(
         }
     }
 
-    impl<'i> AV::Traversal for UIDCollectorV2<'i> {
+    impl<'i> AV::Traversal for UIDCollectorV1<'i> {
         type Error = AV::Error;
         fn traverse_address(&mut self, value: AccountAddress) -> Result<(), Self::Error> {
             self.0.insert(value.into());
@@ -720,7 +720,7 @@ pub fn get_all_uids(
     MoveValue::visit_deserialize(
         bcs_bytes,
         fully_annotated_layout,
-        &mut UIDTraversalV2(&mut ids),
+        &mut UIDTraversalV1(&mut ids),
     )
     .map_err(|e| format!("Failed to deserialize. {e:?}"))?;
     Ok(ids)
diff --git a/iota-execution/latest/iota-verifier/src/lib.rs b/iota-execution/latest/iota-verifier/src/lib.rs
index f2140abb868..e01d51b6c07 100644
--- a/iota-execution/latest/iota-verifier/src/lib.rs
+++ b/iota-execution/latest/iota-verifier/src/lib.rs
@@ -23,7 +23,7 @@ fn verification_failure(error: String) -> ExecutionError {
 }
 
 fn to_verification_timeout_error(error: String) -> ExecutionError {
-    ExecutionError::new_with_source(ExecutionErrorKind::IotaMoveVerificationTimedout, error)
+    ExecutionError::new_with_source(ExecutionErrorKind::IotaMoveVerificationTimeout, error)
 }
 
 /// Runs the Move verifier and checks if the error counts as a Move verifier
diff --git a/iota-execution/latest/iota-verifier/src/verifier.rs b/iota-execution/latest/iota-verifier/src/verifier.rs
index 0644392062a..7303e6a9ef1 100644
--- a/iota-execution/latest/iota-verifier/src/verifier.rs
+++ b/iota-execution/latest/iota-verifier/src/verifier.rs
@@ -39,7 +39,7 @@ pub fn iota_verify_module_metered_check_timeout_only(
     if let Err(error) = iota_verify_module_metered(module, fn_info_map, meter) {
         if matches!(
             error.kind(),
-            iota_types::execution_status::ExecutionFailureStatus::IotaMoveVerificationTimedout
+            iota_types::execution_status::ExecutionFailureStatus::IotaMoveVerificationTimeout
         ) {
             return Err(error);
         }
@@ -57,7 +57,7 @@ pub fn iota_verify_module_unmetered(
         debug_assert!(
             !matches!(
                 err.kind(),
-                iota_types::execution_status::ExecutionFailureStatus::IotaMoveVerificationTimedout
+                iota_types::execution_status::ExecutionFailureStatus::IotaMoveVerificationTimeout
             ),
             "Unexpected timeout error in execution"
         );
diff --git a/iota-execution/v0/iota-adapter/src/adapter.rs b/iota-execution/v0/iota-adapter/src/adapter.rs
index 1d29399cd18..295facc2e8f 100644
--- a/iota-execution/v0/iota-adapter/src/adapter.rs
+++ b/iota-execution/v0/iota-adapter/src/adapter.rs
@@ -36,6 +36,12 @@ mod checked {
     };
     use tracing::instrument;
 
+    /// Creates a new instance of `MoveVM` with the specified native functions
+    /// and protocol configuration. The VM is configured using a `VMConfig`
+    /// that sets limits for vector length, value depth, and other
+    /// runtime options based on the provided `ProtocolConfig`. If gas profiling
+    /// is enabled, the function configures the profiler with the provided
+    /// path.
     pub fn new_move_vm(
         natives: NativeFunctionTable,
         protocol_config: &ProtocolConfig,
@@ -71,6 +77,12 @@ mod checked {
         .map_err(|_| IotaError::ExecutionInvariantViolation)
     }
 
+    /// Creates a new set of `NativeContextExtensions` for the Move VM,
+    /// configuring extensions such as `ObjectRuntime` and
+    /// `NativesCostTable`. These extensions manage object resolution, input
+    /// objects, metering, protocol configuration, and metrics tracking.
+    /// They are available and mainly used in native function implementations
+    /// via `NativeContext` instance.
     pub fn new_native_extensions<'r>(
         child_resolver: &'r dyn ChildObjectResolver,
         input_objects: BTreeMap<ObjectID, object_runtime::InputObject>,
@@ -127,6 +139,7 @@ mod checked {
         Ok(())
     }
 
+    /// Returns an error message for a missing unwrapped object.
     pub fn missing_unwrapped_msg(id: &ObjectID) -> String {
         format!(
             "Unable to unwrap object {}. Was unable to retrieve last known version in the parent sync",
diff --git a/iota-execution/v0/iota-adapter/src/execution_engine.rs b/iota-execution/v0/iota-adapter/src/execution_engine.rs
index bfbc94ffc70..26353e36d0a 100644
--- a/iota-execution/v0/iota-adapter/src/execution_engine.rs
+++ b/iota-execution/v0/iota-adapter/src/execution_engine.rs
@@ -38,7 +38,7 @@ mod checked {
         digests::{ChainIdentifier, get_mainnet_chain_identifier, get_testnet_chain_identifier},
         effects::TransactionEffects,
         error::{ExecutionError, ExecutionErrorKind},
-        execution::{ExecutionResults, ExecutionResultsV2, is_certificate_denied},
+        execution::{ExecutionResults, ExecutionResultsV1, is_certificate_denied},
         execution_config_utils::to_binary_config,
         execution_status::{CongestedObjects, ExecutionStatus},
         gas::{GasCostSummary, IotaGasStatus},
@@ -74,6 +74,17 @@ mod checked {
         type_layout_resolver::TypeLayoutResolver,
     };
 
+    /// The main entry point to the adapter's transaction execution. It
+    /// prepares a transaction for execution, then executes it through an
+    /// inner execution method and finally produces an instance of
+    /// transaction effects. It also returns the inner temporary store, which
+    /// contains the objects resulting from the transction execution, the gas
+    /// status instance, which tracks the gas usage, and the execution result.
+    /// The function handles transaction execution based on the provided
+    /// `TransactionKind`. It checks for any expensive operations, manages
+    /// shared object references, and ensures transaction dependencies are
+    /// met. The returned objects are not committed to the store until the
+    /// resulting effects are applied by the caller.
     #[instrument(name = "tx_execute_to_effects", level = "debug", skip_all)]
     pub fn execute_transaction_to_effects<Mode: ExecutionMode>(
         store: &dyn BackingStore,
@@ -231,6 +242,12 @@ mod checked {
         )
     }
 
+    /// Function dedicated to the execution of a GenesisTransaction.
+    /// The function creates an `InnerTemporaryStore`, processes the input
+    /// objects, and executes the transaction in unmetered mode using the
+    /// `Genesis` execution mode. It returns an inner temporary store that
+    /// contains the objects found into the input `GenesisTransaction` by
+    /// adding the data for `previous_transaction` and `storage_rebate` fields.
     pub fn execute_genesis_state_update(
         store: &dyn BackingStore,
         protocol_config: &ProtocolConfig,
@@ -263,6 +280,14 @@ mod checked {
         Ok(temporary_store.into_inner())
     }
 
+    /// Executes a transaction by processing the specified `TransactionKind`,
+    /// applying the necessary gas charges and running the main execution logic.
+    /// The function handles certain error conditions such as denied
+    /// certificate, deleted input objects, exceeded execution meter limits,
+    /// failed conservation checks. It also accounts for unmetered storage
+    /// rebates and adjusts for special cases like epoch change
+    /// transactions. Gas costs are managed through the `GasCharger`
+    /// argument; gas is also charged in case of errors.
     #[instrument(name = "tx_execute", level = "debug", skip_all)]
     fn execute_transaction<Mode: ExecutionMode>(
         temporary_store: &mut TemporaryStore<'_>,
@@ -387,6 +412,14 @@ mod checked {
         (cost_summary, result)
     }
 
+    /// Performs IOTA conservation checks during transaction execution, ensuring
+    /// that the transaction does not create or destroy IOTA. If
+    /// conservation is violated, the function attempts to recover
+    /// by resetting the gas charger, recharging gas, and rechecking
+    /// conservation. If recovery fails, it panics to avoid IOTA creation or
+    /// destruction. These checks include both simple and expensive
+    /// checks based on the configuration and are skipped for genesis or epoch
+    /// change transactions.
     #[instrument(name = "run_conservation_checks", level = "debug", skip_all)]
     fn run_conservation_checks<Mode: ExecutionMode>(
         temporary_store: &mut TemporaryStore<'_>,
@@ -465,6 +498,10 @@ mod checked {
         result
     }
 
+    /// Checks if the estimated size of transaction effects exceeds predefined
+    /// limits based on the protocol configuration. For metered
+    /// transactions, it enforces hard limits, while for system transactions, it
+    /// allows soft limits with warnings.
     #[instrument(name = "check_meter_limit", level = "debug", skip_all)]
     fn check_meter_limit(
         temporary_store: &mut TemporaryStore<'_>,
@@ -504,6 +541,10 @@ mod checked {
         }
     }
 
+    /// Checks if the total size of written objects in the transaction exceeds
+    /// the limits defined in the protocol configuration. For metered
+    /// transactions, it enforces a hard limit, while for system transactions,
+    /// it allows a soft limit with warnings.
     #[instrument(name = "check_written_objects_limit", level = "debug", skip_all)]
     fn check_written_objects_limit<Mode: ExecutionMode>(
         temporary_store: &mut TemporaryStore<'_>,
@@ -547,6 +588,12 @@ mod checked {
         Ok(())
     }
 
+    /// Executes the given transaction based on its `TransactionKind` by
+    /// processing it through corresponding handlers such as epoch changes,
+    /// genesis transactions, consensus commit prologues, and programmable
+    /// transactions. For each type of transaction, the corresponding logic is
+    /// invoked, such as advancing the epoch, setting up consensus commits, or
+    /// executing a programmable transaction.
     #[instrument(level = "debug", skip_all)]
     fn execution_loop<Mode: ExecutionMode>(
         temporary_store: &mut TemporaryStore<'_>,
@@ -577,8 +624,8 @@ mod checked {
                     }
                 }
 
-                temporary_store.record_execution_results(ExecutionResults::V2(
-                    ExecutionResultsV2 {
+                temporary_store.record_execution_results(ExecutionResults::V1(
+                    ExecutionResultsV1 {
                         user_events: events,
                         ..Default::default()
                     },
@@ -684,6 +731,14 @@ mod checked {
         Ok(result)
     }
 
+    /// Mints epoch rewards by creating both storage and computation rewards
+    /// using a `ProgrammableTransactionBuilder`. The function takes in the
+    /// `AdvanceEpochParams`, serializes the storage and computation
+    /// charges, and invokes the reward creation function within the Iota
+    /// Prepares invocations for creating both storage and computation rewards
+    /// with a `ProgrammableTransactionBuilder` using the `AdvanceEpochParams`.
+    /// The corresponding functions from the Iota framework can be invoked later
+    /// during execution of the programmable transaction.
     fn mint_epoch_rewards_in_pt(
         builder: &mut ProgrammableTransactionBuilder,
         params: &AdvanceEpochParams,
@@ -718,6 +773,13 @@ mod checked {
         (storage_charges, computation_rewards)
     }
 
+    /// Constructs a `ProgrammableTransaction` to advance the epoch. It creates
+    /// storage charges and computation rewards by invoking
+    /// `mint_epoch_rewards_in_pt`, advances the epoch by setting up the
+    /// necessary arguments, such as epoch number, protocol version, storage
+    /// rebate, and slashing rate, and executing the `advance_epoch` function
+    /// within the Iota system. Then, it destroys the storage rebates to
+    /// complete the transaction.
     pub fn construct_advance_epoch_pt(
         mut builder: ProgrammableTransactionBuilder,
         params: &AdvanceEpochParams,
@@ -774,6 +836,13 @@ mod checked {
         Ok(builder.finish())
     }
 
+    /// Advances the epoch by constructing a `ProgrammableTransaction` with
+    /// `construct_advance_epoch_pt` and executing it.
+    /// If the transaction fails, it switches to safe mode and retries the
+    /// epoch advancement in a more controlled environment. The function also
+    /// handles the publication and upgrade of system packages for the new
+    /// epoch. If any system package is added or upgraded, it ensures the
+    /// proper execution and storage of the changes.
     fn advance_epoch(
         builder: ProgrammableTransactionBuilder,
         change_epoch: ChangeEpoch,
@@ -949,6 +1018,9 @@ mod checked {
         )
     }
 
+    /// This function adds a Move call to the Iota framework's
+    /// `authenticator_state_create` function, preparing the transaction for
+    /// execution.
     fn setup_authenticator_state_create(
         mut builder: ProgrammableTransactionBuilder,
     ) -> ProgrammableTransactionBuilder {
@@ -964,6 +1036,7 @@ mod checked {
         builder
     }
 
+    /// Configures a `ProgrammableTransactionBuilder` to create a bridge.
     fn setup_bridge_create(
         mut builder: ProgrammableTransactionBuilder,
         chain_id: ChainIdentifier,
@@ -994,6 +1067,8 @@ mod checked {
         builder
     }
 
+    /// Configures a `ProgrammableTransactionBuilder` to update the bridge
+    /// committee.
     fn setup_bridge_committee_update(
         mut builder: ProgrammableTransactionBuilder,
         bridge_shared_version: SequenceNumber,
@@ -1035,6 +1110,12 @@ mod checked {
         builder
     }
 
+    /// Sets up and executes a `ProgrammableTransaction` to update the
+    /// authenticator state. This function constructs a transaction that
+    /// invokes the `authenticator_state_update` function from the Iota
+    /// framework, passing the authenticator state object and new active JWKS as
+    /// arguments. It then executes the transaction using the system
+    /// execution mode.
     fn setup_authenticator_state_update(
         update: AuthenticatorStateUpdateV1,
         temporary_store: &mut TemporaryStore<'_>,
@@ -1077,6 +1158,10 @@ mod checked {
         )
     }
 
+    /// Configures a `ProgrammableTransactionBuilder` to expire authenticator
+    /// state by invoking the `authenticator_state_expire_jwks` function
+    /// from the Iota framework. The function adds the necessary Move call
+    /// with the authenticator state object and the minimum epoch as arguments.
     fn setup_authenticator_state_expire(
         mut builder: ProgrammableTransactionBuilder,
         expire: AuthenticatorStateExpire,
@@ -1100,6 +1185,11 @@ mod checked {
         builder
     }
 
+    /// The function constructs a transaction that invokes
+    /// the `randomness_state_update` function from the Iota framework,
+    /// passing the randomness state object, the `randomness_round`,
+    /// and the `random_bytes` as arguments. It then executes the transaction
+    /// using the system execution mode.
     fn setup_randomness_state_update(
         update: RandomnessStateUpdate,
         temporary_store: &mut TemporaryStore<'_>,
diff --git a/iota-execution/v0/iota-adapter/src/gas_charger.rs b/iota-execution/v0/iota-adapter/src/gas_charger.rs
index 1c07ea77de5..d83e38ba39b 100644
--- a/iota-execution/v0/iota-adapter/src/gas_charger.rs
+++ b/iota-execution/v0/iota-adapter/src/gas_charger.rs
@@ -15,10 +15,7 @@ pub mod checked {
         digests::TransactionDigest,
         error::ExecutionError,
         gas::{GasCostSummary, IotaGasStatus, deduct_gas},
-        gas_model::{
-            gas_predicates::{charge_upgrades, dont_charge_budget_on_storage_oog},
-            tables::GasStatus,
-        },
+        gas_model::tables::GasStatus,
         is_system_package,
         object::Data,
     };
@@ -35,6 +32,7 @@ pub mod checked {
     /// version. 2- Isolate all gas accounting into a single implementation.
     /// Gas objects are not    passed around, and they are retrieved from
     /// this instance.
+    #[allow(dead_code)]
     #[derive(Debug)]
     pub struct GasCharger {
         tx_digest: TransactionDigest,
@@ -66,7 +64,7 @@ pub mod checked {
         pub fn new_unmetered(tx_digest: TransactionDigest) -> Self {
             Self {
                 tx_digest,
-                gas_model_version: 6, // pick any of the latest, it should not matter
+                gas_model_version: 1, // pick any of the latest, it should not matter
                 gas_coins: vec![],
                 smashed_gas_coin: None,
                 gas_status: IotaGasStatus::new_unmetered(),
@@ -223,11 +221,7 @@ pub mod checked {
         }
 
         pub fn charge_upgrade_package(&mut self, size: usize) -> Result<(), ExecutionError> {
-            if charge_upgrades(self.gas_model_version) {
-                self.gas_status.charge_publish_package(size)
-            } else {
-                Ok(())
-            }
+            self.gas_status.charge_publish_package(size)
         }
 
         pub fn charge_input_objects(
@@ -325,11 +319,7 @@ pub mod checked {
             // charge for storage, however they track storage values to check
             // for conservation rules
             if let Some(gas_object_id) = self.smashed_gas_coin {
-                if dont_charge_budget_on_storage_oog(self.gas_model_version) {
-                    self.handle_storage_and_rebate_v2(temporary_store, execution_result)
-                } else {
-                    self.handle_storage_and_rebate_v1(temporary_store, execution_result)
-                }
+                self.handle_storage_and_rebate(temporary_store, execution_result);
 
                 let cost_summary = self.gas_status.summary();
                 let gas_used = cost_summary.net_gas_usage();
@@ -346,23 +336,7 @@ pub mod checked {
             }
         }
 
-        fn handle_storage_and_rebate_v1<T>(
-            &mut self,
-            temporary_store: &mut TemporaryStore<'_>,
-            execution_result: &mut Result<T, ExecutionError>,
-        ) {
-            if let Err(err) = self.gas_status.charge_storage_and_rebate() {
-                self.reset(temporary_store);
-                self.gas_status.adjust_computation_on_out_of_gas();
-                temporary_store.ensure_active_inputs_mutated();
-                temporary_store.collect_rebate(self);
-                if execution_result.is_ok() {
-                    *execution_result = Err(err);
-                }
-            }
-        }
-
-        fn handle_storage_and_rebate_v2<T>(
+        fn handle_storage_and_rebate<T>(
             &mut self,
             temporary_store: &mut TemporaryStore<'_>,
             execution_result: &mut Result<T, ExecutionError>,
diff --git a/iota-execution/v0/iota-adapter/src/programmable_transactions/context.rs b/iota-execution/v0/iota-adapter/src/programmable_transactions/context.rs
index 542e93ab75b..3881633441a 100644
--- a/iota-execution/v0/iota-adapter/src/programmable_transactions/context.rs
+++ b/iota-execution/v0/iota-adapter/src/programmable_transactions/context.rs
@@ -22,7 +22,7 @@ mod checked {
         coin::Coin,
         error::{ExecutionError, ExecutionErrorKind, command_argument_error},
         event::Event,
-        execution::{ExecutionResults, ExecutionResultsV2},
+        execution::{ExecutionResults, ExecutionResultsV1},
         execution_status::CommandArgumentError,
         metrics::LimitsMetrics,
         move_package::MovePackage,
@@ -118,6 +118,12 @@ mod checked {
     }
 
     impl<'vm, 'state, 'a> ExecutionContext<'vm, 'state, 'a> {
+        /// Creates a new instance of the transaction execution context,
+        /// initializing the necessary components such as protocol
+        /// configuration, Move VM, gas management, inputs, and native
+        /// extensions. This function processes the input arguments, sets up gas
+        /// handling for the transaction, and prepares the state for
+        /// executing Move programs.
         #[instrument(name = "ExecutionContext::new", level = "trace", skip_all)]
         pub fn new(
             protocol_config: &'a ProtocolConfig,
@@ -381,6 +387,7 @@ mod checked {
             ) {
                 return Err(CommandArgumentError::InvalidObjectByValue);
             }
+
             // Any input object taken by value must be mutable
             if matches!(
                 input_metadata_opt,
@@ -834,7 +841,7 @@ mod checked {
                 })
                 .collect();
 
-            Ok(ExecutionResults::V2(ExecutionResultsV2 {
+            Ok(ExecutionResults::V1(ExecutionResultsV1 {
                 written_objects,
                 modified_objects: loaded_runtime_objects
                     .into_iter()
@@ -940,6 +947,10 @@ mod checked {
             Ok((metadata, &mut result_value.value))
         }
 
+        /// Executes a Move function bypassing visibility checks, allowing the
+        /// execution of private or protected functions. This method
+        /// sets up the necessary gas status and data store, and then
+        /// delegates the execution to the Move VM runtime.
         pub(crate) fn execute_function_bypass_visibility(
             &mut self,
             module: &ModuleId,
@@ -960,6 +971,10 @@ mod checked {
             )
         }
 
+        /// Loads a Move function from the specified module with the given type
+        /// arguments without executing it. This function initializes
+        /// the data store and delegates the loading process to the Move
+        /// VM runtime.
         pub(crate) fn load_function(
             &mut self,
             module_id: &ModuleId,
@@ -975,6 +990,10 @@ mod checked {
             )
         }
 
+        /// Constructs an `ObjectValue` based on the provided Move object type,
+        /// transferability, usage context, and byte contents. This
+        /// function utilizes the protocol configuration, Move VM, and
+        /// linkage view to properly interpret and instantiate the object.
         pub(crate) fn make_object_value(
             &mut self,
             type_: MoveObjectType,
@@ -991,6 +1010,10 @@ mod checked {
             )
         }
 
+        /// Publishes a bundle of Move modules to the blockchain under the
+        /// specified sender's account address. The function initializes
+        /// a data store and delegates the publishing operation to the Move VM
+        /// runtime.
         pub fn publish_module_bundle(
             &mut self,
             modules: Vec<Vec<u8>>,
@@ -1009,6 +1032,8 @@ mod checked {
     }
 
     impl<'vm, 'state, 'a> TypeTagResolver for ExecutionContext<'vm, 'state, 'a> {
+        /// Retrieves the `TypeTag` corresponding to the provided `Type` by
+        /// querying the Move VM runtime.
         fn get_type_tag(&self, type_: &Type) -> Result<TypeTag, ExecutionError> {
             self.vm
                 .get_runtime()
@@ -1040,6 +1065,11 @@ mod checked {
         }
     }
 
+    /// Loads a `Type` from the given `StructTag`, retrieving the corresponding
+    /// struct from the package in storage. The function sets up the linkage
+    /// context to resolve the struct's module and verifies
+    /// any type parameter constraints. If the struct has type parameters, they
+    /// are recursively loaded and verified.
     pub fn load_type_from_struct(
         vm: &MoveVM,
         linkage_view: &mut LinkageView,
@@ -1135,6 +1165,12 @@ mod checked {
         })
     }
 
+    /// Constructs an `ObjectValue` based on the provided `MoveObjectType`,
+    /// contents, and additional flags such as transferability and usage
+    /// context. If the object is a coin, it deserializes the contents into
+    /// a `Coin` type; otherwise, it treats the contents as raw data. The
+    /// function then loads the corresponding struct type from the Move
+    /// package and verifies its abilities if needed.
     pub(crate) fn make_object_value(
         vm: &MoveVM,
         linkage_view: &mut LinkageView,
@@ -1168,6 +1204,10 @@ mod checked {
         })
     }
 
+    /// Converts a provided `Object` into an `ObjectValue`, extracting and
+    /// validating the `MoveObjectType` and contents. This function assumes
+    /// the object contains Move-specific data and passes the extracted data
+    /// through `make_object_value` to create the corresponding `ObjectValue`.
     pub(crate) fn value_from_object(
         vm: &MoveVM,
         linkage_view: &mut LinkageView,
diff --git a/iota-execution/v0/iota-adapter/src/programmable_transactions/execution.rs b/iota-execution/v0/iota-adapter/src/programmable_transactions/execution.rs
index cccc62f4eed..cc70099dc59 100644
--- a/iota-execution/v0/iota-adapter/src/programmable_transactions/execution.rs
+++ b/iota-execution/v0/iota-adapter/src/programmable_transactions/execution.rs
@@ -71,6 +71,13 @@ mod checked {
         programmable_transactions::context::*,
     };
 
+    /// Executes a `ProgrammableTransaction` in the specified `ExecutionMode`,
+    /// applying a series of commands to the execution context. The
+    /// function initializes the execution context, processes each command
+    /// in sequence, and handles errors by recording any loaded runtime objects
+    /// before exiting. After successful command execution, it applies the
+    /// resulting changes, saving the loaded runtime objects and wrapped
+    /// object containers for later use.
     pub fn execute<Mode: ExecutionMode>(
         protocol_config: &ProtocolConfig,
         metrics: Arc<LimitsMetrics>,
@@ -408,6 +415,11 @@ mod checked {
         res
     }
 
+    /// Writes back the results of an execution, updating mutable references and
+    /// processing return values. This function iterates through mutable
+    /// reference values and their corresponding kinds, restoring them to
+    /// the execution context. It also processes return values for non-entry
+    /// Move calls by converting them into `Value` types.
     fn write_back_results<Mode: ExecutionMode>(
         context: &mut ExecutionContext<'_, '_, '_>,
         argument_updates: &mut Mode::ArgumentUpdates,
@@ -438,6 +450,12 @@ mod checked {
             .collect()
     }
 
+    /// Constructs a `Value` from the given `ValueKind` and byte data. Depending
+    /// on the kind, it either creates an `Object` or `Raw` value. For
+    /// `Object` types, it uses the execution context to generate an
+    /// `ObjectValue`, considering whether the object was used in a non-entry
+    /// Move call. For `Raw` types, it wraps the raw bytes with type and ability
+    /// information.
     fn make_value(
         context: &mut ExecutionContext<'_, '_, '_>,
         value_info: ValueKind,
@@ -635,6 +653,11 @@ mod checked {
         )])
     }
 
+    /// Checks the compatibility between an existing Move package and the new
+    /// upgrading modules based on the specified upgrade policy. The
+    /// function first validates the upgrade policy, then normalizes the
+    /// existing and new modules to compare them. For each module, it verifies
+    /// compatibility according to the policy.
     fn check_compatibility<'a>(
         context: &ExecutionContext,
         existing_package: &MovePackage,
@@ -672,6 +695,11 @@ mod checked {
         Ok(())
     }
 
+    /// Verifies the compatibility of two normalized Move modules based on the
+    /// specified upgrade policy. Depending on the policy, it checks if the
+    /// new module is a subset, equal, or compatible with the
+    /// current module. The compatibility check may include aspects like struct
+    /// layout, public function linking, and struct type parameters.
     fn check_module_compatibility(
         policy: &UpgradePolicy,
         cur_module: &normalized::Module,
@@ -705,6 +733,10 @@ mod checked {
         })
     }
 
+    /// Retrieves a `PackageObject` from the storage based on the provided
+    /// `package_id`. It ensures that exactly one package is fetched,
+    /// returning an invariant violation if the number of fetched packages
+    /// does not match the expected count.
     fn fetch_package(
         context: &ExecutionContext<'_, '_, '_>,
         package_id: &ObjectID,
@@ -722,6 +754,9 @@ mod checked {
         }
     }
 
+    /// Fetches a list of `PackageObject` instances based on the provided
+    /// package IDs from the execution context. It collects the package IDs
+    /// and attempts to retrieve the corresponding packages from the state view.
     fn fetch_packages<'ctx, 'vm, 'state, 'a>(
         context: &'ctx ExecutionContext<'vm, 'state, 'a>,
         package_ids: impl IntoIterator<Item = &'ctx ObjectID>,
@@ -755,6 +790,11 @@ mod checked {
     /// ************************************************************************
     /// **** *******************
 
+    /// Executes a Move function within the given module by invoking the Move
+    /// VM, passing the specified type arguments and serialized arguments.
+    /// Depending on the `TxContextKind`, the transaction context
+    /// is appended to the arguments. The function handles mutable updates to
+    /// the transaction context when objects are created during execution.
     fn vm_move_call(
         context: &mut ExecutionContext<'_, '_, '_>,
         module_id: &ModuleId,
@@ -800,6 +840,10 @@ mod checked {
         Ok(result)
     }
 
+    /// Deserializes a list of binary-encoded Move modules into `CompiledModule`
+    /// instances using the protocol's binary configuration. The function
+    /// ensures that the module list is not empty and converts any
+    /// deserialization errors into an `ExecutionError`.
     #[allow(clippy::extra_unused_type_parameters)]
     fn deserialize_modules<Mode: ExecutionMode>(
         context: &mut ExecutionContext<'_, '_, '_>,
@@ -823,6 +867,11 @@ mod checked {
         Ok(modules)
     }
 
+    /// Publishes a set of `CompiledModule` instances to the blockchain under
+    /// the specified package ID and verifies them using the Iota bytecode
+    /// verifier. The modules are serialized and published via the VM,
+    /// and the Iota verifier runs additional checks after the Move bytecode
+    /// verifier has passed.
     fn publish_and_verify_modules(
         context: &mut ExecutionContext<'_, '_, '_>,
         package_id: ObjectID,
@@ -857,6 +906,11 @@ mod checked {
         Ok(())
     }
 
+    /// Initializes the provided `CompiledModule` instances by searching for and
+    /// executing any functions named `INIT_FN_NAME`. For each module
+    /// containing an initialization function, the function is invoked
+    /// without arguments, and the result is checked to ensure no return values
+    /// are present.
     fn init_modules<Mode: ExecutionMode>(
         context: &mut ExecutionContext<'_, '_, '_>,
         argument_updates: &mut Mode::ArgumentUpdates,
@@ -1126,6 +1180,10 @@ mod checked {
             .collect()
     }
 
+    /// Verifies that certain private functions in the Iota framework are not
+    /// directly invoked. This function checks if the module and function
+    /// being called belong to restricted areas, such as the `iota::event`
+    /// or `iota::transfer` modules.
     fn check_private_generics(
         _context: &mut ExecutionContext,
         module_id: &ModuleId,
diff --git a/iota-execution/v0/iota-adapter/src/programmable_transactions/linkage_view.rs b/iota-execution/v0/iota-adapter/src/programmable_transactions/linkage_view.rs
index fe0bcc57d57..40a0270c3fe 100644
--- a/iota-execution/v0/iota-adapter/src/programmable_transactions/linkage_view.rs
+++ b/iota-execution/v0/iota-adapter/src/programmable_transactions/linkage_view.rs
@@ -58,6 +58,10 @@ pub struct LinkageInfo {
 pub struct SavedLinkage(LinkageInfo);
 
 impl<'state> LinkageView<'state> {
+    /// Creates a new `LinkageView` instance with the provided `IotaResolver`.
+    /// This instance is responsible for resolving and linking types across
+    /// different contexts. It initializes internal caches for type origins
+    /// and past contexts.
     pub fn new(resolver: Box<dyn IotaResolver + 'state>) -> Self {
         Self {
             resolver,
@@ -67,6 +71,7 @@ impl<'state> LinkageView<'state> {
         }
     }
 
+    /// Reset the `LinkageInfo`.
     pub fn reset_linkage(&mut self) {
         self.linkage_info = None;
     }
@@ -151,10 +156,16 @@ impl<'state> LinkageView<'state> {
         Ok(runtime_id)
     }
 
+    /// Retrieves the original package ID (as an `AccountAddress`) from the
+    /// linkage information, if available.
     pub fn original_package_id(&self) -> Option<AccountAddress> {
         Some(self.linkage_info.as_ref()?.runtime_id)
     }
 
+    /// Retrieves the cached type origin for the given `ModuleId` and struct
+    /// identifier (`IdentStr`). This method uses the internal
+    /// `type_origin_cache` to provide fast lookups for previously resolved
+    /// types.
     fn get_cached_type_origin(
         &self,
         runtime_id: &ModuleId,
@@ -167,6 +178,8 @@ impl<'state> LinkageView<'state> {
             .cloned()
     }
 
+    /// Adds a type origin to the cache, associating the given `ModuleId` and
+    /// struct identifier (`Identifier`) with the provided defining `ObjectID`.
     fn add_type_origin(
         &self,
         runtime_id: ModuleId,
@@ -197,12 +210,14 @@ impl<'state> LinkageView<'state> {
         Ok(())
     }
 
+    /// Retrieves the current link context's storage ID as an `AccountAddress`.
     pub(crate) fn link_context(&self) -> AccountAddress {
         self.linkage_info
             .as_ref()
             .map_or(AccountAddress::ZERO, |l| l.storage_id)
     }
 
+    /// Relocates a given `ModuleId` based on the current linkage context.
     pub(crate) fn relocate(&self, module_id: &ModuleId) -> Result<ModuleId, IotaError> {
         let Some(linkage) = &self.linkage_info else {
             invariant_violation!("No linkage context set while relocating {module_id}.")
@@ -233,6 +248,12 @@ impl<'state> LinkageView<'state> {
         ))
     }
 
+    /// Determines the defining module for a given struct within a `ModuleId`.
+    /// The function first checks the cached type origin and returns the
+    /// corresponding `ModuleId` if found. If not, it relocates the
+    /// module and queries the type origin table from the associated package. If
+    /// the defining module is found, it caches the result and returns the
+    /// `ModuleId`.
     pub(crate) fn defining_module(
         &self,
         runtime_id: &ModuleId,
diff --git a/iota-execution/v0/iota-adapter/src/temporary_store.rs b/iota-execution/v0/iota-adapter/src/temporary_store.rs
index 8f2f6b1da22..10f5a7304f5 100644
--- a/iota-execution/v0/iota-adapter/src/temporary_store.rs
+++ b/iota-execution/v0/iota-adapter/src/temporary_store.rs
@@ -16,7 +16,7 @@ use iota_types::{
     effects::{EffectsObjectChange, TransactionEffects, TransactionEvents},
     error::{ExecutionError, IotaError, IotaResult},
     execution::{
-        DynamicallyLoadedObjectMetadata, ExecutionResults, ExecutionResultsV2, SharedInput,
+        DynamicallyLoadedObjectMetadata, ExecutionResults, ExecutionResultsV1, SharedInput,
     },
     execution_config_utils::to_binary_config,
     execution_status::ExecutionStatus,
@@ -29,7 +29,7 @@ use iota_types::{
     object::{Data, Object, Owner},
     storage::{
         BackingPackageStore, BackingStore, ChildObjectResolver, DenyListResult, PackageObject,
-        ParentSync, Storage,
+        Storage,
     },
     transaction::InputObjects,
 };
@@ -53,7 +53,7 @@ pub struct TemporaryStore<'backing> {
     /// this store.
     lamport_timestamp: SequenceNumber,
     mutable_input_refs: BTreeMap<ObjectID, (VersionDigest, Owner)>, // Inputs that are mutable
-    execution_results: ExecutionResultsV2,
+    execution_results: ExecutionResultsV1,
     /// Objects that were loaded during execution (dynamic fields + received
     /// objects).
     loaded_runtime_objects: BTreeMap<ObjectID, DynamicallyLoadedObjectMetadata>,
@@ -117,7 +117,7 @@ impl<'backing> TemporaryStore<'backing> {
             input_objects: objects,
             lamport_timestamp,
             mutable_input_refs,
-            execution_results: ExecutionResultsV2::default(),
+            execution_results: ExecutionResultsV1::default(),
             protocol_config,
             loaded_runtime_objects: BTreeMap::new(),
             wrapped_object_containers: BTreeMap::new(),
@@ -257,7 +257,7 @@ impl<'backing> TemporaryStore<'backing> {
         let loaded_per_epoch_config_objects = self.loaded_per_epoch_config_objects.read().clone();
         let inner = self.into_inner();
 
-        let effects = TransactionEffects::new_from_execution_v2(
+        let effects = TransactionEffects::new_from_execution_v1(
             status,
             epoch,
             gas_cost_summary,
@@ -444,7 +444,7 @@ impl<'backing> TemporaryStore<'backing> {
     }
 
     pub fn estimate_effects_size_upperbound(&self) -> usize {
-        TransactionEffects::estimate_effects_size_upperbound_v2(
+        TransactionEffects::estimate_effects_size_upperbound_v1(
             self.execution_results.written_objects.len(),
             self.execution_results.modified_objects.len(),
             self.input_objects.len(),
@@ -1025,12 +1025,10 @@ impl<'backing> Storage for TemporaryStore<'backing> {
         TemporaryStore::read_object(self, id)
     }
 
-    /// Take execution results v2, and translate it back to be compatible with
-    /// effects v1.
+    /// Take execution results v1.
     fn record_execution_results(&mut self, results: ExecutionResults) {
-        let ExecutionResults::V2(results) = results else {
-            panic!("ExecutionResults::V2 expected in iota-execution v1 and above");
-        };
+        let ExecutionResults::V1(results) = results;
+
         // It's important to merge instead of override results because it's
         // possible to execute PT more than once during tx execution.
         self.execution_results.merge_results(results);
@@ -1141,12 +1139,3 @@ impl<'backing> ResourceResolver for TemporaryStore<'backing> {
         }
     }
 }
-
-impl<'backing> ParentSync for TemporaryStore<'backing> {
-    fn get_latest_parent_entry_ref_deprecated(
-        &self,
-        _object_id: ObjectID,
-    ) -> IotaResult<Option<ObjectRef>> {
-        unreachable!("Never called in newer protocol versions")
-    }
-}
diff --git a/iota-execution/v0/iota-move-natives/src/object_runtime/mod.rs b/iota-execution/v0/iota-move-natives/src/object_runtime/mod.rs
index 88466de596f..9244a158540 100644
--- a/iota-execution/v0/iota-move-natives/src/object_runtime/mod.rs
+++ b/iota-execution/v0/iota-move-natives/src/object_runtime/mod.rs
@@ -693,15 +693,15 @@ pub fn get_all_uids(
     bcs_bytes: &[u8],
 ) -> Result<BTreeSet<ObjectID>, /* invariant violation */ String> {
     let mut ids = BTreeSet::new();
-    struct UIDTraversalV2<'i>(&'i mut BTreeSet<ObjectID>);
-    struct UIDCollectorV2<'i>(&'i mut BTreeSet<ObjectID>);
+    struct UIDTraversalV1<'i>(&'i mut BTreeSet<ObjectID>);
+    struct UIDCollectorV1<'i>(&'i mut BTreeSet<ObjectID>);
 
-    impl<'i> AV::Traversal for UIDTraversalV2<'i> {
+    impl<'i> AV::Traversal for UIDTraversalV1<'i> {
         type Error = AV::Error;
 
         fn traverse_struct(&mut self, driver: &mut AV::StructDriver) -> Result<(), Self::Error> {
             if driver.struct_layout().type_ == UID::type_() {
-                while driver.next_field(&mut UIDCollectorV2(self.0))?.is_some() {}
+                while driver.next_field(&mut UIDCollectorV1(self.0))?.is_some() {}
             } else {
                 while driver.next_field(self)?.is_some() {}
             }
@@ -709,7 +709,7 @@ pub fn get_all_uids(
         }
     }
 
-    impl<'i> AV::Traversal for UIDCollectorV2<'i> {
+    impl<'i> AV::Traversal for UIDCollectorV1<'i> {
         type Error = AV::Error;
         fn traverse_address(&mut self, value: AccountAddress) -> Result<(), Self::Error> {
             self.0.insert(value.into());
@@ -720,7 +720,7 @@ pub fn get_all_uids(
     MoveValue::visit_deserialize(
         bcs_bytes,
         fully_annotated_layout,
-        &mut UIDTraversalV2(&mut ids),
+        &mut UIDTraversalV1(&mut ids),
     )
     .map_err(|e| format!("Failed to deserialize. {e:?}"))?;
     Ok(ids)
diff --git a/iota-execution/v0/iota-verifier/src/lib.rs b/iota-execution/v0/iota-verifier/src/lib.rs
index f2140abb868..e01d51b6c07 100644
--- a/iota-execution/v0/iota-verifier/src/lib.rs
+++ b/iota-execution/v0/iota-verifier/src/lib.rs
@@ -23,7 +23,7 @@ fn verification_failure(error: String) -> ExecutionError {
 }
 
 fn to_verification_timeout_error(error: String) -> ExecutionError {
-    ExecutionError::new_with_source(ExecutionErrorKind::IotaMoveVerificationTimedout, error)
+    ExecutionError::new_with_source(ExecutionErrorKind::IotaMoveVerificationTimeout, error)
 }
 
 /// Runs the Move verifier and checks if the error counts as a Move verifier
diff --git a/iota-execution/v0/iota-verifier/src/verifier.rs b/iota-execution/v0/iota-verifier/src/verifier.rs
index 0644392062a..7303e6a9ef1 100644
--- a/iota-execution/v0/iota-verifier/src/verifier.rs
+++ b/iota-execution/v0/iota-verifier/src/verifier.rs
@@ -39,7 +39,7 @@ pub fn iota_verify_module_metered_check_timeout_only(
     if let Err(error) = iota_verify_module_metered(module, fn_info_map, meter) {
         if matches!(
             error.kind(),
-            iota_types::execution_status::ExecutionFailureStatus::IotaMoveVerificationTimedout
+            iota_types::execution_status::ExecutionFailureStatus::IotaMoveVerificationTimeout
         ) {
             return Err(error);
         }
@@ -57,7 +57,7 @@ pub fn iota_verify_module_unmetered(
         debug_assert!(
             !matches!(
                 err.kind(),
-                iota_types::execution_status::ExecutionFailureStatus::IotaMoveVerificationTimedout
+                iota_types::execution_status::ExecutionFailureStatus::IotaMoveVerificationTimeout
             ),
             "Unexpected timeout error in execution"
         );
diff --git a/kiosk/LICENSE b/kiosk/LICENSE
new file mode 100644
index 00000000000..261eeb9e9f8
--- /dev/null
+++ b/kiosk/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/kiosk/Move.toml b/kiosk/Move.toml
new file mode 100644
index 00000000000..aee933af890
--- /dev/null
+++ b/kiosk/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "Kiosk"
+version = "0.0.1"
+
+[dependencies]
+Iota = { local = "../crates/iota-framework/packages/iota-framework" }
+
+[addresses]
+kiosk = "0x0"
diff --git a/kiosk/README.md b/kiosk/README.md
deleted file mode 100644
index 5c7bdd483e1..00000000000
--- a/kiosk/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Kiosk App
-
-The code has been moved to a separate repository. Please, go to [iotaledger/apps](https://github.com/iotaledger/apps) for the source code for Kiosk Package.
diff --git a/kiosk/docs/creating_a_rule_guide.md b/kiosk/docs/creating_a_rule_guide.md
new file mode 100644
index 00000000000..dd96434af19
--- /dev/null
+++ b/kiosk/docs/creating_a_rule_guide.md
@@ -0,0 +1,226 @@
+# Creating a Rule: Guide
+
+When an item is purchased in a Kiosk, a TransferRequest potato is created, and the only way to resolve it and unblock the transaction is to confirm the request in the matching TransferPolicy. This guide explains how TransferPolicy works and how new rules can be implemented and added into a policy.
+
+## Basics
+
+An item of a type T can only be traded in Kiosks if the TransferPolicy for T exists and available to the buyer. This requirement is based on a simple fact that the TransferRequest issued on purchase must be resolved in a matching TransferPolicy and if there isn't one or buyer can't access it, the transaction will fail.
+
+This system was designed to give maximum freedom and flexibility for creators: by taking the transfer policy logic out of the trading primitive we make sure that the policies can be set only by creators, and as long as the trading primitive is used, enforcements are under their control. Effectively creators became closer to the trading ecosystem and got an important and solid role in the process.
+
+## Architecture
+
+By default, a single TransferPolicy does not enforce anything - if a buyer attempts to confirm their TransferRequest, it will go through. However, the system allows setting so-called "Rules". Their logic is simple: someone can publish a new rule module, for example "fixed fee", and let it be "added" or "set" for the TransferPolicy. Once the Rule is added, TransferRequest needs to collect a TransferReceipt marking that the requirement specified in the Rule was completed.
+
+- Once a Rule is added to the TransferPolicy, every TransferRequest going to the policy must have a matching Receipt
+
+## Rule structure: Dummy
+
+Every rule would follow the same structure and implement required types:
+
+1. RuleWitness struct
+2. Config struct stored in the TransferPolicy
+3. "set" function which adds the Rule to the TP
+4. an action function which adds a Receipt to the TransferRequest
+
+> Important: there's no need to implement "unset" - any rule can be removed at any time as defined in the TransferPolicy module and guaranteed by the set of constraints on the rule Config (store + drop)
+
+```move
+module examples::dummy_rule {
+    use iota::coin::Coin;
+    use iota::iota::IOTA;
+    use iota::transfer_policy::{
+        Self as policy,
+        TransferPolicy,
+        TransferPolicyCap,
+        TransferRequest
+    };
+
+    /// The Rule Witness; has no fields and is used as a
+    /// static authorization method for the rule.
+    struct Rule has drop {}
+
+    /// Configuration struct with any fields (as long as it
+    /// has `drop`). Managed by the Rule module.
+    struct Config has store, drop {}
+
+    /// Function that adds a Rule to the `TransferPolicy`.
+    /// Requires `TransferPolicyCap` to make sure the rules are
+    /// added only by the publisher of T.
+    public fun set<T>(
+        policy: &mut TransferPolicy<T>,
+        cap: &TransferPolicyCap<T>
+    ) {
+        policy::add_rule(Rule {}, policy, cap, Config {})
+    }
+
+    /// Action function - perform a certain action (any, really)
+    /// and pass in the `TransferRequest` so it gets the Receipt.
+    /// Receipt is a Rule Witness, so there's no way to create
+    /// it anywhere else but in this module.
+    ///
+    /// This example also illustrates that Rules can add Coin<IOTA>
+    /// to the balance of the TransferPolicy allowing creators to
+    /// collect fees.
+    public fun pay<T>(
+        policy: &mut TransferPolicy<T>,
+        request: &mut TransferRequest<T>,
+        payment: Coin<IOTA>
+    ) {
+        policy::add_to_balance(Rule {}, policy, payment);
+        policy::add_receipt(Rule {}, request);
+    }
+}
+```
+
+This module contains no configuration and requires a `Coin<IOTA>` of any value (even "0"), so it's easy to imagine that every buyer would create a zero Coin and pass it to get the Receipt. The only thing this Rule module is good for is illustration and a skeleton. Goes without saying but _this code should never be used in production_.
+
+## Reading the Request: Royalty
+
+To implement a percentage-based fee (a very common scenario - royalty fee), a Rule module needs to know the price for which an item was purchased. And the TransferRequest contains some information which can be used in this and other scenarios:
+
+1. Item ID
+2. Amount paid (IOTA)
+3. From ID - the object which was used for selling (eg Kiosk)
+
+> To provide access to these fields, the `iota::transfer_policy` module has a set of getter functions which are available to anyone: "paid()", "item()" and "from()"
+
+```move
+module examples::royalty_rule {
+    // skipping dependencies
+    const MAX_BP: u16 = 10_000;
+
+    struct Rule has drop {}
+
+    /// In this implementation Rule has a configuration - `amount_bp`
+    /// which is the percentage of the `paid` in basis points.
+    struct Config has store, drop { amount_bp: u16 }
+
+    /// When a Rule is added, configuration details are specified
+    public fun set<T>(
+        policy: &mut TransferPolicy<T>,
+        cap: &TransferPolicyCap<T>,
+        amount_bp: u16
+    ) {
+        assert!(amount_bp <= MAX_BP, 0);
+        policy::add_rule(Rule {}, policy, cap, Config { amount_bp })
+    }
+
+    /// To get the Receipt, the buyer must call this function and pay
+    /// the required amount; the amount is calculated dynamically and
+    /// it is more convenient to use a mutable reference
+    public fun pay<T>(
+        policy: &mut TransferPolicy<T>,
+        request: &mut TransferRequest<T>,
+        payment: &mut Coin<IOTA>,
+        ctx: &mut TxContext
+    ) {
+        // using the getter to read the paid amount
+        let paid = policy::paid(request);
+        let config: &Config = policy::get_rule(Rule {}, policy);
+        let amount = (((paid as u128) * (config.amount_bp as u128) / MAX_BP) as u64);
+        assert!(coin::value(payment) >= amount, EInsufficientAmount);
+
+        let fee = coin::split(payment, amount, ctx);
+        policy::add_to_balance(Rule {}, policy, fee);
+        policy::add_receipt(Rule {}, request)
+    }
+}
+```
+
+## Time is also Money
+
+Rules don't need to be only for payments and fees. Some might allow trading before or after a certain time. Since Rules are not standardized and can use anything, developers can encode logic around using any objects.
+
+```move
+module examples::time_rule {
+    // skipping some dependencies
+    use iota::clock::{Self, Clock};
+
+    struct Rule has drop {}
+    struct Config has store, drop { start_time: u64 }
+
+    /// Start time is yet to come
+    const ETooSoon: u64 = 0;
+
+    /// Add a Rule that enables purchases after a certain time
+    public fun set<T>(/* skip default fields */, start_time: u64) {
+        policy::add_rule(Rule {}, policy, cap, Config { start_time })
+    }
+
+    /// Pass in the Clock and prove that current time value is higher
+    /// than the `start_time`
+    public fun confirm_time<T>(
+        policy: &TransferPolicy<T>,
+        request: &mut TransferRequest<T>,
+        clock: &Clock
+    ) {
+        let config: &Config = policy::get_rule(Rule {}, policy)
+        assert!(clock::timestamp_ms(clock) >= config.start_time, ETooSoon);
+        policy::add_receipt(Rule {}, request)
+    }
+}
+```
+
+## Generalizing approach: Witness policy
+
+Iota Move has two main ways for authorizing an action: static - by using the Witness pattern, and dynamic - via the Capability pattern. With a small addition of type parameters to the Rule, it is possible to create a _generic Rule_ which will not only vary by configuration but also by the type of the Rule.
+
+```move
+module examples::witness_rule {
+    // skipping dependencies
+
+    /// Rule is either not set or the Witness does not match the expectation
+    const ERuleNotSet: u64 = 0;
+
+    /// This Rule requires a witness of type W, see the implementation
+    struct Rule<phantom W> has drop {}
+    struct Config has store, drop {}
+
+    /// No special arguments are required to set this Rule, but the
+    /// publisher now needs to specify a Witness type
+    public fun set<T, W>(/* .... */) {
+        policy::add_rule(Rule<W> {}, policy, cap, Config {})
+    }
+
+    /// To confirm the action, buyer needs to pass in a witness
+    /// which should be acquired either by calling some function or
+    /// integrated into a more specific hook of a marketplace /
+    /// trading module
+    public fun confirm<T, W>(
+        _: W,
+        policy: &TransferPolicy<T>,
+        request: &mut TransferRequest<T>
+    ) {
+        assert!(policy::has_rule<T, Rule<W>>(policy), ERuleNotSet);
+        policy::add_receipt(Rule<W> {}, request)
+    }
+}
+```
+
+The "witness_rule" is very generic and can be used to require a custom Witness depending on the settings. It is a simple and yet a powerful way to link a custom marketplace / trading logic to the TransferPolicy. With a slight modification, the rule can be turned into a generic Capability requirement (basically any object, even a TransferPolicy for a different type or a TransferRequest - no limit to what could be done).
+
+```move
+module examples::capability_rule {
+    // skipping dependencies
+
+    /// Changing the type parameter name for better readability
+    struct Rule<phantom Cap> has drop {}
+    struct Config {}
+
+    /// Absolutely identical to the witness setting
+    public fun set<T, Cap>(/* ... *) {
+        policy::add_rule(Rule<Cap> {}, policy, cap, Config {})
+    }
+
+    /// Almost the same with the Witness requirement, only now we
+    /// require a reference to the type.
+    public fun confirm<T, Cap>(
+        cap: &Cap,
+        /* ... */
+    ) {
+        assert!(policy::has_rule<T, Rule<Cap>>(policy), ERuleNotSet);
+        policy::add_receipt(Rule<Cap> {}, request)
+    }
+}
+```
diff --git a/kiosk/sources/extensions/personal_kiosk.move b/kiosk/sources/extensions/personal_kiosk.move
new file mode 100644
index 00000000000..fa40500d6a0
--- /dev/null
+++ b/kiosk/sources/extensions/personal_kiosk.move
@@ -0,0 +1,141 @@
+// Copyright (c) Mysten Labs, Inc.
+// Modifications Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+/// Description:
+/// This module provides a wrapper for the KioskOwnerCap that makes the Kiosk
+/// non-transferable and "owned".
+///
+module kiosk::personal_kiosk {
+    use std::option::{Self, Option};
+    use iota::transfer;
+    use iota::kiosk::{Self, Kiosk, KioskOwnerCap};
+    use iota::object::{Self, ID, UID};
+    use iota::tx_context::{sender, TxContext};
+    use iota::dynamic_field as df;
+
+    /// Trying to return the Cap / Borrow to a wrong PersonalKioskCap object.
+    const EIncorrectCapObject: u64 = 0;
+    /// Trying to return the Cap / Borrow to a wrong PersonalKioskCap object.
+    const EIncorrectOwnedObject: u64 = 1;
+    /// Trying to get the owner of a non-personal Kiosk.
+    const EKioskNotOwned: u64 = 2;
+    /// Trying to make a someone else's Kiosk "personal".
+    const EWrongKiosk: u64 = 3;
+
+    /// A key-only wrapper for the KioskOwnerCap. Makes sure that the Kiosk can
+    /// not be traded altogether with its contents.
+    struct PersonalKioskCap has key {
+        id: UID,
+        cap: Option<KioskOwnerCap>
+    }
+
+    /// The hot potato making sure the KioskOwnerCap is returned after borrowing.
+    struct Borrow { cap_id: ID, owned_id: ID }
+
+    /// The dynamic field to mark the Kiosk as owned (to allow guaranteed owner
+    /// checks through the Kiosk).
+    struct OwnerMarker has copy, store, drop {}
+
+    /// Event that is emitted when a new PersonalKioskCap is created. The sender
+    /// of the transaction is always the new Kiosk Owner.
+    struct NewPersonalKiosk has copy, drop { kiosk_id: ID }
+
+    /// The default setup for the PersonalKioskCap.
+    entry fun default(kiosk: &mut Kiosk, cap: KioskOwnerCap, ctx: &mut TxContext) {
+        transfer_to_sender(new(kiosk, cap, ctx), ctx);
+    }
+
+    /// Wrap the KioskOwnerCap making the Kiosk "owned" and non-transferable.
+    /// The `PersonalKioskCap` is returned to allow chaining within a PTB, but
+    /// the value must be consumed by the `transfer_to_sender` call in any case.
+    public fun new(
+        kiosk: &mut Kiosk, cap: KioskOwnerCap, ctx: &mut TxContext
+    ): PersonalKioskCap {
+        assert!(kiosk::has_access(kiosk, &cap), EWrongKiosk);
+
+        let owner = sender(ctx);
+
+        // set the owner property of the Kiosk
+        kiosk::set_owner(kiosk, &cap, ctx);
+
+        // add the owner marker to the Kiosk; uses `_as_owner` to always pass,
+        // even if Kiosk "allow_extensions" is set to false
+        df::add(
+            kiosk::uid_mut_as_owner(kiosk, &cap),
+            OwnerMarker {},
+            owner
+        );
+
+        iota::event::emit(NewPersonalKiosk {
+            kiosk_id: object::id(kiosk)
+        });
+
+        // wrap the Cap in the `PersonalKioskCap`
+        PersonalKioskCap {
+            id: object::new(ctx),
+            cap: option::some(cap)
+        }
+    }
+
+    /// Borrow the `KioskOwnerCap` from the `PersonalKioskCap` object.
+    public fun borrow(self: &PersonalKioskCap): &KioskOwnerCap {
+        option::borrow(&self.cap)
+    }
+
+    /// Mutably borrow the `KioskOwnerCap` from the `PersonalKioskCap` object.
+    public fun borrow_mut(self: &mut PersonalKioskCap): &mut KioskOwnerCap {
+        option::borrow_mut(&mut self.cap)
+    }
+
+    /// Borrow the `KioskOwnerCap` from the `PersonalKioskCap` object; `Borrow`
+    /// hot-potato makes sure that the Cap is returned via `return_val` call.
+    public fun borrow_val(
+        self: &mut PersonalKioskCap
+    ): (KioskOwnerCap, Borrow) {
+        let cap = option::extract(&mut self.cap);
+        let id = object::id(&cap);
+
+        (cap, Borrow {
+            owned_id: object::id(self),
+            cap_id: id
+        })
+    }
+
+    /// Return the Cap to the PersonalKioskCap object.
+    public fun return_val(
+        self: &mut PersonalKioskCap, cap: KioskOwnerCap, borrow: Borrow
+    ) {
+        let Borrow { owned_id, cap_id } = borrow;
+        assert!(object::id(self) == owned_id, EIncorrectOwnedObject);
+        assert!(object::id(&cap) == cap_id, EIncorrectCapObject);
+
+        option::fill(&mut self.cap, cap)
+    }
+
+    /// Check if the Kiosk is "personal".
+    public fun is_personal(kiosk: &Kiosk): bool {
+        df::exists_(kiosk::uid(kiosk), OwnerMarker {})
+    }
+
+    /// Get the owner of the Kiosk if the Kiosk is "personal". Aborts otherwise.
+    public fun owner(kiosk: &Kiosk): address {
+        assert!(is_personal(kiosk), EKioskNotOwned);
+        *df::borrow(kiosk::uid(kiosk), OwnerMarker {})
+    }
+
+    /// Try to get the owner of the Kiosk if the Kiosk is "personal". Returns
+    /// None otherwise.
+    public fun try_owner(kiosk: &Kiosk): Option<address> {
+        if (is_personal(kiosk)) {
+            option::some(owner(kiosk))
+        } else {
+            option::none()
+        }
+    }
+
+    /// Transfer the `PersonalKioskCap` to the transaction sender.
+    public fun transfer_to_sender(self: PersonalKioskCap, ctx: &mut TxContext) {
+        transfer::transfer(self, sender(ctx));
+    }
+}
diff --git a/kiosk/sources/rules/floor_price_rule.move b/kiosk/sources/rules/floor_price_rule.move
new file mode 100644
index 00000000000..419fa2d5793
--- /dev/null
+++ b/kiosk/sources/rules/floor_price_rule.move
@@ -0,0 +1,57 @@
+// Copyright (c) Mysten Labs, Inc.
+// Modifications Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+/// Description:
+/// This module defines a Rule which sets the floor price for items of type T.
+///
+/// Configuration:
+/// - floor_price - the floor price in nano.
+///
+/// Use cases:
+/// - Defining a floor price for all trades of type T.
+/// - Prevent trading of locked items with low amounts (e.g. by using purchase_cap).
+///
+module kiosk::floor_price_rule {
+    use iota::transfer_policy::{
+        Self as policy,
+        TransferPolicy,
+        TransferPolicyCap,
+        TransferRequest
+    };
+
+    /// The price was lower than the floor price.
+    const EPriceTooSmall: u64 = 0;
+
+    /// The "Rule" witness to authorize the policy.
+    struct Rule has drop {}
+
+    /// Configuration for the `Floor Price Rule`.
+    /// It holds the minimum price that an item can be sold at.
+    /// There can't be any sales with a price < than the floor_price.
+    struct Config has store, drop {
+        floor_price: u64
+    }
+
+    /// Creator action: Add the Floor Price Rule for the `T`.
+    /// Pass in the `TransferPolicy`, `TransferPolicyCap` and `floor_price`.
+    public fun add<T>(
+        policy: &mut TransferPolicy<T>,
+        cap: &TransferPolicyCap<T>,
+        floor_price: u64
+    ) {
+        policy::add_rule(Rule {}, policy, cap, Config { floor_price })
+    }
+
+    /// Buyer action: Prove that the amount is higher or equal to the floor_price.
+    public fun prove<T>(
+        policy: &mut TransferPolicy<T>,
+        request: &mut TransferRequest<T>
+    ) {
+        let config: &Config = policy::get_rule(Rule {}, policy);
+
+        assert!(policy::paid(request) >= config.floor_price, EPriceTooSmall);
+
+        policy::add_receipt(Rule {}, request)
+    }
+}
diff --git a/kiosk/sources/rules/kiosk_lock_rule.move b/kiosk/sources/rules/kiosk_lock_rule.move
new file mode 100644
index 00000000000..43b9d463e23
--- /dev/null
+++ b/kiosk/sources/rules/kiosk_lock_rule.move
@@ -0,0 +1,54 @@
+// Copyright (c) Mysten Labs, Inc.
+// Modifications Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+/// Description:
+/// This module defines a Rule which forces buyers to put the purchased
+/// item into the Kiosk and lock it. The most common use case for the
+/// Rule is making sure an item never leaves Kiosks and has policies
+/// enforced on every transfer.
+///
+/// Configuration:
+/// - None
+///
+/// Use cases:
+/// - Enforcing policies on every trade
+/// - Making sure an item never leaves the Kiosk / certain ecosystem
+///
+/// Notes:
+/// - "locking" mechanic disallows the `kiosk::take` function and forces
+/// the owner to use `list` or `list_with_purchase_cap` methods if they
+/// wish to move the item somewhere else.
+///
+module kiosk::kiosk_lock_rule {
+    use iota::kiosk::{Self, Kiosk};
+    use iota::transfer_policy::{
+        Self as policy,
+        TransferPolicy,
+        TransferPolicyCap,
+        TransferRequest
+    };
+
+    /// Item is not in the `Kiosk`.
+    const ENotInKiosk: u64 = 0;
+
+    /// The type identifier for the Rule.
+    struct Rule has drop {}
+
+    /// An empty configuration for the Rule.
+    struct Config has store, drop {}
+
+    /// Creator: Adds a `kiosk_lock_rule` Rule to the `TransferPolicy` forcing
+    /// buyers to lock the item in a Kiosk on purchase.
+    public fun add<T>(policy: &mut TransferPolicy<T>, cap: &TransferPolicyCap<T>) {
+        policy::add_rule(Rule {}, policy, cap, Config {})
+    }
+
+    /// Buyer: Prove the item was locked in the Kiosk to get the receipt and
+    /// unblock the transfer request confirmation.
+    public fun prove<T>(request: &mut TransferRequest<T>, kiosk: &Kiosk) {
+        let item = policy::item(request);
+        assert!(kiosk::has_item(kiosk, item) && kiosk::is_locked(kiosk, item), ENotInKiosk);
+        policy::add_receipt(Rule {}, request)
+    }
+}
diff --git a/kiosk/sources/rules/personal_kiosk_rule.move b/kiosk/sources/rules/personal_kiosk_rule.move
new file mode 100644
index 00000000000..6c18e471b7f
--- /dev/null
+++ b/kiosk/sources/rules/personal_kiosk_rule.move
@@ -0,0 +1,54 @@
+// Copyright (c) Mysten Labs, Inc.
+// Modifications Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+/// Description:
+/// This module defines a Rule which checks that the Kiosk is "personal" meaning
+/// that the owner cannot change. By default, `KioskOwnerCap` can be transferred
+/// and owned by an application therefore the owner of the Kiosk is not fixed.
+///
+/// Configuration:
+/// - None
+///
+/// Use cases:
+/// - Strong royalty enforcement - personal Kiosks cannot be transferred with
+/// the assets inside which means that the item will never change the owner.
+///
+/// Notes:
+/// - Combination of `kiosk_lock_rule` and `personal_kiosk_rule` can be used to
+/// enforce policies on every trade (item can be transferred only through a
+/// trade + Kiosk is fixed to the owner).
+///
+module kiosk::personal_kiosk_rule {
+    use iota::kiosk::{Self, Kiosk};
+    use iota::transfer_policy::{
+        Self as policy,
+        TransferPolicy,
+        TransferPolicyCap,
+        TransferRequest
+    };
+
+    use kiosk::personal_kiosk;
+
+    /// An item hasn't been placed into the Kiosk before the call.
+    const EItemNotInKiosk: u64 = 0;
+    /// The Kiosk is not owned; the OwnerMarker is not present.
+    const EKioskNotOwned: u64 = 1;
+
+    /// The Rule checking that the Kiosk is an owned one.
+    struct Rule has drop {}
+
+    /// Add the "owned" rule to the KioskOwnerCap.
+    public fun add<T>(policy: &mut TransferPolicy<T>, cap: &TransferPolicyCap<T>) {
+        policy::add_rule(Rule {}, policy, cap, true)
+    }
+
+    /// Make sure that the destination Kiosk has the Owner key. Item is already
+    /// placed by the time this check is performed - otherwise fails.
+    public fun prove<T>(kiosk: &Kiosk, request: &mut TransferRequest<T>) {
+        assert!(kiosk::has_item(kiosk, policy::item(request)), EItemNotInKiosk);
+        assert!(personal_kiosk::is_personal(kiosk), EKioskNotOwned);
+
+        policy::add_receipt(Rule {}, request)
+    }
+}
diff --git a/kiosk/sources/rules/royalty_rule.move b/kiosk/sources/rules/royalty_rule.move
new file mode 100644
index 00000000000..348ba0e0fbe
--- /dev/null
+++ b/kiosk/sources/rules/royalty_rule.move
@@ -0,0 +1,105 @@
+// Copyright (c) Mysten Labs, Inc.
+// Modifications Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+/// Description:
+/// This module defines a Rule which requires a payment on a purchase.
+/// The payment amount can be either a fixed amount (min_amount) or a
+/// percentage of the purchase price (amount_bp). Or both: the higher
+/// of the two is used.
+///
+/// Configuration:
+/// - amount_bp - the percentage of the purchase price to be paid as a
+/// fee, denominated in basis points (100_00 = 100%, 1 = 0.01%).
+/// - min_amount - the minimum amount to be paid as a fee if the relative
+/// amount is lower than this setting.
+///
+/// Use cases:
+/// - Percentage-based Royalty fee for the creator of the NFT.
+/// - Fixed commission fee on a trade.
+/// - A mix of both: the higher of the two is used.
+///
+/// Notes:
+/// - To use it as a fixed commission set the `amount_bp` to 0 and use the
+/// `min_amount` to set the fixed amount.
+/// - To use it as a percentage-based fee set the `min_amount` to 0 and use
+/// the `amount_bp` to set the percentage.
+/// - To use it as a mix of both set the `min_amount` to the min amount
+/// acceptable and the `amount_bp` to the percentage of the purchase price.
+/// The higher of the two will be used.
+///
+module kiosk::royalty_rule {
+    use iota::iota::IOTA;
+    use iota::coin::{Self, Coin};
+    use iota::transfer_policy::{
+        Self as policy,
+        TransferPolicy,
+        TransferPolicyCap,
+        TransferRequest
+    };
+
+    /// The `amount_bp` passed is more than 100%.
+    const EIncorrectArgument: u64 = 0;
+    /// The `Coin` used for payment is not enough to cover the fee.
+    const EInsufficientAmount: u64 = 1;
+
+    /// Max value for the `amount_bp`.
+    const MAX_BPS: u16 = 10_000;
+
+    /// The "Rule" witness to authorize the policy.
+    struct Rule has drop {}
+
+    /// Configuration for the Rule. The `amount_bp` is the percentage
+    /// of the transfer amount to be paid as a royalty fee. The `min_amount`
+    /// is the minimum amount to be paid if the percentage based fee is
+    /// lower than the `min_amount` setting.
+    ///
+    /// Adding a minimum amount is useful to enforce a fixed fee even if
+    /// the transfer amount is very small or 0.
+    struct Config has store, drop {
+        amount_bp: u16,
+        min_amount: u64
+    }
+
+    /// Creator action: Add the Royalty Rule for the `T`.
+    /// Pass in the `TransferPolicy`, `TransferPolicyCap` and the configuration
+    /// for the policy: `amount_bp` and `min_amount`.
+    public fun add<T: key + store>(
+        policy: &mut TransferPolicy<T>,
+        cap: &TransferPolicyCap<T>,
+        amount_bp: u16,
+        min_amount: u64
+    ) {
+        assert!(amount_bp <= MAX_BPS, EIncorrectArgument);
+        policy::add_rule(Rule {}, policy, cap, Config { amount_bp, min_amount })
+    }
+
+    /// Buyer action: Pay the royalty fee for the transfer.
+    public fun pay<T: key + store>(
+        policy: &mut TransferPolicy<T>,
+        request: &mut TransferRequest<T>,
+        payment: Coin<IOTA>
+    ) {
+        let paid = policy::paid(request);
+        let amount = fee_amount(policy, paid);
+
+        assert!(coin::value(&payment) == amount, EInsufficientAmount);
+
+        policy::add_to_balance(Rule {}, policy, payment);
+        policy::add_receipt(Rule {}, request)
+    }
+
+    /// Helper function to calculate the amount to be paid for the transfer.
+    /// Can be dry-ran to estimate the fee amount based on the Kiosk listing price.
+    public fun fee_amount<T: key + store>(policy: &TransferPolicy<T>, paid: u64): u64 {
+        let config: &Config = policy::get_rule(Rule {}, policy);
+        let amount = (((paid as u128) * (config.amount_bp as u128) / 10_000) as u64);
+
+        // If the amount is less than the minimum, use the minimum
+        if (amount < config.min_amount) {
+            amount = config.min_amount
+        };
+
+        amount
+    }
+}
diff --git a/kiosk/sources/rules/witness_rule.move b/kiosk/sources/rules/witness_rule.move
new file mode 100644
index 00000000000..e1f9c58e73e
--- /dev/null
+++ b/kiosk/sources/rules/witness_rule.move
@@ -0,0 +1,52 @@
+// Copyright (c) Mysten Labs, Inc.
+// Modifications Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+/// Description:
+/// This module implements a Rule that requires a "Proof" witness to be
+/// presented on every transfer. The "Proof" witness is a type chosen by
+/// the owner of the policy.
+///
+/// Configuration:
+/// - The type to require for every transfer.
+///
+/// Use Cases:
+/// - Can be used to link custom logic to the TransferPolicy via the Witness.
+/// - Only allow trading on a certain marketplace.
+/// - Require a confirmation in a third party module
+/// - Implement a custom requirement on the creator side an link the logic.
+///
+module kiosk::witness_rule {
+    use iota::transfer_policy::{
+        Self as policy,
+        TransferPolicy,
+        TransferPolicyCap,
+        TransferRequest
+    };
+
+    /// When a Proof does not find its Rule<Proof>.
+    const ERuleNotFound: u64 = 0;
+
+    /// Custom witness-key for the "proof policy".
+    struct Rule<phantom Proof: drop> has drop {}
+
+    /// Creator action: adds the Rule.
+    /// Requires a "Proof" witness confirmation on every transfer.
+    public fun add<T: key + store, Proof: drop>(
+        policy: &mut TransferPolicy<T>,
+        cap: &TransferPolicyCap<T>
+    ) {
+        policy::add_rule(Rule<Proof> {}, policy, cap, true);
+    }
+
+    /// Buyer action: follow the policy.
+    /// Present the required "Proof" instance to get a receipt.
+    public fun prove<T: key + store, Proof: drop>(
+        _proof: Proof,
+        policy: &TransferPolicy<T>,
+        request: &mut TransferRequest<T>
+    ) {
+        assert!(policy::has_rule<T, Rule<Proof>>(policy), ERuleNotFound);
+        policy::add_receipt(Rule<Proof> {}, request)
+    }
+}
diff --git a/kiosk/tests/extensions/.keep b/kiosk/tests/extensions/.keep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/kiosk/tests/rules/kiosk_lock_rule_tests.move b/kiosk/tests/rules/kiosk_lock_rule_tests.move
new file mode 100644
index 00000000000..c16a8499139
--- /dev/null
+++ b/kiosk/tests/rules/kiosk_lock_rule_tests.move
@@ -0,0 +1,52 @@
+// Copyright (c) Mysten Labs, Inc.
+// Modifications Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+#[test_only]
+/// Test illustrating how an asset can be forever locked in the Kiosk.
+module kiosk::kiosk_lock_rule_tests {
+    use iota::kiosk;
+    use iota::kiosk_test_utils::{Self as test, Asset};
+    use iota::transfer_policy as policy;
+    use iota::transfer;
+
+    use kiosk::kiosk_lock_rule as kiosk_lock;
+
+    #[test]
+    fun test_item_always_locked() {
+        let ctx = &mut test::ctx();
+        let (_, _, carl) = test::folks();
+        let (policy, policy_cap) = test::get_policy(ctx);
+        let (kiosk, kiosk_cap) = test::get_kiosk(ctx);
+        let (item, item_id) = test::get_asset(ctx);
+        let payment = test::get_iota(1000, ctx);
+
+        // Alice the Creator
+        // - disallow taking from the Kiosk
+        // - require "PlacedWitness" on purchase
+        // - place an asset into the Kiosk so it can only be sold
+        kiosk_lock::add(&mut policy, &policy_cap);
+        kiosk::lock(&mut kiosk, &kiosk_cap, &policy, item);
+        kiosk::list<Asset>(&mut kiosk, &kiosk_cap, item_id, 1000);
+
+        // Bob the Buyer
+        // - places the item into his Kiosk and gets the proof
+        // - prove placing and confirm request
+        let (bob_kiosk, bob_kiosk_cap) = test::get_kiosk(ctx);
+        let (item, request) = kiosk::purchase<Asset>(&mut kiosk, item_id, payment);
+        kiosk::lock(&mut bob_kiosk, &bob_kiosk_cap, &policy, item);
+
+        // The difference!
+        kiosk_lock::prove(&mut request, &mut bob_kiosk);
+        policy::confirm_request(&policy, request);
+
+        // Carl the Cleaner;
+        // - cleans up and transfer Kiosk to himself
+        // - as we can't take an item due to the policy setting (and kiosk must be empty)
+        test::return_policy(policy, policy_cap, ctx);
+        test::return_kiosk(kiosk, kiosk_cap, ctx);
+
+        transfer::public_transfer(bob_kiosk, carl);
+        transfer::public_transfer(bob_kiosk_cap, carl);
+    }
+}
diff --git a/kiosk/tests/rules/royalty_rule_tests.move b/kiosk/tests/rules/royalty_rule_tests.move
new file mode 100644
index 00000000000..72b68396b39
--- /dev/null
+++ b/kiosk/tests/rules/royalty_rule_tests.move
@@ -0,0 +1,163 @@
+// Copyright (c) Mysten Labs, Inc.
+// Modifications Copyright (c) 2024 IOTA Stiftung
+// SPDX-License-Identifier: Apache-2.0
+
+#[test_only]
+module kiosk::royalty_rule_tests {
+    use iota::coin;
+    use iota::iota::IOTA;
+    use iota::tx_context::dummy as ctx;
+    use iota::transfer_policy as policy;
+    use iota::transfer_policy_tests as test;
+
+    use kiosk::royalty_rule;
+
+    #[test]
+    fun test_default_flow_0() {
+        let ctx = &mut ctx();
+        let (policy, cap) = test::prepare(ctx);
+
+        // 0% royalty; min 0 nano
+        royalty_rule::add(&mut policy, &cap, 0, 0);
+
+        let request = policy::new_request(test::fresh_id(ctx), 100_000, test::fresh_id(ctx));
+        let payment = coin::mint_for_testing<IOTA>(0, ctx);
+
+        royalty_rule::pay(&mut policy, &mut request, payment);
+        policy::confirm_request(&mut policy, request);
+
+        let profits = test::wrapup(policy, cap, ctx);
+        assert!(profits == 0, 1);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = kiosk::royalty_rule::EInsufficientAmount)]
+    fun test_default_flow_0_invalid_amount_fail() {
+        let ctx = &mut ctx();
+        let (policy, cap) = test::prepare(ctx);
+
+        // 0% royalty; min 0 nano
+        royalty_rule::add(&mut policy, &cap, 0, 0);
+
+        let request = policy::new_request(test::fresh_id(ctx), 100_000, test::fresh_id(ctx));
+        let payment = coin::mint_for_testing<IOTA>(10, ctx);
+
+        royalty_rule::pay(&mut policy, &mut request, payment);
+        policy::confirm_request(&mut policy, request);
+
+        let profits = test::wrapup(policy, cap, ctx);
+        assert!(profits == 0, 1);
+    }
+
+    #[test]
+    fun test_default_flow_1() {
+        let ctx = &mut ctx();
+        let (policy, cap) = test::prepare(ctx);
+
+        // 1% royalty; min 0 nano
+        royalty_rule::add(&mut policy, &cap, 100, 0);
+
+        let request = policy::new_request(test::fresh_id(ctx), 100_000, test::fresh_id(ctx));
+        let payment = coin::mint_for_testing<IOTA>(1000, ctx);
+
+        royalty_rule::pay(&mut policy, &mut request, payment);
+        policy::confirm_request(&mut policy, request);
+
+        let profits = test::wrapup(policy, cap, ctx);
+        assert!(profits == 1000, 1);
+    }
+
+    #[test]
+    fun test_default_flow_100() {
+        let ctx = &mut ctx();
+        let (policy, cap) = test::prepare(ctx);
+
+        // 100% royalty; min 0 nano
+        royalty_rule::add(&mut policy, &cap, 10_000, 0);
+
+        let request = policy::new_request(test::fresh_id(ctx), 100_000, test::fresh_id(ctx));
+        let payment = coin::mint_for_testing<IOTA>(100_000, ctx);
+
+        royalty_rule::pay(&mut policy, &mut request, payment);
+        policy::confirm_request(&mut policy, request);
+
+        let profits = test::wrapup(policy, cap, ctx);
+        assert!(profits == 100_000, 1);
+    }
+
+    #[test]
+    fun test_default_flow_1_min_10_000() {
+        let ctx = &mut ctx();
+        let (policy, cap) = test::prepare(ctx);
+
+        // 1% royalty; min 10_000 nano
+        royalty_rule::add(&mut policy, &cap, 100, 10_000);
+
+        let request = policy::new_request(test::fresh_id(ctx), 100_000, test::fresh_id(ctx));
+        let payment = coin::mint_for_testing<IOTA>(10_000, ctx);
+
+        royalty_rule::pay(&mut policy, &mut request, payment);
+        policy::confirm_request(&mut policy, request);
+        assert!(test::wrapup(policy, cap, ctx) == 10_000, 1);
+    }
+
+    #[test]
+    fun test_default_flow_10_min_10_000() {
+        let ctx = &mut ctx();
+        let (policy, cap) = test::prepare(ctx);
+
+        // 10% royalty; min 10_000 nano
+        royalty_rule::add(&mut policy, &cap, 1000, 10_000);
+
+        let request = policy::new_request(test::fresh_id(ctx), 100_000, test::fresh_id(ctx));
+        let payment = coin::mint_for_testing<IOTA>(10_000, ctx);
+
+        royalty_rule::pay(&mut policy, &mut request, payment);
+        policy::confirm_request(&mut policy, request);
+        assert!(test::wrapup(policy, cap, ctx) == 10_000, 1);
+    }
+
+    #[test]
+    fun test_default_flow_20_min_10_000() {
+        let ctx = &mut ctx();
+        let (policy, cap) = test::prepare(ctx);
+
+        // 20% royalty; min 10_000 nano
+        royalty_rule::add(&mut policy, &cap, 20_00, 10_000);
+
+        let request = policy::new_request(test::fresh_id(ctx), 100_000, test::fresh_id(ctx));
+        let payment = coin::mint_for_testing<IOTA>(20_000, ctx);
+
+        royalty_rule::pay(&mut policy, &mut request, payment);
+        policy::confirm_request(&mut policy, request);
+        assert!(test::wrapup(policy, cap, ctx) == 20_000, 1);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = kiosk::royalty_rule::EIncorrectArgument)]
+    fun test_incorrect_config() {
+        let ctx = &mut ctx();
+        let (policy, cap) = test::prepare(ctx);
+
+        royalty_rule::add(&mut policy, &cap, 11_000, 0);
+        test::wrapup(policy, cap, ctx);
+    }
+
+    #[test]
+    #[expected_failure(abort_code = kiosk::royalty_rule::EInsufficientAmount)]
+    fun test_insufficient_amount() {
+        let ctx = &mut ctx();
+        let (policy, cap) = test::prepare(ctx);
+
+        // 1% royalty
+        royalty_rule::add(&mut policy, &cap, 100, 0);
+
+        // Requires 1_000 nano, coin has only 999
+        let request = policy::new_request(test::fresh_id(ctx), 100_000, test::fresh_id(ctx));
+        let payment = coin::mint_for_testing<IOTA>(999, ctx);
+
+        royalty_rule::pay(&mut policy, &mut request, payment);
+        policy::confirm_request(&mut policy, request);
+        test::wrapup(policy, cap, ctx);
+    }
+}
diff --git a/narwhal/.clippy.toml b/narwhal/.clippy.toml
deleted file mode 100644
index 2ca07227b4b..00000000000
--- a/narwhal/.clippy.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-# cyclomatic complexity is not always useful
-cognitive-complexity-threshold = 100
-# types are used for safety encoding
-type-complexity-threshold = 10000
-# big constructors
-too-many-arguments-threshold = 20
-
-disallowed-methods = [
-  { path = "anyhow", reason = "we prefer to use eyre" },
-  # we use tracing with the log feature instead of the log crate.
-  { path = "log::info", reason = "use tracing::info instead" },
-  { path = "log::debug", reason = "use tracing::debug instead" },
-  { path = "log::error", reason = "use tracing::error instead" },
-  { path = "log::warn", reason = "use tracing::warn instead" },
-  # known to cause blocking issues
-  { path = "futures::executor::block_on", reason = "use tokio::runtime::runtime::Runtime::block_on instead" },
-  # unbounded channels are for expert use only
-  { path = "tokio::sync::mpsc::unbounded_channel", reason = "use a bounded channel instead" },
-  { path = "futures::channel::mpsc::unbounded", reason = "use a bounded channel instead" },
-  { path = "futures_channel::mpsc::unbounded", reason = "use a bounded channel instead" },
-]
diff --git a/narwhal/.dockerignore b/narwhal/.dockerignore
deleted file mode 100644
index 6548d10bce0..00000000000
--- a/narwhal/.dockerignore
+++ /dev/null
@@ -1,7 +0,0 @@
-# Exclude directories from getting copied
-# to the Docker image once built.
-.cargo
-.github
-.idea
-target
-benchmark
\ No newline at end of file
diff --git a/narwhal/.gitignore b/narwhal/.gitignore
deleted file mode 100644
index aa393c3d5e0..00000000000
--- a/narwhal/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-*.json
-*.python-version
-!Docker/**/*.json
-Docker/validators/**/db-*
-Docker/validators/**/logs*
-.DS_Store
-.storage_*
-.*storage*
-.venv/
-.idea/*
-rust/.idea/*
-.db-*
-benchmark/db-*
-
-target/
-!/**/src/**/target/
-.test_*
-
-# Configuration for pre-commit / Git precommit hook.
-.pre-commit*
-
-# Generated by Cargo
-# will have compiled files and executables
-/target/
-
-workspace.xml
-
-# These are backup files generated by rustfmt
-**/*.rs.bk
-scripts/build_and_fab
-./justfile
-crypto/proptest-regressions/tests/secp256k1_tests.txt
diff --git a/narwhal/.lycheeignore b/narwhal/.lycheeignore
deleted file mode 100644
index 04cb90d6b56..00000000000
--- a/narwhal/.lycheeignore
+++ /dev/null
@@ -1,2 +0,0 @@
-file://.*
-http://localhost.*
diff --git a/narwhal/CONTRIBUTING.md b/narwhal/CONTRIBUTING.md
deleted file mode 100644
index 8be31890519..00000000000
--- a/narwhal/CONTRIBUTING.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Contributing to Narwhal / Bullshark
-
-We want to make contributions as easy and transparent as possible.
-
-## Pull Requests
-
-We actively welcome your pull requests.
-
-1. Fork the source repo and create your branch from `main`.
-2. If you've added code that should be tested, add tests.
-3. If you've changed APIs, update the documentation.
-4. Ensure the test suite passes
-5. Make sure your code lints
-
-## Run the linter
-
-The codebase uses the [Clippy](https://github.com/rust-lang/rust-clippy) linter
-to ensure that common mistakes are caught. To install follow the instructions
-on the Clippy repository. We make use of a cargo alias (defined in
-.cargo/config) which sets some project-wide lints. To run the linter locally
-you can use the following command:
-
-```
-cargo ci-clippy
-```
-
-## Run the formatter
-
-To ensure that the codebase is following standard formatting properties, we use
-[Rustfmt](https://github.com/rust-lang/rustfmt). To run the formatter locally
-you can use the follow command:
-
-```
-cargo fmt --all
-```
-
-The above command will format and apply the changes directly. If you want to just
-see the formatter recommendations, just run with the `--check` property:
-
-```
-cargo fmt --all -- --check
-```
-
-## Generating builders
-
-The [derive_builder](https://crates.io/crates/derive_builder) crate has been used to
-auto-generate builders (following the [builder design pattern](https://en.wikipedia.org/wiki/Builder_pattern)) for structs. Instead of having to write (lots) of boilerplate
-code to create a builder, this is offered by the derive_builder and is the recommended
-way to create builders for this repo. Examples can be found within the repo and on the
-crate docs as well.
-
-## Testing
-
-One thing to note is that Narwhal uses snapshot testing for configs. See the beginning of the file
-[config/tests/config_tests.rs](config/tests/config_tests.rs) for background and instructions if your PR breaks the test.
-
-## Issues
-
-We use GitHub issues to track public bugs. Please ensure your description is
-clear and has sufficient instructions to be able to reproduce the issue.
-
-## License
-
-By contributing, you agree that your contributions will be licensed
-under the LICENSE file in the root directory of this source tree.
diff --git a/narwhal/README.md b/narwhal/README.md
deleted file mode 100644
index 93b540d2e1c..00000000000
--- a/narwhal/README.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Narwhal and Consensus
-
-This directory provides an implementation of [Narwhal](https://arxiv.org/pdf/2105.11827.pdf) and [partially synchronous Bullshark](https://arxiv.org/pdf/2209.05633.pdf), a [DAG](https://en.wikipedia.org/wiki/Directed_acyclic_graph)-based mempool and efficient [BFT](https://en.wikipedia.org/wiki/Byzantine_fault) consensus. The codebase has been designed to be small, efficient, and easy to benchmark and modify.
-
-This directory uses [fastcrypto](https://github.com/MystenLabs/fastcrypto) as its cryptography library.
-
-## Quick Start
-
-The core protocols are written in Rust, but all benchmarking scripts are written in Python and run with [Fabric](http://www.fabfile.org/).
-To deploy and benchmark a testbed of four nodes on your local machine, clone the Iota repo and install the python dependencies:
-
-```
-$ git clone https://github.com/iotaledger/iota.git
-$ cd iota/narwhal/benchmark
-$ pip install -r requirements.txt
-```
-
-You also need to install [Clang](https://clang.llvm.org/) (required by RocksDB) and [tmux](https://linuxize.com/post/getting-started-with-tmux/#installing-tmux) (which runs all nodes and clients in the background). Finally, run a local benchmark using [Fabric](http://www.fabfile.org/):
-
-```
-$ fab local
-```
-
-This command may take a long time the first time you run it (compiling rust code in `release` mode may be slow), and you can customize a number of benchmark parameters in [fabfile.py](https://github.com/iotaledger/iota/blob/main/narwhal/benchmark/fabfile.py). When the benchmark terminates, it displays a summary of the execution similarly to the one below.
-
-```
------------------------------------------
- SUMMARY:
------------------------------------------
- + CONFIG:
- Faults: 0 node(s)
- Committee size: 4 node(s)
- Worker(s) per node: 1 worker(s)
- Collocate primary and workers: True
- Input rate: 50,000 tx/s
- Transaction size: 512 B
- Execution time: 19 s
-
- Header size: 1,000 B
- Max header delay: 100 ms
- GC depth: 50 round(s)
- Sync retry delay: 10,000 ms
- Sync retry nodes: 3 node(s)
- batch size: 500,000 B
- Max batch delay: 100 ms
-
- + RESULTS:
- Consensus TPS: 46,478 tx/s
- Consensus BPS: 23,796,531 B/s
- Consensus latency: 464 ms
-
- End-to-end TPS: 46,149 tx/s
- End-to-end BPS: 23,628,541 B/s
- End-to-end latency: 557 ms
------------------------------------------
-```
-
-## Next Steps
-
-The next step is to read the paper [Narwhal and Tusk: A DAG-based Mempool and Efficient BFT Consensus](https://arxiv.org/pdf/2105.11827.pdf) and [Bullshark: The Partially Synchronous Version](https://arxiv.org/pdf/2209.05633.pdf). It is then recommended to have a look at the README files of the [worker](worker) and [primary](primary) crates. An additional resource to better understand the Tusk consensus protocol is the paper [All You Need is DAG](https://arxiv.org/abs/2102.08325) as it describes a similar protocol.
-
-The README file of the [benchmark folder](benchmark) explains how to benchmark the codebase and read benchmarks' results. It also provides a step-by-step tutorial to run benchmarks on [Amazon Web Services (AWS)](https://aws.amazon.com) across multiple data centers (WAN).
diff --git a/narwhal/config/Cargo.toml b/narwhal/config/Cargo.toml
deleted file mode 100644
index e4739ddf598..00000000000
--- a/narwhal/config/Cargo.toml
+++ /dev/null
@@ -1,31 +0,0 @@
-[package]
-name = "narwhal-config"
-version = "0.1.0"
-authors = ["IOTA Foundation <info@iota.org>"]
-edition = "2021"
-license = "Apache-2.0"
-publish = false
-
-[dependencies]
-# external dependencies
-fastcrypto.workspace = true
-match_opt = "0.1"
-rand.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-thiserror.workspace = true
-tracing.workspace = true
-
-# internal dependencies
-crypto = { path = "../crypto", package = "narwhal-crypto" }
-iota-network-stack.workspace = true
-iota-util-mem.workspace = true
-
-[dev-dependencies]
-# external dependencies
-insta.workspace = true
-rand.workspace = true
-tempfile.workspace = true
-
-# internal dependencies
-test-utils = { path = "../test-utils", package = "narwhal-test-utils" }
diff --git a/narwhal/config/src/committee.rs b/narwhal/config/src/committee.rs
deleted file mode 100644
index fa8da22ef90..00000000000
--- a/narwhal/config/src/committee.rs
+++ /dev/null
@@ -1,501 +0,0 @@
-// Copyright (c) 2021, Facebook, Inc. and its affiliates
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-use std::{
-    collections::{BTreeMap, HashSet},
-    fmt::{Display, Formatter},
-    num::NonZeroU64,
-};
-
-use crypto::{NetworkPublicKey, PublicKey, PublicKeyBytes};
-use fastcrypto::traits::EncodeDecodeBase64;
-use iota_network_stack::Multiaddr;
-use iota_util_mem::MallocSizeOf;
-use rand::{SeedableRng, rngs::StdRng, seq::SliceRandom};
-use serde::{Deserialize, Serialize};
-
-use crate::{Epoch, Stake};
-
-#[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct Authority {
-    /// The id under which we identify this authority across Narwhal
-    #[serde(skip)]
-    id: AuthorityIdentifier,
-    /// The authority's main PublicKey which is used to verify the content they
-    /// sign.
-    protocol_key: PublicKey,
-    /// The authority's main PublicKey expressed as pure bytes
-    protocol_key_bytes: PublicKeyBytes,
-    /// The voting power of this authority.
-    stake: Stake,
-    /// The network address of the primary.
-    primary_address: Multiaddr,
-    /// Network key of the primary.
-    network_key: NetworkPublicKey,
-    /// The validator's hostname
-    hostname: String,
-    /// There are secondary indexes that should be initialised before we are
-    /// ready to use the authority - this bool protect us for premature use.
-    #[serde(skip)]
-    initialised: bool,
-}
-
-impl Authority {
-    /// The constructor is not public by design. Everyone who wants to create
-    /// authorities should do it via Committee (more specifically can use
-    /// CommitteeBuilder). As some internal properties of Authority are
-    /// initialised via the Committee, to ensure that the user will not
-    /// accidentally use stale Authority data, should always derive them via
-    /// the Committee.
-    fn new(
-        protocol_key: PublicKey,
-        stake: Stake,
-        primary_address: Multiaddr,
-        network_key: NetworkPublicKey,
-        hostname: String,
-    ) -> Self {
-        let protocol_key_bytes = PublicKeyBytes::from(&protocol_key);
-
-        Self {
-            id: Default::default(),
-            protocol_key,
-            protocol_key_bytes,
-            stake,
-            primary_address,
-            network_key,
-            hostname,
-            initialised: false,
-        }
-    }
-
-    fn initialise(&mut self, id: AuthorityIdentifier) {
-        self.id = id;
-        self.initialised = true;
-    }
-
-    pub fn id(&self) -> AuthorityIdentifier {
-        assert!(self.initialised);
-        self.id
-    }
-
-    pub fn protocol_key(&self) -> &PublicKey {
-        assert!(self.initialised);
-        &self.protocol_key
-    }
-
-    pub fn protocol_key_bytes(&self) -> &PublicKeyBytes {
-        assert!(self.initialised);
-        &self.protocol_key_bytes
-    }
-
-    pub fn stake(&self) -> Stake {
-        assert!(self.initialised);
-        self.stake
-    }
-
-    pub fn primary_address(&self) -> Multiaddr {
-        assert!(self.initialised);
-        self.primary_address.clone()
-    }
-
-    pub fn network_key(&self) -> NetworkPublicKey {
-        assert!(self.initialised);
-        self.network_key.clone()
-    }
-
-    pub fn hostname(&self) -> &str {
-        assert!(self.initialised);
-        self.hostname.as_str()
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
-pub struct Committee {
-    /// The authorities of epoch.
-    authorities: BTreeMap<PublicKey, Authority>,
-    /// Keeps and index of the Authorities by their respective identifier
-    #[serde(skip)]
-    authorities_by_id: BTreeMap<AuthorityIdentifier, Authority>,
-    /// The epoch number of this committee
-    epoch: Epoch,
-    /// The quorum threshold (2f+1)
-    #[serde(skip)]
-    quorum_threshold: Stake,
-    /// The validity threshold (f+1)
-    #[serde(skip)]
-    validity_threshold: Stake,
-}
-
-// Every authority gets uniquely identified by the AuthorityIdentifier
-// The type can be easily swapped without needing to change anything else in the
-// implementation.
-#[derive(
-    Eq,
-    PartialEq,
-    Ord,
-    PartialOrd,
-    Clone,
-    Copy,
-    Debug,
-    Default,
-    Hash,
-    Serialize,
-    Deserialize,
-    MallocSizeOf,
-)]
-pub struct AuthorityIdentifier(pub u16);
-
-impl Display for AuthorityIdentifier {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.write_str(self.0.to_string().as_str())
-    }
-}
-
-impl Committee {
-    pub const DEFAULT_FILENAME: &'static str = "committee.json";
-
-    /// Any committee should be created via the CommitteeBuilder - this is
-    /// intentionally be marked as private method.
-    fn new(authorities: BTreeMap<PublicKey, Authority>, epoch: Epoch) -> Self {
-        let mut committee = Self {
-            authorities,
-            epoch,
-            authorities_by_id: Default::default(),
-            validity_threshold: 0,
-            quorum_threshold: 0,
-        };
-        committee.load();
-
-        // Some sanity checks to ensure that we'll not end up in invalid state
-        assert_eq!(
-            committee.authorities_by_id.len(),
-            committee.authorities.len()
-        );
-
-        assert_eq!(
-            committee.validity_threshold,
-            committee.calculate_validity_threshold().get()
-        );
-        assert_eq!(
-            committee.quorum_threshold,
-            committee.calculate_quorum_threshold().get()
-        );
-
-        // ensure all the authorities are ordered in incremented manner with their ids -
-        // just some extra confirmation here.
-        for (index, (_, authority)) in committee.authorities.iter().enumerate() {
-            assert_eq!(index as u16, authority.id.0);
-        }
-
-        committee
-    }
-
-    fn calculate_quorum_threshold(&self) -> NonZeroU64 {
-        // If N = 3f + 1 + k (0 <= k < 3)
-        // then (2 N + 3) / 3 = 2f + 1 + (2k + 2)/3 = 2f + 1 + k = N - f
-        let total_votes: Stake = self.total_stake();
-        NonZeroU64::new(2 * total_votes / 3 + 1).unwrap()
-    }
-
-    fn calculate_validity_threshold(&self) -> NonZeroU64 {
-        // If N = 3f + 1 + k (0 <= k < 3)
-        // then (N + 2) / 3 = f + 1 + k/3 = f + 1
-        let total_votes: Stake = self.total_stake();
-        NonZeroU64::new((total_votes + 2) / 3).unwrap()
-    }
-
-    /// Updates the committee internal secondary indexes.
-    pub fn load(&mut self) {
-        self.authorities_by_id = (0_u16..)
-            .zip(self.authorities.iter_mut())
-            .map(|(identifier, (_key, authority))| {
-                let id = AuthorityIdentifier(identifier);
-                authority.initialise(id);
-
-                (id, authority.clone())
-            })
-            .collect();
-
-        self.validity_threshold = self.calculate_validity_threshold().get();
-        self.quorum_threshold = self.calculate_quorum_threshold().get();
-    }
-
-    /// Returns the current epoch.
-    pub fn epoch(&self) -> Epoch {
-        self.epoch
-    }
-
-    /// Provided an identifier it returns the corresponding authority
-    pub fn authority(&self, identifier: &AuthorityIdentifier) -> Option<&Authority> {
-        self.authorities_by_id.get(identifier)
-    }
-
-    /// Provided an identifier it returns the corresponding authority - if is
-    /// not found then it panics
-    pub fn authority_safe(&self, identifier: &AuthorityIdentifier) -> &Authority {
-        self.authorities_by_id.get(identifier).unwrap_or_else(|| {
-            panic!(
-                "Authority with id {:?} should have been in committee",
-                identifier
-            )
-        })
-    }
-
-    pub fn authority_by_key(&self, key: &PublicKey) -> Option<&Authority> {
-        self.authorities.get(key)
-    }
-
-    /// Returns the keys in the committee
-    pub fn keys(&self) -> Vec<PublicKey> {
-        self.authorities.keys().cloned().collect::<Vec<PublicKey>>()
-    }
-
-    pub fn authorities(&self) -> impl Iterator<Item = &Authority> {
-        self.authorities.values()
-    }
-
-    pub fn authority_by_network_key(&self, network_key: &NetworkPublicKey) -> Option<&Authority> {
-        self.authorities
-            .iter()
-            .find(|(_, authority)| authority.network_key == *network_key)
-            .map(|(_, authority)| authority)
-    }
-
-    /// Returns the number of authorities.
-    pub fn size(&self) -> usize {
-        self.authorities.len()
-    }
-
-    /// Return the stake of a specific authority.
-    pub fn stake(&self, name: &PublicKey) -> Stake {
-        self.authorities
-            .get(&name.clone())
-            .map_or_else(|| 0, |x| x.stake)
-    }
-
-    pub fn stake_by_id(&self, id: AuthorityIdentifier) -> Stake {
-        self.authorities_by_id
-            .get(&id)
-            .map_or_else(|| 0, |authority| authority.stake)
-    }
-
-    /// Returns the stake required to reach a quorum (2f+1).
-    pub fn quorum_threshold(&self) -> Stake {
-        self.quorum_threshold
-    }
-
-    /// Returns the stake required to reach availability (f+1).
-    pub fn validity_threshold(&self) -> Stake {
-        self.validity_threshold
-    }
-
-    /// Returns true if the provided stake has reached quorum (2f+1)
-    pub fn reached_quorum(&self, stake: Stake) -> bool {
-        stake >= self.quorum_threshold()
-    }
-
-    /// Returns true if the provided stake has reached availability (f+1)
-    pub fn reached_validity(&self, stake: Stake) -> bool {
-        stake >= self.validity_threshold()
-    }
-
-    pub fn total_stake(&self) -> Stake {
-        self.authorities.values().map(|x| x.stake).sum()
-    }
-
-    /// Returns a leader node as a weighted choice seeded by the provided
-    /// integer
-    pub fn leader(&self, seed: u64) -> Authority {
-        let mut seed_bytes = [0u8; 32];
-        seed_bytes[32 - 8..].copy_from_slice(&seed.to_le_bytes());
-        let mut rng = StdRng::from_seed(seed_bytes);
-        let choices = self
-            .authorities
-            .values()
-            .map(|authority| (authority.clone(), authority.stake as f32))
-            .collect::<Vec<_>>();
-        choices
-            .choose_weighted(&mut rng, |item| item.1)
-            .expect("Weighted choice error: stake values incorrect!")
-            .0
-            .clone()
-    }
-
-    /// Return all the network addresses in the committee.
-    pub fn others_primaries(
-        &self,
-        myself: &PublicKey,
-    ) -> Vec<(PublicKey, Multiaddr, NetworkPublicKey)> {
-        self.authorities
-            .iter()
-            .filter(|(name, _)| *name != myself)
-            .map(|(name, authority)| {
-                (
-                    name.clone(),
-                    authority.primary_address.clone(),
-                    authority.network_key.clone(),
-                )
-            })
-            .collect()
-    }
-
-    /// Return all the network addresses in the committee.
-    pub fn others_primaries_by_id(
-        &self,
-        myself: AuthorityIdentifier,
-    ) -> Vec<(AuthorityIdentifier, Multiaddr, NetworkPublicKey)> {
-        self.authorities
-            .iter()
-            .filter(|(_, authority)| authority.id() != myself)
-            .map(|(_, authority)| {
-                (
-                    authority.id(),
-                    authority.primary_address(),
-                    authority.network_key(),
-                )
-            })
-            .collect()
-    }
-
-    fn get_all_network_addresses(&self) -> HashSet<&Multiaddr> {
-        self.authorities
-            .values()
-            .map(|authority| &authority.primary_address)
-            .collect()
-    }
-
-    /// Return the network addresses that are present in the current committee
-    /// but that are absent from the new committee (provided as argument).
-    pub fn network_diff<'a>(&'a self, other: &'a Self) -> HashSet<&Multiaddr> {
-        self.get_all_network_addresses()
-            .difference(&other.get_all_network_addresses())
-            .cloned()
-            .collect()
-    }
-
-    /// Used for testing - not recommended to use for any other case.
-    /// It creates a new instance with updated epoch
-    pub fn advance_epoch(&self, new_epoch: Epoch) -> Committee {
-        Committee::new(self.authorities.clone(), new_epoch)
-    }
-}
-
-pub struct CommitteeBuilder {
-    epoch: Epoch,
-    authorities: BTreeMap<PublicKey, Authority>,
-}
-
-impl CommitteeBuilder {
-    pub fn new(epoch: Epoch) -> Self {
-        Self {
-            epoch,
-            authorities: BTreeMap::new(),
-        }
-    }
-
-    pub fn add_authority(
-        mut self,
-        protocol_key: PublicKey,
-        stake: Stake,
-        primary_address: Multiaddr,
-        network_key: NetworkPublicKey,
-        hostname: String,
-    ) -> Self {
-        let authority = Authority::new(
-            protocol_key.clone(),
-            stake,
-            primary_address,
-            network_key,
-            hostname,
-        );
-        self.authorities.insert(protocol_key, authority);
-        self
-    }
-
-    pub fn build(self) -> Committee {
-        Committee::new(self.authorities, self.epoch)
-    }
-}
-
-impl std::fmt::Display for Committee {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "Committee E{}: {:?}",
-            self.epoch(),
-            self.authorities
-                .keys()
-                .map(|x| {
-                    if let Some(k) = x.encode_base64().get(0..16) {
-                        k.to_owned()
-                    } else {
-                        format!("Invalid key: {}", x)
-                    }
-                })
-                .collect::<Vec<_>>()
-        )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::BTreeMap;
-
-    use crypto::{KeyPair, NetworkKeyPair, PublicKey};
-    use fastcrypto::traits::KeyPair as _;
-    use iota_network_stack::Multiaddr;
-    use rand::thread_rng;
-
-    use crate::{Authority, Committee};
-
-    #[test]
-    fn committee_load() {
-        // GIVEN
-        let mut rng = thread_rng();
-        let num_of_authorities = 10;
-
-        let authorities = (0..num_of_authorities)
-            .map(|i| {
-                let keypair = KeyPair::generate(&mut rng);
-                let network_keypair = NetworkKeyPair::generate(&mut rng);
-
-                let a = Authority::new(
-                    keypair.public().clone(),
-                    1,
-                    Multiaddr::empty(),
-                    network_keypair.public().clone(),
-                    i.to_string(),
-                );
-
-                (keypair.public().clone(), a)
-            })
-            .collect::<BTreeMap<PublicKey, Authority>>();
-
-        // WHEN
-        let committee = Committee::new(authorities, 10);
-
-        // THEN
-        assert_eq!(committee.authorities_by_id.len() as u64, num_of_authorities);
-
-        for (identifier, authority) in committee.authorities_by_id.iter() {
-            assert_eq!(*identifier, authority.id());
-        }
-
-        // AND ensure thresholds are calculated correctly
-        assert_eq!(committee.quorum_threshold(), 7);
-        assert_eq!(committee.validity_threshold(), 4);
-
-        // AND ensure authorities are returned in the same order
-        for ((id, authority_1), (public_key, authority_2)) in committee
-            .authorities_by_id
-            .iter()
-            .zip(committee.authorities)
-        {
-            assert_eq!(authority_1.clone(), authority_2);
-            assert_eq!(*id, authority_2.id());
-            assert_eq!(&public_key, authority_1.protocol_key());
-        }
-    }
-}
diff --git a/narwhal/config/src/lib.rs b/narwhal/config/src/lib.rs
deleted file mode 100644
index 00634c57fd9..00000000000
--- a/narwhal/config/src/lib.rs
+++ /dev/null
@@ -1,290 +0,0 @@
-// Copyright (c) 2021, Facebook, Inc. and its affiliates
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-#![warn(
-    future_incompatible,
-    nonstandard_style,
-    rust_2018_idioms,
-    rust_2021_compatibility
-)]
-#![allow(clippy::mutable_key_type)]
-
-use std::{
-    collections::{BTreeMap, HashSet},
-    fs::{self, OpenOptions},
-    io::{BufWriter, Write as _},
-    num::NonZeroU32,
-};
-
-use crypto::{NetworkPublicKey, PublicKey};
-use fastcrypto::traits::EncodeDecodeBase64;
-use iota_network_stack::Multiaddr;
-use serde::{Deserialize, Serialize, de::DeserializeOwned};
-use thiserror::Error;
-
-pub mod committee;
-pub use committee::*;
-pub mod utils;
-
-/// The epoch number.
-pub type Epoch = u64;
-
-#[derive(Error, Debug)]
-pub enum ConfigError {
-    #[error("Node {0} is not in the committee")]
-    NotInCommittee(String),
-
-    #[error("Node {0} is not in the worker cache")]
-    NotInWorkerCache(String),
-
-    #[error("Unknown worker id {0}")]
-    UnknownWorker(WorkerId),
-
-    #[error("Failed to read config file '{file}': {message}")]
-    ImportError { file: String, message: String },
-
-    #[error("Failed to write config file '{file}': {message}")]
-    ExportError { file: String, message: String },
-}
-
-pub trait Import: DeserializeOwned {
-    fn import(path: &str) -> Result<Self, ConfigError> {
-        let reader = || -> Result<Self, std::io::Error> {
-            let data = fs::read(path)?;
-            Ok(serde_json::from_slice(data.as_slice())?)
-        };
-        reader().map_err(|e| ConfigError::ImportError {
-            file: path.to_string(),
-            message: e.to_string(),
-        })
-    }
-}
-
-impl<D: DeserializeOwned> Import for D {}
-
-pub trait Export: Serialize {
-    fn export(&self, path: &str) -> Result<(), ConfigError> {
-        let writer = || -> Result<(), std::io::Error> {
-            let file = OpenOptions::new()
-                .create(true)
-                .truncate(true)
-                .write(true)
-                .open(path)?;
-            let mut writer = BufWriter::new(file);
-            let data = serde_json::to_string_pretty(self).unwrap();
-            writer.write_all(data.as_ref())?;
-            writer.write_all(b"\n")?;
-            Ok(())
-        };
-        writer().map_err(|e| ConfigError::ExportError {
-            file: path.to_string(),
-            message: e.to_string(),
-        })
-    }
-}
-
-impl<S: Serialize> Export for S {}
-
-// TODO: This actually represents voting power (out of 10,000) and not amount
-// staked. Consider renaming to `VotingPower`.
-pub type Stake = u64;
-pub type WorkerId = u32;
-
-#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-pub struct AnemoParameters {
-    /// Per-peer rate-limits (in requests/sec) for the PrimaryToPrimary service.
-    pub send_certificate_rate_limit: Option<NonZeroU32>,
-
-    /// Per-peer rate-limits (in requests/sec) for the WorkerToWorker service.
-    pub report_batch_rate_limit: Option<NonZeroU32>,
-    pub request_batches_rate_limit: Option<NonZeroU32>,
-
-    /// Size in bytes above which network messages are considered excessively
-    /// large. Excessively large messages will still be handled, but logged
-    /// and reported in metrics for debugging.
-    ///
-    /// If unspecified, this will default to 8 MiB.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub excessive_message_size: Option<usize>,
-}
-
-impl AnemoParameters {
-    // By default, at most 10 certificates can be sent concurrently to a peer.
-    pub fn send_certificate_rate_limit(&self) -> u32 {
-        self.send_certificate_rate_limit
-            .unwrap_or(NonZeroU32::new(20).unwrap())
-            .get()
-    }
-
-    // By default, at most 100 batches can be broadcasted concurrently.
-    pub fn report_batch_rate_limit(&self) -> u32 {
-        self.report_batch_rate_limit
-            .unwrap_or(NonZeroU32::new(200).unwrap())
-            .get()
-    }
-
-    // As of 11/02/2023, when one worker is actively fetching, each peer receives
-    // 20~30 requests per second.
-    pub fn request_batches_rate_limit(&self) -> u32 {
-        self.request_batches_rate_limit
-            .unwrap_or(NonZeroU32::new(100).unwrap())
-            .get()
-    }
-
-    pub fn excessive_message_size(&self) -> usize {
-        const EXCESSIVE_MESSAGE_SIZE: usize = 8 << 20;
-
-        self.excessive_message_size
-            .unwrap_or(EXCESSIVE_MESSAGE_SIZE)
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize, Eq, Hash, PartialEq, Debug)]
-pub struct WorkerInfo {
-    /// The public key of this worker.
-    pub name: NetworkPublicKey,
-    /// Address to receive client transactions (WAN).
-    pub transactions: Multiaddr,
-    /// Address to receive messages from other workers (WAN) and our primary.
-    pub worker_address: Multiaddr,
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug)]
-pub struct WorkerIndex(pub BTreeMap<WorkerId, WorkerInfo>);
-
-#[derive(Clone, Serialize, Deserialize, Debug)]
-pub struct WorkerCache {
-    /// The authority to worker index.
-    pub workers: BTreeMap<PublicKey, WorkerIndex>,
-    /// The epoch number for workers
-    pub epoch: Epoch,
-}
-
-impl std::fmt::Display for WorkerIndex {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "WorkerIndex {:?}",
-            self.0
-                .iter()
-                .map(|(key, value)| { format!("{}:{:?}", key, value) })
-                .collect::<Vec<_>>()
-        )
-    }
-}
-
-impl std::fmt::Display for WorkerCache {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "WorkerCache E{}: {:?}",
-            self.epoch(),
-            self.workers
-                .iter()
-                .map(|(k, v)| {
-                    if let Some(x) = k.encode_base64().get(0..16) {
-                        format!("{}: {}", x, v)
-                    } else {
-                        format!("Invalid key: {}", k)
-                    }
-                })
-                .collect::<Vec<_>>()
-        )
-    }
-}
-
-impl WorkerCache {
-    pub const DEFAULT_FILENAME: &'static str = "workers.json";
-
-    /// Returns the current epoch.
-    pub fn epoch(&self) -> Epoch {
-        self.epoch
-    }
-
-    /// Returns the addresses of a specific worker (`id`) of a specific
-    /// authority (`to`).
-    pub fn worker(&self, to: &PublicKey, id: &WorkerId) -> Result<WorkerInfo, ConfigError> {
-        self.workers
-            .iter()
-            .find_map(|v| match_opt::match_opt!(v, (name, authority) if name == to => authority))
-            .ok_or_else(|| {
-                ConfigError::NotInWorkerCache(ToString::to_string(&(*to).encode_base64()))
-            })?
-            .0
-            .iter()
-            .find(|(worker_id, _)| worker_id == &id)
-            .map(|(_, worker)| worker.clone())
-            .ok_or_else(|| ConfigError::NotInWorkerCache((*to).encode_base64()))
-    }
-
-    /// Returns the addresses of all our workers.
-    pub fn our_workers(&self, myself: &PublicKey) -> Result<Vec<WorkerInfo>, ConfigError> {
-        let res = self
-            .workers
-            .iter()
-            .find_map(
-                |v| match_opt::match_opt!(v, (name, authority) if name == myself => authority),
-            )
-            .ok_or_else(|| ConfigError::NotInWorkerCache((*myself).encode_base64()))?
-            .0
-            .values()
-            .cloned()
-            .collect();
-        Ok(res)
-    }
-
-    /// Returns the addresses of all known workers.
-    pub fn all_workers(&self) -> Vec<(NetworkPublicKey, Multiaddr)> {
-        self.workers
-            .iter()
-            .flat_map(|(_, w)| {
-                w.0.values()
-                    .map(|w| (w.name.clone(), w.worker_address.clone()))
-            })
-            .collect()
-    }
-
-    /// Returns the addresses of all workers with a specific id except the ones
-    /// of the authority specified by `myself`.
-    pub fn others_workers_by_id(
-        &self,
-        myself: &PublicKey,
-        id: &WorkerId,
-    ) -> Vec<(PublicKey, WorkerInfo)> {
-        self.workers
-            .iter()
-            .filter(|(name, _)| *name != myself )
-            .flat_map(
-                |(name, authority)|  authority.0.iter().flat_map(
-                    |v| match_opt::match_opt!(v,(worker_id, addresses) if worker_id == id => (name.clone(), addresses.clone()))))
-            .collect()
-    }
-
-    /// Returns the addresses of all workers that are not of our node.
-    pub fn others_workers(&self, myself: &PublicKey) -> Vec<(PublicKey, WorkerInfo)> {
-        self.workers
-            .iter()
-            .filter(|(name, _)| *name != myself)
-            .flat_map(|(name, authority)| authority.0.iter().map(|v| (name.clone(), v.1.clone())))
-            .collect()
-    }
-
-    /// Return the network addresses that are present in the current worker
-    /// cache that are from a primary key that are no longer in the
-    /// committee. Current committee keys provided as an argument.
-    pub fn network_diff(&self, keys: Vec<&PublicKey>) -> HashSet<&Multiaddr> {
-        self.workers
-            .iter()
-            .filter(|(name, _)| !keys.contains(name))
-            .flat_map(|(_, authority)| {
-                authority
-                    .0
-                    .values()
-                    .map(|address| &address.transactions)
-                    .chain(authority.0.values().map(|address| &address.worker_address))
-            })
-            .collect()
-    }
-}
diff --git a/narwhal/config/src/utils.rs b/narwhal/config/src/utils.rs
deleted file mode 100644
index 51cd8444bff..00000000000
--- a/narwhal/config/src/utils.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-use std::net::{TcpListener, TcpStream};
-
-/// Return an ephemeral, available port. On unix systems, the port returned will
-/// be in the TIME_WAIT state ensuring that the OS won't hand out this port for
-/// some grace period. Callers should be able to bind to this port given they
-/// use SO_REUSEADDR.
-pub fn get_available_port(host: &str) -> u16 {
-    const MAX_PORT_RETRIES: u32 = 1000;
-
-    for _ in 0..MAX_PORT_RETRIES {
-        if let Ok(port) = get_ephemeral_port(host) {
-            return port;
-        }
-    }
-
-    panic!("Error: could not find an available port");
-}
-
-fn get_ephemeral_port(host: &str) -> std::io::Result<u16> {
-    // Request a random available port from the OS
-    let listener = TcpListener::bind((host, 0))?;
-    let addr = listener.local_addr()?;
-
-    // Create and accept a connection (which we'll promptly drop) in order to force
-    // the port into the TIME_WAIT state, ensuring that the port will be
-    // reserved from some limited amount of time (roughly 60s on some Linux
-    // systems)
-    let _sender = TcpStream::connect(addr)?;
-    let _incoming = listener.accept()?;
-
-    Ok(addr.port())
-}
diff --git a/narwhal/config/tests/config_tests.rs b/narwhal/config/tests/config_tests.rs
deleted file mode 100644
index 433c8cb7774..00000000000
--- a/narwhal/config/tests/config_tests.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-#![allow(clippy::mutable_key_type)]
-
-// This file contains tests that detect changes in Narwhal configs and
-// parameters. If a PR breaks one or more tests here, the PR probably has a real
-// impact on a Narwhal configuration file. When test failure happens, the PR
-// should be marked as a breaking change and reviewers should be aware of this.
-//
-// Owners and operators of production configuration files can add themselves to
-// .github/CODEOWNERS for the corresponding snapshot tests, so they can get
-// notified of changes. PRs that modifies snapshot files should wait for reviews
-// from code owners (if any) before merging.
-//
-// To review snapshot changes, and fix snapshot differences,
-// 0. Install cargo-insta
-// 1. Run `cargo insta test --review` under `./config`.
-// 2. Review, accept or reject changes.
-
-use std::collections::HashMap;
-
-use insta::assert_json_snapshot;
-use rand::{SeedableRng, rngs::StdRng};
-use test_utils::CommitteeFixture;
-
-#[test]
-fn leader_election_rotates_through_all() {
-    // this committee has equi-sized stakes
-    let fixture = CommitteeFixture::builder().build();
-    let committee = fixture.committee();
-    let mut leader_counts = HashMap::new();
-    // We most probably will only call `leader` on even rounds, so let's check this
-    // still lets us use the whole roster of leaders.
-    let mut leader_counts_stepping_by_2 = HashMap::new();
-    for i in 0..100 {
-        let leader = committee.leader(i);
-        let leader_id = leader.id();
-
-        let leader_stepping_by_2 = committee.leader(i * 2);
-        let leader_steeping_by_2_id = leader_stepping_by_2.id();
-
-        *leader_counts.entry(leader_id).or_insert(0) += 1;
-        *leader_counts_stepping_by_2
-            .entry(leader_steeping_by_2_id)
-            .or_insert(0) += 1;
-    }
-    assert!(leader_counts.values().all(|v| *v >= 20));
-    assert!(leader_counts_stepping_by_2.values().all(|v| *v >= 20));
-}
-
-#[test]
-fn commmittee_snapshot_matches() {
-    // The shape of this configuration is load-bearing in the NW benchmarks,
-    // and in Iota (prod)
-    let rng = StdRng::from_seed([0; 32]);
-    let fixture = CommitteeFixture::builder().rng(rng).build();
-    let committee = fixture.committee();
-
-    // we need authorities to be serialized in order
-    let mut settings = insta::Settings::clone_current();
-    settings.set_sort_maps(true);
-    settings.bind(|| assert_json_snapshot!("committee", committee));
-}
-
-#[test]
-fn workers_snapshot_matches() {
-    // The shape of this configuration is load-bearing in the NW benchmarks,
-    // and in Iota (prod)
-    let rng = StdRng::from_seed([0; 32]);
-    let fixture = CommitteeFixture::builder().rng(rng).build();
-    let worker_cache = fixture.worker_cache();
-
-    // we need authorities to be serialized in order
-    let mut settings = insta::Settings::clone_current();
-    settings.set_sort_maps(true);
-    settings.bind(|| assert_json_snapshot!("worker_cache", worker_cache));
-}
diff --git a/narwhal/config/tests/snapshots/config_tests__committee.snap b/narwhal/config/tests/snapshots/config_tests__committee.snap
deleted file mode 100644
index 41923e59baf..00000000000
--- a/narwhal/config/tests/snapshots/config_tests__committee.snap
+++ /dev/null
@@ -1,41 +0,0 @@
----
-source: narwhal/config/tests/config_tests.rs
-expression: committee
----
-{
-  "authorities": {
-    "ku8PylNwBUMzkshpDSeMnbV25O8rPkUFDPcqAyeEXztH02eOq6WemzFMEsi1p0LrBvKBvTLpwLwHhkCatYptihcO75iZRjtFkYwkAlv0GmQQyHZ+xO+UYweLQiYdFHtf": {
-      "protocol_key": "ku8PylNwBUMzkshpDSeMnbV25O8rPkUFDPcqAyeEXztH02eOq6WemzFMEsi1p0LrBvKBvTLpwLwHhkCatYptihcO75iZRjtFkYwkAlv0GmQQyHZ+xO+UYweLQiYdFHtf",
-      "protocol_key_bytes": "ku8PylNwBUMzkshpDSeMnbV25O8rPkUFDPcqAyeEXztH02eOq6WemzFMEsi1p0LrBvKBvTLpwLwHhkCatYptihcO75iZRjtFkYwkAlv0GmQQyHZ+xO+UYweLQiYdFHtf",
-      "stake": 1,
-      "primary_address": "/ip4/127.0.0.1/udp/0",
-      "network_key": "Zm3+Rl2weh6VsEmVBAALZ9Pk1yOf+nHpT8LsI1l/0q8=",
-      "hostname": "/ip4/127.0.0.1/udp/0"
-    },
-    "mfJe9h+AMrkUY2RgmCxcxvE07x3a52ZX8sv+wev8jQlzdAgN9vzw3Li8Sw2OCvXYDrv/K0xZn1T0LWMS38MUJ2B4wcw0fru+xRmL4lhRPzhrkw0CwnSagD4jMJVevRoQ": {
-      "protocol_key": "mfJe9h+AMrkUY2RgmCxcxvE07x3a52ZX8sv+wev8jQlzdAgN9vzw3Li8Sw2OCvXYDrv/K0xZn1T0LWMS38MUJ2B4wcw0fru+xRmL4lhRPzhrkw0CwnSagD4jMJVevRoQ",
-      "protocol_key_bytes": "mfJe9h+AMrkUY2RgmCxcxvE07x3a52ZX8sv+wev8jQlzdAgN9vzw3Li8Sw2OCvXYDrv/K0xZn1T0LWMS38MUJ2B4wcw0fru+xRmL4lhRPzhrkw0CwnSagD4jMJVevRoQ",
-      "stake": 1,
-      "primary_address": "/ip4/127.0.0.1/udp/0",
-      "network_key": "iRf3oG9ka0fwbVnVX9BQ3m9wisZbj4rDCF/q5oTjLU4=",
-      "hostname": "/ip4/127.0.0.1/udp/0"
-    },
-    "ofT8sYBvqkB+c/sjDYTwar96xgZbTdi/ncbet8ja9ePYhtSje59zyarNpF/ZxM1dAncK6uyr9Xv1lS7bJs+nSj2k0bMvbStf5RORLeuPwYz/yJrDOQQf4MxOnW0u8Gzo": {
-      "protocol_key": "ofT8sYBvqkB+c/sjDYTwar96xgZbTdi/ncbet8ja9ePYhtSje59zyarNpF/ZxM1dAncK6uyr9Xv1lS7bJs+nSj2k0bMvbStf5RORLeuPwYz/yJrDOQQf4MxOnW0u8Gzo",
-      "protocol_key_bytes": "ofT8sYBvqkB+c/sjDYTwar96xgZbTdi/ncbet8ja9ePYhtSje59zyarNpF/ZxM1dAncK6uyr9Xv1lS7bJs+nSj2k0bMvbStf5RORLeuPwYz/yJrDOQQf4MxOnW0u8Gzo",
-      "stake": 1,
-      "primary_address": "/ip4/127.0.0.1/udp/0",
-      "network_key": "LC/82uPqS70tgF56yNcxk5O1TD37cuMArVZDxvROh6M=",
-      "hostname": "/ip4/127.0.0.1/udp/0"
-    },
-    "q1ys+9ZU8B5aHgYbgyC5N0XQlGdq1B7xY9D8JOyT89upZpiuKRUDBsq3h/WbLtd4AvLNFNECBjlAG06r8heq7tEs6ol97VfaS2579e4b337eJAwd/y1bIt4F+LhEc3sV": {
-      "protocol_key": "q1ys+9ZU8B5aHgYbgyC5N0XQlGdq1B7xY9D8JOyT89upZpiuKRUDBsq3h/WbLtd4AvLNFNECBjlAG06r8heq7tEs6ol97VfaS2579e4b337eJAwd/y1bIt4F+LhEc3sV",
-      "protocol_key_bytes": "q1ys+9ZU8B5aHgYbgyC5N0XQlGdq1B7xY9D8JOyT89upZpiuKRUDBsq3h/WbLtd4AvLNFNECBjlAG06r8heq7tEs6ol97VfaS2579e4b337eJAwd/y1bIt4F+LhEc3sV",
-      "stake": 1,
-      "primary_address": "/ip4/127.0.0.1/udp/0",
-      "network_key": "dqJ63C6YZnD7A5GKXt7kPzZ/HzbCxobxbOy3xRXx+2U=",
-      "hostname": "/ip4/127.0.0.1/udp/0"
-    }
-  },
-  "epoch": 0
-}
diff --git a/narwhal/config/tests/snapshots/config_tests__parameters.snap b/narwhal/config/tests/snapshots/config_tests__parameters.snap
deleted file mode 100644
index 6a3213abb7f..00000000000
--- a/narwhal/config/tests/snapshots/config_tests__parameters.snap
+++ /dev/null
@@ -1,28 +0,0 @@
----
-source: narwhal/config/tests/config_tests.rs
-expression: parameters
----
-{
-  "header_num_of_batches_threshold": 32,
-  "max_header_num_of_batches": 1000,
-  "max_header_delay": "1000ms",
-  "min_header_delay": "500ms",
-  "gc_depth": 50,
-  "sync_retry_delay": "5000ms",
-  "sync_retry_nodes": 3,
-  "batch_size": 5000000,
-  "max_batch_delay": "100ms",
-  "max_concurrent_requests": 500000,
-  "prometheus_metrics": {
-    "socket_addr": "/ip4/127.0.0.1/tcp/8081/http"
-  },
-  "network_admin_server": {
-    "primary_network_admin_server_port": 1234,
-    "worker_network_admin_server_base_port": 5678
-  },
-  "anemo": {
-    "send_certificate_rate_limit": null,
-    "report_batch_rate_limit": null,
-    "request_batches_rate_limit": null
-  }
-}
diff --git a/narwhal/config/tests/snapshots/config_tests__parameters_import.snap b/narwhal/config/tests/snapshots/config_tests__parameters_import.snap
deleted file mode 100644
index 2f37b4905a0..00000000000
--- a/narwhal/config/tests/snapshots/config_tests__parameters_import.snap
+++ /dev/null
@@ -1,28 +0,0 @@
----
-source: narwhal/config/tests/config_tests.rs
-expression: params
----
-{
-  "header_num_of_batches_threshold": 32,
-  "max_header_num_of_batches": 1000,
-  "max_header_delay": "1000ms",
-  "min_header_delay": "500ms",
-  "gc_depth": 50,
-  "sync_retry_delay": "5000ms",
-  "sync_retry_nodes": 3,
-  "batch_size": 500000,
-  "max_batch_delay": "100ms",
-  "max_concurrent_requests": 500000,
-  "prometheus_metrics": {
-    "socket_addr": "/ip4/127.0.0.1/tcp/0/http"
-  },
-  "network_admin_server": {
-    "primary_network_admin_server_port": 0,
-    "worker_network_admin_server_base_port": 0
-  },
-  "anemo": {
-    "send_certificate_rate_limit": null,
-    "report_batch_rate_limit": null,
-    "request_batches_rate_limit": null
-  }
-}
diff --git a/narwhal/config/tests/snapshots/config_tests__worker_cache.snap b/narwhal/config/tests/snapshots/config_tests__worker_cache.snap
deleted file mode 100644
index e25144f9404..00000000000
--- a/narwhal/config/tests/snapshots/config_tests__worker_cache.snap
+++ /dev/null
@@ -1,97 +0,0 @@
----
-source: narwhal/config/tests/config_tests.rs
-expression: worker_cache
----
-{
-  "workers": {
-    "ku8PylNwBUMzkshpDSeMnbV25O8rPkUFDPcqAyeEXztH02eOq6WemzFMEsi1p0LrBvKBvTLpwLwHhkCatYptihcO75iZRjtFkYwkAlv0GmQQyHZ+xO+UYweLQiYdFHtf": {
-      "0": {
-        "name": "+vUstEd3Zwmk1MRBNU6KMe93it1bV/ouTWPUDuDQHOQ=",
-        "transactions": "/ip4/127.0.0.1/tcp/0/http",
-        "worker_address": "/ip4/127.0.0.1/udp/0"
-      },
-      "1": {
-        "name": "tA1h9P/tjZVdIaW52V7TMpsYevOffi+wZ52uzvqizy8=",
-        "transactions": "/ip4/127.0.0.1/tcp/0/http",
-        "worker_address": "/ip4/127.0.0.1/udp/0"
-      },
-      "2": {
-        "name": "a+K1bOynGp8UECGdYL1AKu+VboCKFzkuas1YrJv9USs=",
-        "transactions": "/ip4/127.0.0.1/tcp/0/http",
-        "worker_address": "/ip4/127.0.0.1/udp/0"
-      },
-      "3": {
-        "name": "4kBB/sEnfuQrFVX4wKIWDruoWE0FdGQoAAxV3dH5Ruw=",
-        "transactions": "/ip4/127.0.0.1/tcp/0/http",
-        "worker_address": "/ip4/127.0.0.1/udp/0"
-      }
-    },
-    "mfJe9h+AMrkUY2RgmCxcxvE07x3a52ZX8sv+wev8jQlzdAgN9vzw3Li8Sw2OCvXYDrv/K0xZn1T0LWMS38MUJ2B4wcw0fru+xRmL4lhRPzhrkw0CwnSagD4jMJVevRoQ": {
-      "0": {
-        "name": "Rl8pi3pQBvFS3qQ4Ge8XfGIWJ89Ig6gaG+hs27ITsoY=",
-        "transactions": "/ip4/127.0.0.1/tcp/0/http",
-        "worker_address": "/ip4/127.0.0.1/udp/0"
-      },
-      "1": {
-        "name": "LEP9AK0+iW5NcUyhZbcmNIb5RYHgH69slDisEtztjG0=",
-        "transactions": "/ip4/127.0.0.1/tcp/0/http",
-        "worker_address": "/ip4/127.0.0.1/udp/0"
-      },
-      "2": {
-        "name": "7e+czQHszqp2FRfx2nfFWAO0P62dYPZStGZrvhXxsrk=",
-        "transactions": "/ip4/127.0.0.1/tcp/0/http",
-        "worker_address": "/ip4/127.0.0.1/udp/0"
-      },
-      "3": {
-        "name": "E9/Bo/26Ipc5+PcH6FrVcSX/vQpmNQOdnsvrQHha22g=",
-        "transactions": "/ip4/127.0.0.1/tcp/0/http",
-        "worker_address": "/ip4/127.0.0.1/udp/0"
-      }
-    },
-    "ofT8sYBvqkB+c/sjDYTwar96xgZbTdi/ncbet8ja9ePYhtSje59zyarNpF/ZxM1dAncK6uyr9Xv1lS7bJs+nSj2k0bMvbStf5RORLeuPwYz/yJrDOQQf4MxOnW0u8Gzo": {
-      "0": {
-        "name": "XfUKCTzkq/woZ4O5HhvOQYx2Mjmj53+b2Zvf47bUNAs=",
-        "transactions": "/ip4/127.0.0.1/tcp/0/http",
-        "worker_address": "/ip4/127.0.0.1/udp/0"
-      },
-      "1": {
-        "name": "ImcEJdnkJHGWWGfpkBU8v79yfxiBRd5dSk2fmgVot38=",
-        "transactions": "/ip4/127.0.0.1/tcp/0/http",
-        "worker_address": "/ip4/127.0.0.1/udp/0"
-      },
-      "2": {
-        "name": "wtCRbRtWxzwz1mf3mzcJZYlJSzmWIQriK6XTW558nX8=",
-        "transactions": "/ip4/127.0.0.1/tcp/0/http",
-        "worker_address": "/ip4/127.0.0.1/udp/0"
-      },
-      "3": {
-        "name": "6AXMr5ld8Tk2FSAG7nzpRNnxB9i/A2jvMHEo45HL1fU=",
-        "transactions": "/ip4/127.0.0.1/tcp/0/http",
-        "worker_address": "/ip4/127.0.0.1/udp/0"
-      }
-    },
-    "q1ys+9ZU8B5aHgYbgyC5N0XQlGdq1B7xY9D8JOyT89upZpiuKRUDBsq3h/WbLtd4AvLNFNECBjlAG06r8heq7tEs6ol97VfaS2579e4b337eJAwd/y1bIt4F+LhEc3sV": {
-      "0": {
-        "name": "ZHHGcv0FFVsZHJGRHt9GyGNjuEVHfPRQtzzvr0muwdw=",
-        "transactions": "/ip4/127.0.0.1/tcp/0/http",
-        "worker_address": "/ip4/127.0.0.1/udp/0"
-      },
-      "1": {
-        "name": "8mDA/X8DSIDB1xgO2aWggBs6c1CHpwO/8yOObxDvDVg=",
-        "transactions": "/ip4/127.0.0.1/tcp/0/http",
-        "worker_address": "/ip4/127.0.0.1/udp/0"
-      },
-      "2": {
-        "name": "qk4EPcTqK1qa8nSDxvWLOc4eNK08K8jStJYuu4r19/I=",
-        "transactions": "/ip4/127.0.0.1/tcp/0/http",
-        "worker_address": "/ip4/127.0.0.1/udp/0"
-      },
-      "3": {
-        "name": "8g85A29s6Un8b8sRwTLdQ626jFtHpDJOwtWEVy2t7MA=",
-        "transactions": "/ip4/127.0.0.1/tcp/0/http",
-        "worker_address": "/ip4/127.0.0.1/udp/0"
-      }
-    }
-  },
-  "epoch": 0
-}
diff --git a/narwhal/crypto/Cargo.toml b/narwhal/crypto/Cargo.toml
deleted file mode 100644
index 96db44d300c..00000000000
--- a/narwhal/crypto/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "narwhal-crypto"
-version = "0.1.0"
-authors = ["IOTA Foundation <info@iota.org>"]
-edition = "2021"
-license = "Apache-2.0"
-publish = false
-
-[dependencies]
-# external dependencies
-bcs.workspace = true
-fastcrypto.workspace = true
-serde.workspace = true
-
-# internal dependencies
-shared-crypto.workspace = true
-
-[features]
-default = []
-
-[dev-dependencies]
-bincode.workspace = true
-serde_json.workspace = true
diff --git a/narwhal/crypto/README.md b/narwhal/crypto/README.md
deleted file mode 100644
index dd7ecffbec6..00000000000
--- a/narwhal/crypto/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Most of the cryptographic libraries used by Narwhal are now in [fastcrypto](https://github.com/MystenLabs/fastcrypto).
diff --git a/narwhal/crypto/src/lib.rs b/narwhal/crypto/src/lib.rs
deleted file mode 100644
index 51fbe735418..00000000000
--- a/narwhal/crypto/src/lib.rs
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) 2021, Facebook, Inc. and its affiliates
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-#![warn(
-    future_incompatible,
-    nonstandard_style,
-    rust_2018_idioms,
-    rust_2021_compatibility
-)]
-
-// This re-export allows using the trait-defined APIs
-pub use fastcrypto::traits;
-use fastcrypto::{
-    bls12381, ed25519,
-    error::FastCryptoError,
-    hash::{Blake2b256, HashFunction},
-    traits::{AggregateAuthenticator, Signer, VerifyingKey},
-};
-use serde::Serialize;
-use shared_crypto::intent::{INTENT_PREFIX_LENGTH, Intent, IntentMessage, IntentScope};
-
-////////////////////////////////////////////////////////////////////////
-/// Type aliases selecting the signature algorithm for the code base.
-////////////////////////////////////////////////////////////////////////
-// Here we select the types that are used by default in the code base.
-// The whole code base should only:
-// - refer to those aliases and not use the individual scheme implementations
-// - not use the schemes in a way that break genericity (e.g. using their Struct
-//   impl functions)
-// - swap one of those aliases to point to another type if necessary
-//
-// Beware: if you change those aliases to point to another scheme
-// implementation, you will have to change all four aliases to point to concrete
-// types that work with each other. Failure to do so will result in a ton of
-// compilation errors, and worse: it will not make sense!
-
-pub type PublicKey = bls12381::min_sig::BLS12381PublicKey;
-pub type PublicKeyBytes = bls12381::min_sig::BLS12381PublicKeyAsBytes;
-pub type Signature = bls12381::min_sig::BLS12381Signature;
-pub type AggregateSignature = bls12381::min_sig::BLS12381AggregateSignature;
-pub type AggregateSignatureBytes = bls12381::min_sig::BLS12381AggregateSignatureAsBytes;
-pub type PrivateKey = bls12381::min_sig::BLS12381PrivateKey;
-pub type KeyPair = bls12381::min_sig::BLS12381KeyPair;
-
-pub type NetworkPublicKey = ed25519::Ed25519PublicKey;
-pub type NetworkKeyPair = ed25519::Ed25519KeyPair;
-
-////////////////////////////////////////////////////////////////////////
-
-// Type alias selecting the default hash function for the code base.
-pub type DefaultHashFunction = Blake2b256;
-pub const DIGEST_LENGTH: usize = DefaultHashFunction::OUTPUT_SIZE;
-pub const INTENT_MESSAGE_LENGTH: usize = INTENT_PREFIX_LENGTH + DIGEST_LENGTH;
-
-/// A trait for sign and verify over an intent message, instead of the message
-/// itself. See more at [struct IntentMessage].
-pub trait NarwhalAuthoritySignature {
-    /// Create a new signature over an intent message.
-    fn new_secure<T>(value: &IntentMessage<T>, secret: &dyn Signer<Self>) -> Self
-    where
-        T: Serialize;
-
-    /// Verify the signature on an intent message against the public key.
-    fn verify_secure<T>(
-        &self,
-        value: &IntentMessage<T>,
-        author: &PublicKey,
-    ) -> Result<(), FastCryptoError>
-    where
-        T: Serialize;
-}
-
-impl NarwhalAuthoritySignature for Signature {
-    fn new_secure<T>(value: &IntentMessage<T>, secret: &dyn Signer<Self>) -> Self
-    where
-        T: Serialize,
-    {
-        let message = bcs::to_bytes(&value).expect("Message serialization should not fail");
-        secret.sign(&message)
-    }
-
-    fn verify_secure<T>(
-        &self,
-        value: &IntentMessage<T>,
-        public_key: &PublicKey,
-    ) -> Result<(), FastCryptoError>
-    where
-        T: Serialize,
-    {
-        let message = bcs::to_bytes(&value).expect("Message serialization should not fail");
-        public_key.verify(&message, self)
-    }
-}
-
-pub trait NarwhalAuthorityAggregateSignature {
-    fn verify_secure<T>(
-        &self,
-        value: &IntentMessage<T>,
-        pks: &[PublicKey],
-    ) -> Result<(), FastCryptoError>
-    where
-        T: Serialize;
-}
-
-impl NarwhalAuthorityAggregateSignature for AggregateSignature {
-    fn verify_secure<T>(
-        &self,
-        value: &IntentMessage<T>,
-        pks: &[PublicKey],
-    ) -> Result<(), FastCryptoError>
-    where
-        T: Serialize,
-    {
-        let message = bcs::to_bytes(&value).expect("Message serialization should not fail");
-        self.verify(pks, &message)
-    }
-}
-
-/// Wrap a message in an intent message. Currently in Narwhal, the scope is
-/// always IntentScope::HeaderDigest and the app id is AppId::Narwhal.
-pub fn to_intent_message<T>(value: T) -> IntentMessage<T> {
-    IntentMessage::new(Intent::narwhal_app(IntentScope::HeaderDigest), value)
-}
diff --git a/narwhal/deny.toml b/narwhal/deny.toml
deleted file mode 100644
index d963508cb83..00000000000
--- a/narwhal/deny.toml
+++ /dev/null
@@ -1,234 +0,0 @@
-# This template contains all of the possible sections and their default values
-
-# Note that all fields that take a lint level have these possible values:
-# * deny - An error will be produced and the check will fail
-# * warn - A warning will be produced, but the check will not fail
-# * allow - No warning or error will be produced, though in some cases a note
-# will be
-
-# The values provided in this template are the default values that will be used
-# when any section or field is not specified in your own configuration
-
-# If 1 or more target triples (and optionally, target_features) are specified,
-# only the specified targets will be checked when running `cargo deny check`.
-# This means, if a particular package is only ever used as a target specific
-# dependency, such as, for example, the `nix` crate only being used via the
-# `target_family = "unix"` configuration, that only having windows targets in
-# this list would mean the nix crate, as well as any of its exclusive
-# dependencies not shared by any other crates, would be ignored, as the target
-# list here is effectively saying which targets you are building for.
-targets = [
-
-
-  # The triple can be any string, but only the target triples built in to
-  # rustc (as of 1.40) can be checked against actual config expressions
-  # { triple = "x86_64-unknown-linux-musl" },
-  # You can also specify which target_features you promise are enabled for a
-  # particular target. target_features are currently not validated against
-  # the actual valid features supported by the target architecture.
-  # { triple = "wasm32-unknown-unknown", features = ["atomics"] },
-]
-
-# This section is considered when running `cargo deny check advisories`
-# More documentation for the advisories section can be found here:
-# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
-[advisories]
-# The path where the advisory database is cloned/fetched into
-db-path = "~/.cargo/advisory-db"
-# The url(s) of the advisory databases to use
-db-urls = ["https://github.com/rustsec/advisory-db"]
-# The lint level for security vulnerabilities
-vulnerability = "deny"
-# The lint level for unmaintained crates
-unmaintained = "warn"
-# The lint level for crates that have been yanked from their source registry
-yanked = "warn"
-# The lint level for crates with security notices. Note that as of
-# 2019-12-17 there are no security notice advisories in
-# https://github.com/rustsec/advisory-db
-notice = "warn"
-# A list of advisory IDs to ignore. Note that ignored advisories will still
-# output a note when they are encountered.
-ignore = [
-
-
-  # "RUSTSEC-0000-0000",
-]
-# Threshold for security vulnerabilities, any vulnerability with a CVSS score
-# lower than the range specified will be ignored. Note that ignored advisories
-# will still output a note when they are encountered.
-# * None - CVSS Score 0.0
-# * Low - CVSS Score 0.1 - 3.9
-# * Medium - CVSS Score 4.0 - 6.9
-# * High - CVSS Score 7.0 - 8.9
-# * Critical - CVSS Score 9.0 - 10.0
-# severity-threshold =
-
-# This section is considered when running `cargo deny check licenses`
-# More documentation for the licenses section can be found here:
-# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
-[licenses]
-# The lint level for crates which do not have a detectable license
-unlicensed = "deny"
-# List of explicitly allowed licenses
-# See https://spdx.org/licenses/ for list of possible licenses
-# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
-allow = [
-  "MIT",
-  "BSD-2-Clause",
-  "BSD-3-Clause",
-  "CC0-1.0",
-  "Apache-2.0",
-  "LicenseRef-ring",
-  "ISC",
-  "Unicode-DFS-2016",
-  # "Apache-2.0 WITH LLVM-exception",
-]
-# List of explicitly disallowed licenses
-# See https://spdx.org/licenses/ for list of possible licenses
-# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
-deny = [
-
-
-  # "Nokia",
-]
-# Lint level for licenses considered copyleft
-copyleft = "warn"
-# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses
-# * both - The license will be approved if it is both OSI-approved *AND* FSF
-# * either - The license will be approved if it is either OSI-approved *OR* FSF
-# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF
-# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved
-# * neither - This predicate is ignored and the default lint level is used
-allow-osi-fsf-free = "neither"
-# Lint level used when no other predicates are matched
-# 1. License isn't in the allow or deny lists
-# 2. License isn't copyleft
-# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither"
-default = "deny"
-# The confidence threshold for detecting a license from license text.
-# The higher the value, the more closely the license text must be to the
-# canonical license text of a valid SPDX license file.
-# [possible values: any between 0.0 and 1.0].
-confidence-threshold = 0.8
-# Allow 1 or more licenses on a per-crate basis, so that particular licenses
-# aren't accepted for every possible crate as with the normal allow list
-exceptions = [
-
-
-  # Each entry is the crate and version constraint, and its specific allow
-  # list
-  # { allow = ["Zlib"], name = "adler32", version = "*" },
-]
-
-# Some crates don't have (easily) machine readable licensing information,
-# adding a clarification entry for it allows you to manually specify the
-# licensing information
-# [[licenses.clarify]]
-# The name of the crate the clarification applies to
-# name = "ring"
-# The optional version constraint for the crate
-# version = "*"
-# The SPDX expression for the license requirements of the crate
-# expression = "MIT AND ISC AND OpenSSL"
-# One or more files in the crate's source used as the "source of truth" for
-# the license expression. If the contents match, the clarification will be used
-# when running the license check, otherwise the clarification will be ignored
-# and the crate will be checked normally, which may produce warnings or errors
-# depending on the rest of your configuration
-# license-files = [
-# Each entry is a crate relative path, and the (opaque) hash of its contents
-# { path = "LICENSE", hash = 0xbd0eed23 }
-# ]
-[[licenses.clarify]]
-name = "bls-crypto"
-version = "*"
-expression = "MIT AND Apache-2.0"
-license-files = [
-
-]
-[[licenses.clarify]]
-name = "ring"
-expression = "LicenseRef-ring"
-license-files = [
-  { path = "LICENSE", hash = 0xbd0eed23 },
-]
-
-[licenses.private]
-# If true, ignores workspace crates that aren't published, or are only
-# published to private registries
-ignore = false
-# One or more private registries that you might publish crates to, if a crate
-# is only published to private registries, and ignore is true, the crate will
-# not have its license(s) checked
-registries = [
-
-
-  # "https://sekretz.com/registry
-]
-
-# This section is considered when running `cargo deny check bans`.
-# More documentation about the 'bans' section can be found here:
-# https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html
-[bans]
-# Lint level for when multiple versions of the same crate are detected
-multiple-versions = "warn"
-# Lint level for when a crate version requirement is `*`
-wildcards = "allow"
-# The graph highlighting used when creating dotgraphs for crates
-# with multiple versions
-# * lowest-version - The path to the lowest versioned duplicate is highlighted
-# * simplest-path - The path to the version with the fewest edges is highlighted
-# * all - Both lowest-version and simplest-path are used
-highlight = "all"
-# List of crates that are allowed. Use with care!
-allow = [
-
-
-  # { name = "ansi_term", version = "=0.11.0" },
-]
-# List of crates to deny
-deny = [
-
-
-  # Each entry the name of a crate and a version range. If version is
-  # not specified, all versions will be matched.
-  # { name = "ansi_term", version = "=0.11.0" },
-  #
-  # Wrapper crates can optionally be specified to allow the crate when it
-  # is a direct dependency of the otherwise banned crate
-  # { name = "ansi_term", version = "=0.11.0", wrappers = [] },
-]
-# Certain crates/versions that will be skipped when doing duplicate detection.
-skip = [
-
-
-  # { name = "ansi_term", version = "=0.11.0" },
-]
-# Similarly to `skip` allows you to skip certain crates during duplicate
-# detection. Unlike skip, it also includes the entire tree of transitive
-# dependencies starting at the specified crate, up to a certain depth, which is
-# by default infinite
-skip-tree = [
-
-
-  # { name = "ansi_term", version = "=0.11.0", depth = 20 },
-]
-
-# This section is considered when running `cargo deny check sources`.
-# More documentation about the 'sources' section can be found here:
-# https://embarkstudios.github.io/cargo-deny/checks/sources/cfg.html
-[sources]
-# Lint level for what to happen when a crate from a crate registry that is not
-# in the allow list is encountered
-unknown-registry = "warn"
-# Lint level for what to happen when a crate from a git repository that is not
-# in the allow list is encountered
-unknown-git = "warn"
-# List of URLs for allowed crate registries. Defaults to the crates.io index
-# if not specified. If it is specified but empty, no registries are allowed.
-allow-registry = ["https://github.com/rust-lang/crates.io-index"]
-# List of URLs for allowed Git repositories
-allow-git = []
-
-[sources.allow-org]
diff --git a/narwhal/network/Cargo.toml b/narwhal/network/Cargo.toml
deleted file mode 100644
index 484693383b4..00000000000
--- a/narwhal/network/Cargo.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-[package]
-name = "narwhal-network"
-version = "0.1.0"
-authors = ["IOTA Foundation <info@iota.org>"]
-edition = "2021"
-license = "Apache-2.0"
-publish = false
-
-[dependencies]
-# external dependencies
-anemo.workspace = true
-anemo-tower.workspace = true
-anyhow.workspace = true
-async-trait.workspace = true
-axum.workspace = true
-bytes.workspace = true
-dashmap.workspace = true
-futures.workspace = true
-parking_lot.workspace = true
-prometheus.workspace = true
-quinn-proto.workspace = true
-rand = { workspace = true, features = ["small_rng"] }
-tokio = { workspace = true, features = ["rt", "net", "sync", "macros", "time"] }
-tower.workspace = true
-tracing.workspace = true
-
-# internal dependencies
-crypto = { path = "../crypto", package = "narwhal-crypto" }
-iota-common.workspace = true
-iota-metrics.workspace = true
-types = { path = "../types", package = "narwhal-types" }
-
-[dev-dependencies]
-bincode.workspace = true
diff --git a/narwhal/network/src/lib.rs b/narwhal/network/src/lib.rs
deleted file mode 100644
index 5490bb946d9..00000000000
--- a/narwhal/network/src/lib.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) 2021, Facebook, Inc. and its affiliates
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-pub mod connectivity;
-pub mod metrics;
diff --git a/narwhal/test-utils/Cargo.toml b/narwhal/test-utils/Cargo.toml
deleted file mode 100644
index ad0e8d8de09..00000000000
--- a/narwhal/test-utils/Cargo.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-[package]
-name = "narwhal-test-utils"
-version = "0.1.0"
-authors = ["IOTA Foundation <info@iota.org>"]
-edition = "2021"
-license = "Apache-2.0"
-publish = false
-
-[dependencies]
-# external dependencies
-anemo.workspace = true
-fastcrypto.workspace = true
-fdlimit.workspace = true
-indexmap.workspace = true
-once_cell.workspace = true
-rand.workspace = true
-tempfile.workspace = true
-tokio = { workspace = true, features = ["sync", "rt", "macros"] }
-tonic.workspace = true
-tracing.workspace = true
-
-# internal dependencies
-config = { path = "../config", package = "narwhal-config" }
-crypto = { path = "../crypto", package = "narwhal-crypto" }
-iota-network-stack.workspace = true
-iota-protocol-config.workspace = true
-types = { path = "../types", package = "narwhal-types" }
diff --git a/narwhal/test-utils/src/lib.rs b/narwhal/test-utils/src/lib.rs
deleted file mode 100644
index c276df44272..00000000000
--- a/narwhal/test-utils/src/lib.rs
+++ /dev/null
@@ -1,1116 +0,0 @@
-// Copyright (c) 2021, Facebook, Inc. and its affiliates
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-use std::{
-    collections::{BTreeMap, BTreeSet, HashMap, VecDeque},
-    num::NonZeroUsize,
-    ops::RangeInclusive,
-};
-
-use config::{
-    Authority, AuthorityIdentifier, Committee, CommitteeBuilder, Epoch, Stake, WorkerCache,
-    WorkerId, WorkerIndex, WorkerInfo, utils::get_available_port,
-};
-use crypto::{
-    KeyPair, NarwhalAuthoritySignature, NetworkKeyPair, NetworkPublicKey, PublicKey, Signature,
-    to_intent_message,
-};
-use fastcrypto::{
-    hash::Hash as _,
-    traits::{AllowedRng, KeyPair as _},
-};
-use indexmap::IndexMap;
-use iota_network_stack::Multiaddr;
-use iota_protocol_config::{Chain, ProtocolConfig, ProtocolVersion};
-use once_cell::sync::OnceCell;
-use rand::{
-    Rng, RngCore, SeedableRng,
-    distributions::{Bernoulli, Distribution},
-    rngs::{OsRng, StdRng},
-    thread_rng,
-};
-use types::{
-    Batch, BatchDigest, Certificate, CertificateAPI, CertificateDigest, Header, HeaderAPI,
-    HeaderV1Builder, Round, TimestampMs, Transaction, Vote, VoteAPI,
-};
-
-pub const VOTES_CF: &str = "votes";
-pub const HEADERS_CF: &str = "headers";
-pub const CERTIFICATES_CF: &str = "certificates";
-pub const CERTIFICATE_DIGEST_BY_ROUND_CF: &str = "certificate_digest_by_round";
-pub const CERTIFICATE_DIGEST_BY_ORIGIN_CF: &str = "certificate_digest_by_origin";
-pub const PAYLOAD_CF: &str = "payload";
-
-pub fn latest_protocol_version() -> ProtocolConfig {
-    ProtocolConfig::get_for_version(ProtocolVersion::max(), Chain::Unknown)
-}
-
-pub fn get_protocol_config(version_number: u64) -> ProtocolConfig {
-    ProtocolConfig::get_for_version(ProtocolVersion::new(version_number), Chain::Unknown)
-}
-
-pub fn temp_dir() -> std::path::PathBuf {
-    tempfile::tempdir()
-        .expect("Failed to open temporary directory")
-        .into_path()
-}
-
-pub fn ensure_test_environment() {
-    // One common issue when running tests on Mac is that the default ulimit is too
-    // low, leading to I/O errors such as "Too many open files". Raising fdlimit
-    // to bypass it. Also we can't do this in Windows, apparently.
-    #[cfg(not(target_os = "windows"))]
-    fdlimit::raise_fd_limit().expect("Could not raise ulimit");
-}
-
-#[macro_export]
-macro_rules! test_channel {
-    ($e:expr) => {
-        iota_metrics::metered_channel::channel(
-            $e,
-            &prometheus::IntGauge::new("TEST_COUNTER", "test counter").unwrap(),
-        );
-    };
-}
-
-// Note: use the following macros to initialize your Primary / Consensus
-// channels if your test is spawning a primary and you encounter an `AllReg`
-// error.
-//
-// Rationale:
-// The primary initialization will try to edit a specific metric in its registry
-// for its new_certificates and committeed_certificates channel. The gauge
-// situated in the channel you're passing as an argument to the primary
-// initialization is the replacement. If that gauge is a dummy gauge, such as
-// the one above, the initialization of the primary will panic (to protect the
-// production code against an erroneous mistake in editing this bootstrap
-// logic).
-#[macro_export]
-macro_rules! test_committed_certificates_channel {
-    ($e:expr) => {
-        iota_metrics::metered_channel::channel(
-            $e,
-            &prometheus::IntGauge::new(
-                primary::PrimaryChannelMetrics::NAME_COMMITTED_CERTS,
-                primary::PrimaryChannelMetrics::DESC_COMMITTED_CERTS,
-            )
-            .unwrap(),
-        );
-    };
-}
-
-#[macro_export]
-macro_rules! test_new_certificates_channel {
-    ($e:expr) => {
-        iota_metrics::metered_channel::channel(
-            $e,
-            &prometheus::IntGauge::new(
-                primary::PrimaryChannelMetrics::NAME_NEW_CERTS,
-                primary::PrimaryChannelMetrics::DESC_NEW_CERTS,
-            )
-            .unwrap(),
-        );
-    };
-}
-
-////////////////////////////////////////////////////////////////
-/// Keys, Committee
-////////////////////////////////////////////////////////////////
-
-pub fn random_key() -> KeyPair {
-    KeyPair::generate(&mut thread_rng())
-}
-
-////////////////////////////////////////////////////////////////
-/// Headers, Votes, Certificates
-////////////////////////////////////////////////////////////////
-pub fn fixture_payload(number_of_batches: u8) -> IndexMap<BatchDigest, (WorkerId, TimestampMs)> {
-    let mut payload: IndexMap<BatchDigest, (WorkerId, TimestampMs)> = IndexMap::new();
-
-    for _ in 0..number_of_batches {
-        let batch_digest = batch().digest();
-
-        payload.insert(batch_digest, (0, 0));
-    }
-
-    payload
-}
-
-// will create a batch with randomly formed transactions
-// dictated by the parameter number_of_transactions
-pub fn fixture_batch_with_transactions(number_of_transactions: u32) -> Batch {
-    let transactions = (0..number_of_transactions)
-        .map(|_v| transaction())
-        .collect();
-
-    Batch::new(transactions)
-}
-
-pub fn fixture_payload_with_rand<R: Rng + ?Sized>(
-    number_of_batches: u8,
-    rand: &mut R,
-) -> IndexMap<BatchDigest, (WorkerId, TimestampMs)> {
-    let mut payload: IndexMap<BatchDigest, (WorkerId, TimestampMs)> = IndexMap::new();
-
-    for _ in 0..number_of_batches {
-        let batch_digest = batch_with_rand(rand).digest();
-
-        payload.insert(batch_digest, (0, 0));
-    }
-
-    payload
-}
-
-pub fn transaction_with_rand<R: Rng + ?Sized>(rand: &mut R) -> Transaction {
-    // generate random value transactions, but the length will be always 100 bytes
-    (0..100)
-        .map(|_v| rand.gen_range(u8::MIN..=u8::MAX))
-        .collect()
-}
-
-pub fn batch_with_rand<R: Rng + ?Sized>(rand: &mut R) -> Batch {
-    Batch::new(vec![
-        transaction_with_rand(rand),
-        transaction_with_rand(rand),
-    ])
-}
-
-// Fixture
-pub fn transaction() -> Transaction {
-    // generate random value transactions, but the length will be always 100 bytes
-    (0..100).map(|_v| rand::random::<u8>()).collect()
-}
-
-////////////////////////////////////////////////////////////////
-/// Batches
-////////////////////////////////////////////////////////////////
-
-// Fixture
-pub fn batch() -> Batch {
-    let transactions = vec![transaction(), transaction()];
-    Batch::new(transactions)
-}
-
-/// generate multiple fixture batches. The number of generated batches
-/// are dictated by the parameter num_of_batches.
-pub fn batches(num_of_batches: usize) -> Vec<Batch> {
-    let mut batches = Vec::new();
-
-    for i in 1..num_of_batches + 1 {
-        batches.push(batch_with_transactions(i));
-    }
-
-    batches
-}
-
-pub fn batch_with_transactions(num_of_transactions: usize) -> Batch {
-    let mut transactions = Vec::new();
-
-    for _ in 0..num_of_transactions {
-        transactions.push(transaction());
-    }
-
-    Batch::new(transactions)
-}
-
-// Creates one certificate per authority starting and finishing at the specified
-// rounds (inclusive). Outputs a VecDeque of certificates (the certificate with
-// higher round is on the front) and a set of digests to be used as parents for
-// the certificates of the next round. Note : the certificates are unsigned
-pub fn make_optimal_certificates(
-    committee: &Committee,
-    range: RangeInclusive<Round>,
-    initial_parents: &BTreeSet<CertificateDigest>,
-    ids: &[AuthorityIdentifier],
-) -> (VecDeque<Certificate>, BTreeSet<CertificateDigest>) {
-    make_certificates(committee, range, initial_parents, ids, 0.0)
-}
-
-// Outputs rounds worth of certificates with optimal parents, signed
-pub fn make_optimal_signed_certificates(
-    range: RangeInclusive<Round>,
-    initial_parents: &BTreeSet<CertificateDigest>,
-    committee: &Committee,
-    keys: &[(AuthorityIdentifier, KeyPair)],
-) -> (VecDeque<Certificate>, BTreeSet<CertificateDigest>) {
-    make_signed_certificates(range, initial_parents, committee, keys, 0.0)
-}
-
-// Bernoulli-samples from a set of ancestors passed as a argument,
-fn this_cert_parents(
-    ancestors: &BTreeSet<CertificateDigest>,
-    failure_prob: f64,
-) -> BTreeSet<CertificateDigest> {
-    std::iter::from_fn(|| {
-        let f: f64 = rand::thread_rng().gen();
-        Some(f > failure_prob)
-    })
-    .take(ancestors.len())
-    .zip(ancestors)
-    .flat_map(|(parenthood, parent)| parenthood.then_some(*parent))
-    .collect::<BTreeSet<_>>()
-}
-
-// Utility for making several rounds worth of certificates through iterated
-// parenthood sampling. The making of individual certificates once parents are
-// figured out is delegated to the `make_one_certificate` argument
-fn rounds_of_certificates(
-    range: RangeInclusive<Round>,
-    initial_parents: &BTreeSet<CertificateDigest>,
-    ids: &[AuthorityIdentifier],
-    failure_probability: f64,
-    make_one_certificate: impl Fn(
-        AuthorityIdentifier,
-        Round,
-        BTreeSet<CertificateDigest>,
-    ) -> (CertificateDigest, Certificate),
-) -> (VecDeque<Certificate>, BTreeSet<CertificateDigest>) {
-    let mut certificates = VecDeque::new();
-    let mut parents = initial_parents.iter().cloned().collect::<BTreeSet<_>>();
-    let mut next_parents = BTreeSet::new();
-
-    for round in range {
-        next_parents.clear();
-        for id in ids {
-            let this_cert_parents = this_cert_parents(&parents, failure_probability);
-
-            let (digest, certificate) = make_one_certificate(*id, round, this_cert_parents);
-            certificates.push_back(certificate);
-            next_parents.insert(digest);
-        }
-        parents = next_parents.clone();
-    }
-    (certificates, next_parents)
-}
-
-// make rounds worth of unsigned certificates with the sampled number of parents
-pub fn make_certificates(
-    committee: &Committee,
-    range: RangeInclusive<Round>,
-    initial_parents: &BTreeSet<CertificateDigest>,
-    ids: &[AuthorityIdentifier],
-    failure_probability: f64,
-) -> (VecDeque<Certificate>, BTreeSet<CertificateDigest>) {
-    let generator = |pk, round, parents| mock_certificate(committee, pk, round, parents);
-
-    rounds_of_certificates(range, initial_parents, ids, failure_probability, generator)
-}
-
-// Creates certificates for the provided rounds but also having slow nodes.
-// `range`: the rounds for which we intend to create the certificates for
-// `initial_parents`: the parents to use when start creating the certificates
-// `keys`: the authorities for which it will create certificates for
-// `slow_nodes`: the authorities which are considered slow. Being a slow
-// authority means that we will  still create certificates for them on each
-// round, but no other authority from higher round will refer
-// to those certificates. The number (by stake) of slow_nodes can not be > f ,
-// as otherwise no valid graph will be produced.
-pub fn make_certificates_with_slow_nodes(
-    committee: &Committee,
-    range: RangeInclusive<Round>,
-    initial_parents: Vec<Certificate>,
-    names: &[AuthorityIdentifier],
-    slow_nodes: &[(AuthorityIdentifier, f64)],
-) -> (VecDeque<Certificate>, Vec<Certificate>) {
-    let mut rand = StdRng::seed_from_u64(1);
-
-    // ensure provided slow nodes do not account > f
-    let slow_nodes_stake: Stake = slow_nodes
-        .iter()
-        .map(|(key, _)| committee.authority(key).unwrap().stake())
-        .sum();
-
-    assert!(slow_nodes_stake < committee.validity_threshold());
-
-    let mut certificates = VecDeque::new();
-    let mut parents = initial_parents;
-    let mut next_parents = Vec::new();
-
-    for round in range {
-        next_parents.clear();
-        for name in names {
-            let this_cert_parents = this_cert_parents_with_slow_nodes(
-                name,
-                parents.clone(),
-                slow_nodes,
-                &mut rand,
-                committee,
-            );
-
-            let (_, certificate) = mock_certificate(committee, *name, round, this_cert_parents);
-            certificates.push_back(certificate.clone());
-            next_parents.push(certificate);
-        }
-        parents = next_parents.clone();
-    }
-    (certificates, next_parents)
-}
-
-#[derive(Debug, Clone, Copy)]
-pub enum TestLeaderSupport {
-    // There will be support for the leader, but less than f+1
-    Weak,
-    // There will be strong support for the leader, meaning >= f+1
-    Strong,
-    // Leader will be completely omitted by the voters
-    NoSupport,
-}
-
-pub struct TestLeaderConfiguration {
-    // The round of the leader
-    pub round: Round,
-    // The leader id. That allow us to explicitly dictate which we consider the leader to be
-    pub authority: AuthorityIdentifier,
-    // If true then the leader for that round will not be created at all
-    pub should_omit: bool,
-    // The support that this leader should receive from the voters of next round
-    pub support: Option<TestLeaderSupport>,
-}
-
-/// Creates fully connected DAG for the dictated rounds but with specific
-/// conditions for the leaders. By providing the `leader_configuration` we can
-/// dictate the setup for specific leaders of specific rounds. For a leader the
-/// following can be configured:
-/// * whether a leader will exist or not for a round
-/// * whether a leader will receive enough support from the next round
-pub fn make_certificates_with_leader_configuration(
-    committee: &Committee,
-    range: RangeInclusive<Round>,
-    initial_parents: &BTreeSet<CertificateDigest>,
-    names: &[AuthorityIdentifier],
-    leader_configurations: HashMap<Round, TestLeaderConfiguration>,
-) -> (VecDeque<Certificate>, BTreeSet<CertificateDigest>) {
-    for round in leader_configurations.keys() {
-        assert_eq!(round % 2, 0, "Leaders are elected only on even rounds");
-    }
-
-    let mut certificates: VecDeque<Certificate> = VecDeque::new();
-    let mut parents = initial_parents.iter().cloned().collect::<BTreeSet<_>>();
-    let mut next_parents = BTreeSet::new();
-
-    for round in range {
-        next_parents.clear();
-
-        for name in names {
-            // should we produce the leader of that round?
-            if let Some(leader_config) = leader_configurations.get(&round) {
-                if leader_config.should_omit && leader_config.authority == *name {
-                    // just skip and don't create the certificate for this authority
-                    continue;
-                }
-            }
-
-            // we now check for the leader of previous round. If should not be omitted we
-            // need to check on the support we are supposed to provide
-            let cert_parents = if round > 0 {
-                if let Some(leader_config) = leader_configurations.get(&(round - 1)) {
-                    match leader_config.support {
-                        Some(TestLeaderSupport::Weak) => {
-                            // find the leader from the previous round
-                            let leader_certificate = certificates
-                                .iter()
-                                .find(|c| {
-                                    c.round() == round - 1 && c.origin() == leader_config.authority
-                                })
-                                .unwrap();
-
-                            // check whether anyone from the current round already included it
-                            // if yes, then we should remove it and not vote again.
-                            if certificates.iter().any(|c| {
-                                c.round() == round
-                                    && c.header().parents().contains(&leader_certificate.digest())
-                            }) {
-                                let mut p = parents.clone();
-                                p.remove(&leader_certificate.digest());
-                                p
-                            } else {
-                                // otherwise return all the parents
-                                parents.clone()
-                            }
-                        }
-                        Some(TestLeaderSupport::Strong) => {
-                            // just return the whole parent set so we can vote for it
-                            parents.clone()
-                        }
-                        Some(TestLeaderSupport::NoSupport) => {
-                            // remove the leader from the set of parents
-                            let c = certificates
-                                .iter()
-                                .find(|c| {
-                                    c.round() == round - 1 && c.origin() == leader_config.authority
-                                })
-                                .unwrap();
-                            let mut p = parents.clone();
-                            p.remove(&c.digest());
-                            p
-                        }
-                        None => parents.clone(),
-                    }
-                } else {
-                    parents.clone()
-                }
-            } else {
-                parents.clone()
-            };
-
-            // Create the certificates
-            let (_, certificate) = mock_certificate(committee, *name, round, cert_parents);
-            certificates.push_back(certificate.clone());
-            next_parents.insert(certificate.digest());
-        }
-        parents = next_parents.clone();
-    }
-    (certificates, next_parents)
-}
-
-// Returns the parents that should be used as part of a newly created
-// certificate. The `slow_nodes` parameter is used to dictate which parents to
-// exclude and not use. The slow node will not be used under some probability
-// which is provided as part of the tuple. If probability to use it is 0.0, then
-// the parent node will NEVER be used. If probability to use it is 1.0, then the
-// parent node will ALWAYS be used. We always make sure to include our "own"
-// certificate, thus the `name` property is needed.
-pub fn this_cert_parents_with_slow_nodes(
-    authority_id: &AuthorityIdentifier,
-    ancestors: Vec<Certificate>,
-    slow_nodes: &[(AuthorityIdentifier, f64)],
-    rand: &mut StdRng,
-    committee: &Committee,
-) -> BTreeSet<CertificateDigest> {
-    let mut parents = BTreeSet::new();
-    let mut not_included = Vec::new();
-    let mut total_stake = 0;
-
-    for parent in ancestors {
-        let authority = committee.authority(&parent.origin()).unwrap();
-
-        // Identify if the parent is within the slow nodes - and is not the same author
-        // as the one we want to create the certificate for.
-        if let Some((_, inclusion_probability)) = slow_nodes
-            .iter()
-            .find(|(id, _)| *id != *authority_id && *id == parent.header().author())
-        {
-            let b = Bernoulli::new(*inclusion_probability).unwrap();
-            let should_include = b.sample(rand);
-
-            if should_include {
-                parents.insert(parent.digest());
-                total_stake += authority.stake();
-            } else {
-                not_included.push(parent);
-            }
-        } else {
-            // just add it directly as it is not within the slow nodes or we are the
-            // same author.
-            parents.insert(parent.digest());
-            total_stake += authority.stake();
-        }
-    }
-
-    // ensure we'll have enough parents (2f + 1)
-    while total_stake < committee.quorum_threshold() {
-        let parent = not_included.pop().unwrap();
-        let authority = committee.authority(&parent.origin()).unwrap();
-
-        total_stake += authority.stake();
-
-        parents.insert(parent.digest());
-    }
-
-    assert!(
-        committee.reached_quorum(total_stake),
-        "Not enough parents by stake provided. Expected at least {} but instead got {}",
-        committee.quorum_threshold(),
-        total_stake
-    );
-
-    parents
-}
-
-// make rounds worth of unsigned certificates with the sampled number of parents
-pub fn make_certificates_with_epoch(
-    committee: &Committee,
-    range: RangeInclusive<Round>,
-    epoch: Epoch,
-    initial_parents: &BTreeSet<CertificateDigest>,
-    keys: &[AuthorityIdentifier],
-) -> (VecDeque<Certificate>, BTreeSet<CertificateDigest>) {
-    let mut certificates = VecDeque::new();
-    let mut parents = initial_parents.iter().cloned().collect::<BTreeSet<_>>();
-    let mut next_parents = BTreeSet::new();
-
-    for round in range {
-        next_parents.clear();
-        for name in keys {
-            let (digest, certificate) =
-                mock_certificate_with_epoch(committee, *name, round, epoch, parents.clone());
-            certificates.push_back(certificate);
-            next_parents.insert(digest);
-        }
-        parents = next_parents.clone();
-    }
-    (certificates, next_parents)
-}
-
-// make rounds worth of signed certificates with the sampled number of parents
-pub fn make_signed_certificates(
-    range: RangeInclusive<Round>,
-    initial_parents: &BTreeSet<CertificateDigest>,
-    committee: &Committee,
-    keys: &[(AuthorityIdentifier, KeyPair)],
-    failure_probability: f64,
-) -> (VecDeque<Certificate>, BTreeSet<CertificateDigest>) {
-    let ids = keys
-        .iter()
-        .map(|(authority, _)| *authority)
-        .collect::<Vec<_>>();
-    let generator =
-        |pk, round, parents| mock_signed_certificate(keys, pk, round, parents, committee);
-
-    rounds_of_certificates(
-        range,
-        initial_parents,
-        &ids[..],
-        failure_probability,
-        generator,
-    )
-}
-
-pub fn mock_certificate_with_rand<R: RngCore + ?Sized>(
-    committee: &Committee,
-    origin: AuthorityIdentifier,
-    round: Round,
-    parents: BTreeSet<CertificateDigest>,
-    rand: &mut R,
-) -> (CertificateDigest, Certificate) {
-    let header_builder = HeaderV1Builder::default();
-    let header = header_builder
-        .author(origin)
-        .round(round)
-        .epoch(0)
-        .parents(parents)
-        .payload(fixture_payload_with_rand(1, rand))
-        .build()
-        .unwrap();
-    let certificate = Certificate::new_unsigned(committee, Header::V1(header), Vec::new()).unwrap();
-    (certificate.digest(), certificate)
-}
-
-// Creates a badly signed certificate from its given round, origin and parents,
-// Note: the certificate is signed by a random key rather than its author
-pub fn mock_certificate(
-    committee: &Committee,
-    origin: AuthorityIdentifier,
-    round: Round,
-    parents: BTreeSet<CertificateDigest>,
-) -> (CertificateDigest, Certificate) {
-    mock_certificate_with_epoch(committee, origin, round, 0, parents)
-}
-
-// Creates a badly signed certificate from its given round, epoch, origin, and
-// parents, Note: the certificate is signed by a random key rather than its
-// author
-pub fn mock_certificate_with_epoch(
-    committee: &Committee,
-    origin: AuthorityIdentifier,
-    round: Round,
-    epoch: Epoch,
-    parents: BTreeSet<CertificateDigest>,
-) -> (CertificateDigest, Certificate) {
-    let header_builder = HeaderV1Builder::default();
-    let header = header_builder
-        .author(origin)
-        .round(round)
-        .epoch(epoch)
-        .parents(parents)
-        .payload(fixture_payload(1))
-        .build()
-        .unwrap();
-    let certificate = Certificate::new_unsigned(committee, Header::V1(header), Vec::new()).unwrap();
-    (certificate.digest(), certificate)
-}
-
-// Creates one signed certificate from a set of signers - the signers must
-// include the origin
-pub fn mock_signed_certificate(
-    signers: &[(AuthorityIdentifier, KeyPair)],
-    origin: AuthorityIdentifier,
-    round: Round,
-    parents: BTreeSet<CertificateDigest>,
-    committee: &Committee,
-) -> (CertificateDigest, Certificate) {
-    let header_builder = HeaderV1Builder::default()
-        .author(origin)
-        .payload(fixture_payload(1))
-        .round(round)
-        .epoch(0)
-        .parents(parents);
-
-    let header = header_builder.build().unwrap();
-
-    let cert =
-        Certificate::new_unsigned(committee, Header::V1(header.clone()), Vec::new()).unwrap();
-
-    let mut votes = Vec::new();
-    for (name, signer) in signers {
-        let sig = Signature::new_secure(&to_intent_message(cert.header().digest()), signer);
-        votes.push((*name, sig))
-    }
-    let cert = Certificate::new_unverified(committee, Header::V1(header), votes).unwrap();
-    (cert.digest(), cert)
-}
-
-pub struct Builder<R = OsRng> {
-    rng: R,
-    committee_size: NonZeroUsize,
-    number_of_workers: NonZeroUsize,
-    randomize_ports: bool,
-    epoch: Epoch,
-    protocol_version: ProtocolVersion,
-    stake: VecDeque<Stake>,
-}
-
-impl Default for Builder {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Builder {
-    pub fn new() -> Self {
-        Self {
-            epoch: Epoch::default(),
-            protocol_version: ProtocolVersion::max(),
-            rng: OsRng,
-            committee_size: NonZeroUsize::new(4).unwrap(),
-            number_of_workers: NonZeroUsize::new(4).unwrap(),
-            randomize_ports: false,
-            stake: VecDeque::new(),
-        }
-    }
-}
-
-impl<R> Builder<R> {
-    pub fn committee_size(mut self, committee_size: NonZeroUsize) -> Self {
-        self.committee_size = committee_size;
-        self
-    }
-
-    pub fn number_of_workers(mut self, number_of_workers: NonZeroUsize) -> Self {
-        self.number_of_workers = number_of_workers;
-        self
-    }
-
-    pub fn randomize_ports(mut self, randomize_ports: bool) -> Self {
-        self.randomize_ports = randomize_ports;
-        self
-    }
-
-    pub fn epoch(mut self, epoch: Epoch) -> Self {
-        self.epoch = epoch;
-        self
-    }
-
-    pub fn protocol_version(mut self, protocol_version: ProtocolVersion) -> Self {
-        self.protocol_version = protocol_version;
-        self
-    }
-
-    pub fn stake_distribution(mut self, stake: VecDeque<Stake>) -> Self {
-        self.stake = stake;
-        self
-    }
-
-    pub fn rng<N: rand::RngCore + rand::CryptoRng>(self, rng: N) -> Builder<N> {
-        Builder {
-            rng,
-            epoch: self.epoch,
-            protocol_version: self.protocol_version,
-            committee_size: self.committee_size,
-            number_of_workers: self.number_of_workers,
-            randomize_ports: self.randomize_ports,
-            stake: self.stake,
-        }
-    }
-}
-
-impl<R: rand::RngCore + rand::CryptoRng> Builder<R> {
-    pub fn build(mut self) -> CommitteeFixture {
-        if !self.stake.is_empty() {
-            assert_eq!(
-                self.stake.len(),
-                self.committee_size.get(),
-                "Stake vector has been provided but is different length the committee - it should be the same"
-            );
-        }
-
-        let mut authorities: Vec<AuthorityFixture> = (0..self.committee_size.get())
-            .map(|_| {
-                AuthorityFixture::generate(
-                    StdRng::from_rng(&mut self.rng).unwrap(),
-                    self.number_of_workers,
-                    |host| {
-                        if self.randomize_ports {
-                            get_available_port(host)
-                        } else {
-                            0
-                        }
-                    },
-                )
-            })
-            .collect();
-
-        // now order the AuthorityFixtures by the authority PublicKey so when we iterate
-        // either via the committee.authorities() or via the
-        // fixture.authorities() we'll get the same order.
-        authorities.sort_by_key(|a1| a1.public_key());
-
-        // create the committee in order to assign the ids to the authorities
-        let mut committee_builder = CommitteeBuilder::new(self.epoch);
-        for a in authorities.iter() {
-            committee_builder = committee_builder.add_authority(
-                a.public_key().clone(),
-                self.stake.pop_front().unwrap_or(1),
-                a.address.clone(),
-                a.network_public_key(),
-                a.address.to_string(),
-            );
-        }
-        let committee = committee_builder.build();
-
-        // Update the Fixtures with the id assigned from the committee
-        for authority in authorities.iter_mut() {
-            let a = committee
-                .authority_by_key(authority.keypair.public())
-                .unwrap();
-            authority.authority = OnceCell::with_value(a.clone());
-            authority.stake = a.stake();
-        }
-
-        // Now update the stake to follow the order of the authorities so we produce
-        // expected results
-        let authorities: Vec<AuthorityFixture> = authorities
-            .into_iter()
-            .map(|mut authority| {
-                authority.stake = self.stake.pop_front().unwrap_or(1);
-                authority
-            })
-            .collect();
-
-        CommitteeFixture {
-            authorities,
-            committee,
-            epoch: self.epoch,
-        }
-    }
-}
-
-pub struct CommitteeFixture {
-    authorities: Vec<AuthorityFixture>,
-    committee: Committee,
-    epoch: Epoch,
-}
-
-impl CommitteeFixture {
-    pub fn authority(&self, index: usize) -> &AuthorityFixture {
-        &self.authorities[index]
-    }
-
-    pub fn authorities(&self) -> impl Iterator<Item = &AuthorityFixture> {
-        self.authorities.iter()
-    }
-
-    pub fn builder() -> Builder {
-        Builder::new()
-    }
-
-    pub fn committee(&self) -> Committee {
-        self.committee.clone()
-    }
-
-    pub fn worker_cache(&self) -> WorkerCache {
-        WorkerCache {
-            epoch: self.epoch,
-            workers: self
-                .authorities
-                .iter()
-                .map(|a| (a.public_key(), a.worker_index()))
-                .collect(),
-        }
-    }
-
-    // pub fn header(&self, author: PublicKey) -> Header {
-    // Currently sign with the last authority
-    pub fn header(&self) -> Header {
-        self.authorities.last().unwrap().header(&self.committee())
-    }
-
-    pub fn headers(&self) -> Vec<Header> {
-        let committee = self.committee();
-
-        self.authorities
-            .iter()
-            .map(|a| a.header_with_round(&committee, 1))
-            .collect()
-    }
-
-    pub fn headers_next_round(&self) -> Vec<Header> {
-        let committee = self.committee();
-        self.authorities
-            .iter()
-            .map(|a| a.header_with_round(&committee, 2))
-            .collect()
-    }
-
-    pub fn headers_round(
-        &self,
-        prior_round: Round,
-        parents: &BTreeSet<CertificateDigest>,
-    ) -> (Round, Vec<Header>) {
-        let round = prior_round + 1;
-        let next_headers = self
-            .authorities
-            .iter()
-            .map(|a| {
-                let builder = types::HeaderV1Builder::default();
-                let header = builder
-                    .author(a.id())
-                    .round(round)
-                    .epoch(0)
-                    .parents(parents.clone())
-                    .with_payload_batch(fixture_batch_with_transactions(10), 0, 0)
-                    .build()
-                    .unwrap();
-                Header::V1(header)
-            })
-            .collect();
-
-        (round, next_headers)
-    }
-
-    pub fn votes(&self, header: &Header) -> Vec<Vote> {
-        self.authorities()
-            .flat_map(|a| {
-                // we should not re-sign using the key of the authority
-                // that produced the header
-                if a.id() == header.author() {
-                    None
-                } else {
-                    Some(a.vote(header))
-                }
-            })
-            .collect()
-    }
-
-    pub fn certificate(&self, header: &Header) -> Certificate {
-        let committee = self.committee();
-        let votes: Vec<_> = self
-            .votes(header)
-            .into_iter()
-            .map(|x| (x.author(), x.signature().clone()))
-            .collect();
-        Certificate::new_unverified(&committee, header.clone(), votes).unwrap()
-    }
-}
-
-pub struct AuthorityFixture {
-    authority: OnceCell<Authority>,
-    keypair: KeyPair,
-    network_keypair: NetworkKeyPair,
-    stake: Stake,
-    address: Multiaddr,
-    workers: BTreeMap<WorkerId, WorkerFixture>,
-}
-
-impl AuthorityFixture {
-    pub fn id(&self) -> AuthorityIdentifier {
-        self.authority.get().unwrap().id()
-    }
-
-    pub fn authority(&self) -> &Authority {
-        self.authority.get().unwrap()
-    }
-
-    pub fn keypair(&self) -> &KeyPair {
-        &self.keypair
-    }
-
-    pub fn network_keypair(&self) -> NetworkKeyPair {
-        self.network_keypair.copy()
-    }
-
-    pub fn new_network(&self, router: anemo::Router) -> anemo::Network {
-        anemo::Network::bind(self.address.to_anemo_address().unwrap())
-            .server_name("narwhal")
-            .private_key(self.network_keypair().private().0.to_bytes())
-            .start(router)
-            .unwrap()
-    }
-
-    pub fn address(&self) -> &Multiaddr {
-        &self.address
-    }
-
-    pub fn worker(&self, id: WorkerId) -> &WorkerFixture {
-        self.workers.get(&id).unwrap()
-    }
-
-    pub fn worker_keypairs(&self) -> Vec<NetworkKeyPair> {
-        self.workers
-            .values()
-            .map(|worker| worker.keypair.copy())
-            .collect()
-    }
-
-    pub fn public_key(&self) -> PublicKey {
-        self.keypair.public().clone()
-    }
-
-    pub fn network_public_key(&self) -> NetworkPublicKey {
-        self.network_keypair.public().clone()
-    }
-
-    pub fn worker_index(&self) -> WorkerIndex {
-        WorkerIndex(
-            self.workers
-                .iter()
-                .map(|(id, w)| (*id, w.info.clone()))
-                .collect(),
-        )
-    }
-
-    pub fn header(&self, committee: &Committee) -> Header {
-        let header = self
-            .header_builder(committee)
-            .payload(Default::default())
-            .build()
-            .unwrap();
-        Header::V1(header)
-    }
-
-    pub fn header_with_round(&self, committee: &Committee, round: Round) -> Header {
-        let header = self
-            .header_builder(committee)
-            .payload(Default::default())
-            .round(round)
-            .build()
-            .unwrap();
-        Header::V1(header)
-    }
-
-    pub fn header_builder(&self, committee: &Committee) -> types::HeaderV1Builder {
-        types::HeaderV1Builder::default()
-            .author(self.id())
-            .round(1)
-            .epoch(committee.epoch())
-            .parents(
-                Certificate::genesis(committee)
-                    .iter()
-                    .map(|x| x.digest())
-                    .collect(),
-            )
-    }
-
-    pub fn vote(&self, header: &Header) -> Vote {
-        Vote::new_with_signer(header, &self.id(), &self.keypair)
-    }
-
-    fn generate<R, P>(mut rng: R, number_of_workers: NonZeroUsize, mut get_port: P) -> Self
-    where
-        R: AllowedRng,
-        P: FnMut(&str) -> u16,
-    {
-        let keypair = KeyPair::generate(&mut rng);
-        let network_keypair = NetworkKeyPair::generate(&mut rng);
-        let host = "127.0.0.1";
-        let address: Multiaddr = format!("/ip4/{}/udp/{}", host, get_port(host))
-            .parse()
-            .unwrap();
-
-        let workers = (0..number_of_workers.get())
-            .map(|idx| {
-                let worker = WorkerFixture::generate(&mut rng, idx as u32, &mut get_port);
-
-                (idx as u32, worker)
-            })
-            .collect();
-
-        Self {
-            authority: OnceCell::new(),
-            keypair,
-            network_keypair,
-            stake: 1,
-            address,
-            workers,
-        }
-    }
-}
-
-pub struct WorkerFixture {
-    keypair: NetworkKeyPair,
-    #[allow(dead_code)]
-    id: WorkerId,
-    info: WorkerInfo,
-}
-
-impl WorkerFixture {
-    pub fn keypair(&self) -> NetworkKeyPair {
-        self.keypair.copy()
-    }
-
-    pub fn info(&self) -> &WorkerInfo {
-        &self.info
-    }
-
-    pub fn new_network(&self, router: anemo::Router) -> anemo::Network {
-        anemo::Network::bind(self.info().worker_address.to_anemo_address().unwrap())
-            .server_name("narwhal")
-            .private_key(self.keypair().private().0.to_bytes())
-            .start(router)
-            .unwrap()
-    }
-
-    fn generate<R, P>(rng: R, id: WorkerId, mut get_port: P) -> Self
-    where
-        R: rand::RngCore + rand::CryptoRng,
-        P: FnMut(&str) -> u16,
-    {
-        let keypair = NetworkKeyPair::generate(&mut StdRng::from_rng(rng).unwrap());
-        let worker_name = keypair.public().clone();
-        let host = "127.0.0.1";
-        let worker_address = format!("/ip4/{}/udp/{}", host, get_port(host))
-            .parse()
-            .unwrap();
-        let transactions = format!("/ip4/{}/tcp/{}/http", host, get_port(host))
-            .parse()
-            .unwrap();
-
-        Self {
-            keypair,
-            id,
-            info: WorkerInfo {
-                name: worker_name,
-                worker_address,
-                transactions,
-            },
-        }
-    }
-}
-
-pub fn test_network(keypair: NetworkKeyPair, address: &Multiaddr) -> anemo::Network {
-    let address = address.to_anemo_address().unwrap();
-    let network_key = keypair.private().0.to_bytes();
-    anemo::Network::bind(address)
-        .server_name("narwhal")
-        .private_key(network_key)
-        .start(anemo::Router::new())
-        .unwrap()
-}
-
-pub fn random_network() -> anemo::Network {
-    let network_key = NetworkKeyPair::generate(&mut StdRng::from_rng(OsRng).unwrap());
-    let address = "/ip4/127.0.0.1/udp/0".parse().unwrap();
-    test_network(network_key, &address)
-}
diff --git a/narwhal/types/Cargo.toml b/narwhal/types/Cargo.toml
deleted file mode 100644
index 3f8057f66be..00000000000
--- a/narwhal/types/Cargo.toml
+++ /dev/null
@@ -1,63 +0,0 @@
-[package]
-name = "narwhal-types"
-version = "0.1.0"
-authors = ["IOTA Foundation <info@iota.org>"]
-edition = "2021"
-license = "Apache-2.0"
-publish = false
-
-[dependencies]
-# external dependencies
-anyhow.workspace = true
-base64.workspace = true
-bcs.workspace = true
-bytes.workspace = true
-derive_builder = "0.12.0"
-enum_dispatch.workspace = true
-fastcrypto.workspace = true
-futures.workspace = true
-indexmap.workspace = true
-once_cell.workspace = true
-proptest.workspace = true
-proptest-derive.workspace = true
-prost.workspace = true
-rand.workspace = true
-roaring.workspace = true
-serde.workspace = true
-serde_with.workspace = true
-thiserror.workspace = true
-tokio = { workspace = true, features = ["sync", "rt", "macros"] }
-tonic.workspace = true
-tracing.workspace = true
-
-# internal dependencies
-config = { path = "../config", package = "narwhal-config" }
-crypto = { path = "../crypto", package = "narwhal-crypto" }
-iota-common.workspace = true
-iota-network-stack.workspace = true
-iota-util-mem.workspace = true
-
-[dev-dependencies]
-# external dependencies
-criterion.workspace = true
-prometheus.workspace = true
-serde_test = "1.0.147"
-
-# internal dependencies
-iota-metrics.workspace = true
-test-utils = { path = "../test-utils", package = "narwhal-test-utils" }
-
-[build-dependencies]
-tonic-build.workspace = true
-
-[features]
-default = []
-test = []
-
-[[bench]]
-name = "batch_digest"
-harness = false
-
-[[bench]]
-name = "verify_certificate"
-harness = false
diff --git a/narwhal/types/benches/batch_digest.rs b/narwhal/types/benches/batch_digest.rs
deleted file mode 100644
index a8e2f4b51e1..00000000000
--- a/narwhal/types/benches/batch_digest.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-use criterion::{
-    BenchmarkId, Criterion, SamplingMode, Throughput, criterion_group, criterion_main,
-};
-use fastcrypto::hash::Hash;
-use narwhal_types as types;
-use rand::Rng;
-use types::Batch;
-
-pub fn batch_digest(c: &mut Criterion) {
-    let mut digest_group = c.benchmark_group("Batch digests");
-    digest_group.sampling_mode(SamplingMode::Flat);
-
-    static BATCH_SIZES: [usize; 4] = [100, 500, 1000, 5000];
-
-    for size in BATCH_SIZES {
-        let tx_gen = || {
-            (0..512)
-                .map(|_| rand::thread_rng().gen())
-                .collect::<Vec<u8>>()
-        };
-        let batch = Batch::new((0..size).map(|_| tx_gen()).collect::<Vec<_>>());
-        digest_group.throughput(Throughput::Bytes(512 * size as u64));
-        digest_group.bench_with_input(BenchmarkId::new("batch digest", size), &batch, |b, i| {
-            b.iter(|| i.digest())
-        });
-    }
-}
-
-criterion_group! {
-    name = consensus_group;
-    config = Criterion::default();
-    targets = batch_digest
-}
-criterion_main!(consensus_group);
diff --git a/narwhal/types/benches/verify_certificate.rs b/narwhal/types/benches/verify_certificate.rs
deleted file mode 100644
index 16f65e2d1b7..00000000000
--- a/narwhal/types/benches/verify_certificate.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-use std::collections::BTreeSet;
-
-use criterion::{
-    BenchmarkId, Criterion, SamplingMode, Throughput, criterion_group, criterion_main,
-};
-use fastcrypto::{hash::Hash, traits::KeyPair};
-use narwhal_types::Certificate;
-use test_utils::{CommitteeFixture, make_optimal_signed_certificates};
-
-pub fn verify_certificates(c: &mut Criterion) {
-    let mut bench_group = c.benchmark_group("verify_certificate");
-    bench_group.sampling_mode(SamplingMode::Flat);
-
-    static COMMITTEE_SIZES: [usize; 4] = [4, 10, 40, 100];
-    for committee_size in COMMITTEE_SIZES {
-        let fixture = CommitteeFixture::builder()
-            .committee_size(committee_size.try_into().unwrap())
-            .build();
-        let committee = fixture.committee();
-        let keys: Vec<_> = fixture
-            .authorities()
-            .map(|a| (a.id(), a.keypair().copy()))
-            .collect();
-
-        // process certificates for rounds, check we don't grow the dag too much
-        let genesis = Certificate::genesis(&committee)
-            .iter()
-            .map(|x| x.digest())
-            .collect::<BTreeSet<_>>();
-        let (certificates, _next_parents) =
-            make_optimal_signed_certificates(1..=1, &genesis, &committee, keys.as_slice());
-        let certificate = certificates.front().unwrap().clone();
-
-        let data_size: usize = bcs::to_bytes(&certificate).unwrap().len();
-        bench_group.throughput(Throughput::Bytes(data_size as u64));
-
-        bench_group.bench_with_input(
-            BenchmarkId::new("with_committee_size", committee_size),
-            &certificate,
-            |b, cert| {
-                let worker_cache = fixture.worker_cache();
-                b.iter(|| {
-                    cert.clone()
-                        .verify(&committee, &worker_cache)
-                        .expect("Verification failed");
-                })
-            },
-        );
-    }
-}
-
-criterion_group! {
-    name = verify_certificate;
-    config = Criterion::default().sample_size(1000).noise_threshold(0.1);
-    targets = verify_certificates
-}
-criterion_main!(verify_certificate);
diff --git a/narwhal/types/build.rs b/narwhal/types/build.rs
deleted file mode 100644
index b794e87509f..00000000000
--- a/narwhal/types/build.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-use std::{env, path::PathBuf};
-
-type Result<T> = std::result::Result<T, Box<dyn std::error::Error + Send + Sync>>;
-
-fn main() -> Result<()> {
-    let out_dir = if env::var("DUMP_GENERATED_GRPC").is_ok() {
-        PathBuf::from("")
-    } else {
-        PathBuf::from(env::var("OUT_DIR")?)
-    };
-
-    let codec_path = "tonic::codec::ProstCodec";
-
-    let service = tonic_build::manual::Service::builder()
-        .name("Transactions")
-        .package("narwhal")
-        .method(
-            tonic_build::manual::Method::builder()
-                .name("submit_transaction")
-                .route_name("SubmitTransaction")
-                .input_type("crate::proto::narwhal::Transaction")
-                .output_type("crate::proto::narwhal::Empty")
-                .codec_path(codec_path)
-                .build(),
-        )
-        .method(
-            tonic_build::manual::Method::builder()
-                .name("submit_transaction_stream")
-                .route_name("SubmitTransactionStream")
-                .input_type("crate::proto::narwhal::Transaction")
-                .output_type("crate::proto::narwhal::Empty")
-                .codec_path(codec_path)
-                .client_streaming()
-                .build(),
-        )
-        .build();
-
-    tonic_build::manual::Builder::new()
-        .out_dir(&out_dir)
-        .compile(&[service]);
-
-    println!("cargo:rerun-if-changed=build.rs");
-    println!("cargo:rerun-if-env-changed=DUMP_GENERATED_GRPC");
-
-    Ok(())
-}
diff --git a/narwhal/types/proptest-regressions/tests/batch_serde.txt b/narwhal/types/proptest-regressions/tests/batch_serde.txt
deleted file mode 100644
index 562b5e7e30f..00000000000
--- a/narwhal/types/proptest-regressions/tests/batch_serde.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Seeds for failure cases proptest has generated in the past. It is
-# automatically read and these particular cases re-run before any
-# novel cases are generated.
-#
-# It is recommended to check this file in to source control so that
-# everyone who runs the test benefits from these saved cases.
-cc 52ff0bb8b13b7b46533af299298bfab7b8b98c33fa2aa286f1e053abdc4ae37e # shrinks to batch = Batch { timestamp_ms: 0, transactions: [[0]] }
diff --git a/narwhal/types/proptest-regressions/tests/primary_type_tests.txt b/narwhal/types/proptest-regressions/tests/primary_type_tests.txt
deleted file mode 100644
index d6337d7bc9b..00000000000
--- a/narwhal/types/proptest-regressions/tests/primary_type_tests.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Seeds for failure cases proptest has generated in the past. It is
-# automatically read and these particular cases re-run before any
-# novel cases are generated.
-#
-# It is recommended to check this file in to source control so that
-# everyone who runs the test benefits from these saved cases.
-cc d19c2bf3c69060e63b32480c0ab2983dfff35973a38efcb3457b3d55f23d3aef # shrinks to header = AAAAAAAAAAAAAAAA: B0(uF3Z1uPjTqBCVmJ6t3tVZHfxkV9/AGUSj+ffMZCjB8n+19vDFrgS7mKbkUzOQUjMFhbIVTqz428QKyE7OiHtDfi3M2Xj2XDNn+cKqKSQ+ley/nKvDuM7K61C0OrjBKDn, E0, 0B)
diff --git a/narwhal/types/src/consensus.rs b/narwhal/types/src/consensus.rs
deleted file mode 100644
index 2633ca815d8..00000000000
--- a/narwhal/types/src/consensus.rs
+++ /dev/null
@@ -1,628 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-#![allow(clippy::mutable_key_type)]
-
-use std::{
-    cmp::Ordering,
-    collections::HashMap,
-    fmt,
-    fmt::{Display, Formatter},
-    sync::Arc,
-};
-
-use config::{AuthorityIdentifier, Committee};
-use enum_dispatch::enum_dispatch;
-use fastcrypto::hash::{Digest, Hash, HashFunction};
-use serde::{Deserialize, Serialize};
-use tokio::sync::mpsc;
-use tracing::warn;
-
-use crate::{Batch, Certificate, CertificateAPI, CertificateDigest, HeaderAPI, Round, TimestampMs};
-
-/// A global sequence number assigned to every CommittedSubDag.
-pub type SequenceNumber = u64;
-
-#[derive(Clone, Debug)]
-/// The output of Consensus, which includes all the batches for each certificate
-/// in the sub dag It is sent to the ExecutionState
-/// handle_consensus_transactions
-pub struct ConsensusOutput {
-    pub sub_dag: Arc<CommittedSubDag>,
-    /// Matches certificates in the `sub_dag` one-to-one.
-    pub batches: Vec<Vec<Batch>>,
-}
-
-impl Hash<{ crypto::DIGEST_LENGTH }> for ConsensusOutput {
-    type TypedDigest = ConsensusOutputDigest;
-
-    fn digest(&self) -> ConsensusOutputDigest {
-        let mut hasher = crypto::DefaultHashFunction::new();
-        hasher.update(self.sub_dag.digest());
-        self.batches.iter().flatten().for_each(|b| {
-            hasher.update(b.digest());
-        });
-        ConsensusOutputDigest(hasher.finalize().into())
-    }
-}
-
-impl Display for ConsensusOutput {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "ConsensusOutput(round={:?}, sub_dag_index={:?}, timestamp={:?}, digest={:?})",
-            self.sub_dag.leader_round(),
-            self.sub_dag.sub_dag_index,
-            self.sub_dag.commit_timestamp(),
-            self.digest()
-        )
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug)]
-pub struct CommittedSubDag {
-    /// The sequence of committed certificates.
-    pub certificates: Vec<Certificate>,
-    /// The leader certificate responsible of committing this sub-dag.
-    pub leader: Certificate,
-    /// The index associated with this CommittedSubDag
-    pub sub_dag_index: SequenceNumber,
-    /// The so far calculated reputation score for nodes
-    pub reputation_score: ReputationScores,
-    /// The timestamp that should identify this commit. This is guaranteed to be
-    /// monotonically incremented. This is not necessarily the leader's
-    /// timestamp. We compare the leader's timestamp with the previously
-    /// committed sud dag timestamp and we always keep the max. Property is
-    /// explicitly private so the method commit_timestamp() should be used
-    /// instead which bears additional resolution logic.
-    commit_timestamp: TimestampMs,
-}
-
-impl CommittedSubDag {
-    pub fn new(
-        certificates: Vec<Certificate>,
-        leader: Certificate,
-        sub_dag_index: SequenceNumber,
-        reputation_score: ReputationScores,
-        previous_sub_dag: Option<&CommittedSubDag>,
-    ) -> Self {
-        // Narwhal enforces some invariants on the header.created_at, so we can use it
-        // as a timestamp.
-        let previous_sub_dag_ts = previous_sub_dag
-            .map(|s| s.commit_timestamp)
-            .unwrap_or_default();
-        let commit_timestamp = previous_sub_dag_ts.max(*leader.header().created_at());
-
-        if previous_sub_dag_ts > *leader.header().created_at() {
-            warn!(sub_dag_index = ?sub_dag_index, "Leader timestamp {} is older than previously committed sub dag timestamp {}. Auto-correcting to max {}.",
-            leader.header().created_at(), previous_sub_dag_ts, commit_timestamp);
-        }
-
-        Self {
-            certificates,
-            leader,
-            sub_dag_index,
-            reputation_score,
-            commit_timestamp,
-        }
-    }
-
-    pub fn from_commit(
-        commit: ConsensusCommit,
-        certificates: Vec<Certificate>,
-        leader: Certificate,
-    ) -> Self {
-        Self {
-            certificates,
-            leader,
-            sub_dag_index: commit.sub_dag_index(),
-            reputation_score: commit.reputation_score(),
-            commit_timestamp: commit.commit_timestamp(),
-        }
-    }
-
-    pub fn len(&self) -> usize {
-        self.certificates.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-
-    pub fn num_batches(&self) -> usize {
-        self.certificates
-            .iter()
-            .map(|x| x.header().payload().len())
-            .sum()
-    }
-
-    pub fn is_last(&self, output: &Certificate) -> bool {
-        self.certificates
-            .iter()
-            .last()
-            .map_or_else(|| false, |x| x == output)
-    }
-
-    pub fn leader_round(&self) -> Round {
-        self.leader.round()
-    }
-
-    pub fn commit_timestamp(&self) -> TimestampMs {
-        // If commit_timestamp is zero, then safely assume that this is an upgraded node
-        // that is replaying this commit and field is never initialised. It's
-        // safe to fallback on leader's timestamp.
-        if self.commit_timestamp == 0 {
-            return *self.leader.header().created_at();
-        }
-        self.commit_timestamp
-    }
-}
-
-impl Hash<{ crypto::DIGEST_LENGTH }> for CommittedSubDag {
-    type TypedDigest = ConsensusOutputDigest;
-
-    fn digest(&self) -> ConsensusOutputDigest {
-        let mut hasher = crypto::DefaultHashFunction::new();
-        // Instead of hashing serialized CommittedSubDag, hash the certificate digests
-        // instead. Signatures in the certificates are not part of the
-        // commitment.
-        for cert in &self.certificates {
-            hasher.update(cert.digest());
-        }
-        hasher.update(self.leader.digest());
-        hasher.update(
-            bcs::to_bytes(&self.sub_dag_index).unwrap_or_else(|_| {
-                panic!("Serialization of {} should not fail", self.sub_dag_index)
-            }),
-        );
-        hasher.update(bcs::to_bytes(&self.reputation_score).unwrap_or_else(|_| {
-            panic!(
-                "Serialization of {:?} should not fail",
-                self.reputation_score
-            )
-        }));
-        hasher.update(bcs::to_bytes(&self.commit_timestamp).unwrap_or_else(|_| {
-            panic!("Serialization of {} should not fail", self.commit_timestamp)
-        }));
-        ConsensusOutputDigest(hasher.finalize().into())
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug, Default, Eq, PartialEq)]
-pub struct ReputationScores {
-    /// Holds the score for every authority. If an authority is not amongst
-    /// the records of the map then we assume that its score is zero.
-    pub scores_per_authority: HashMap<AuthorityIdentifier, u64>,
-    /// When true it notifies us that those scores will be the last updated
-    /// scores of the current schedule before they get reset for the next
-    /// schedule and start scoring from the beginning. In practice we can
-    /// leverage this information to use the scores during the next schedule
-    /// until the next final ones are calculated.
-    pub final_of_schedule: bool,
-}
-
-impl ReputationScores {
-    /// Creating a new ReputationScores instance pre-populating the authorities
-    /// entries with zero score value.
-    pub fn new(committee: &Committee) -> Self {
-        let scores_per_authority = committee.authorities().map(|a| (a.id(), 0_u64)).collect();
-
-        Self {
-            scores_per_authority,
-            ..Default::default()
-        }
-    }
-    /// Adds the provided `score` to the existing score for the provided
-    /// `authority`
-    pub fn add_score(&mut self, authority: AuthorityIdentifier, score: u64) {
-        self.scores_per_authority
-            .entry(authority)
-            .and_modify(|value| *value += score)
-            .or_insert(score);
-    }
-
-    pub fn total_authorities(&self) -> u64 {
-        self.scores_per_authority.len() as u64
-    }
-
-    pub fn all_zero(&self) -> bool {
-        !self.scores_per_authority.values().any(|e| *e > 0)
-    }
-
-    // Returns the authorities in score descending order.
-    pub fn authorities_by_score_desc(&self) -> Vec<(AuthorityIdentifier, u64)> {
-        let mut authorities: Vec<_> = self
-            .scores_per_authority
-            .iter()
-            .map(|(authority, score)| (*authority, *score))
-            .collect();
-
-        authorities.sort_by(|a1, a2| {
-            match a2.1.cmp(&a1.1) {
-                Ordering::Equal => {
-                    // we resolve the score equality deterministically by ordering in authority
-                    // identifier order descending.
-                    a2.0.cmp(&a1.0)
-                }
-                result => result,
-            }
-        });
-
-        authorities
-    }
-}
-
-#[enum_dispatch(ConsensusCommitAPI)]
-trait ConsensusCommitAPI {
-    fn certificates(&self) -> Vec<CertificateDigest>;
-    fn leader(&self) -> CertificateDigest;
-    fn leader_round(&self) -> Round;
-    fn sub_dag_index(&self) -> SequenceNumber;
-    fn reputation_score(&self) -> ReputationScores;
-    fn commit_timestamp(&self) -> TimestampMs;
-}
-
-// TODO: remove once the upgrade has been rolled out. We want to keep only the
-// CommittedSubDag
-#[derive(Serialize, Deserialize, Clone, Debug)]
-pub struct CommittedSubDagShell {
-    /// The sequence of committed certificates' digests.
-    pub certificates: Vec<CertificateDigest>,
-    /// The leader certificate's digest responsible of committing this sub-dag.
-    pub leader: CertificateDigest,
-    /// The round of the leader
-    pub leader_round: Round,
-    /// Sequence number of the CommittedSubDag
-    pub sub_dag_index: SequenceNumber,
-    /// The so far calculated reputation score for nodes
-    pub reputation_score: ReputationScores,
-}
-
-impl ConsensusCommitAPI for CommittedSubDagShell {
-    fn certificates(&self) -> Vec<CertificateDigest> {
-        self.certificates.clone()
-    }
-
-    fn leader(&self) -> CertificateDigest {
-        self.leader
-    }
-
-    fn leader_round(&self) -> Round {
-        self.leader_round
-    }
-
-    fn sub_dag_index(&self) -> SequenceNumber {
-        self.sub_dag_index
-    }
-
-    fn reputation_score(&self) -> ReputationScores {
-        self.reputation_score.clone()
-    }
-
-    fn commit_timestamp(&self) -> TimestampMs {
-        // We explicitly return 0 as we don't have this information stored already. This
-        // will be handle accordingly to the CommittedSubdag struct.
-        0
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug)]
-pub struct ConsensusCommitV2 {
-    /// The sequence of committed certificates' digests.
-    pub certificates: Vec<CertificateDigest>,
-    /// The leader certificate's digest responsible of committing this sub-dag.
-    pub leader: CertificateDigest,
-    /// The round of the leader
-    pub leader_round: Round,
-    /// Sequence number of the CommittedSubDag
-    pub sub_dag_index: SequenceNumber,
-    /// The so far calculated reputation score for nodes
-    pub reputation_score: ReputationScores,
-    /// The timestamp that should identify this commit. This is guaranteed to be
-    /// monotonically incremented
-    pub commit_timestamp: TimestampMs,
-}
-
-impl ConsensusCommitV2 {
-    pub fn from_sub_dag(sub_dag: &CommittedSubDag) -> Self {
-        Self {
-            certificates: sub_dag.certificates.iter().map(|x| x.digest()).collect(),
-            leader: sub_dag.leader.digest(),
-            leader_round: sub_dag.leader.round(),
-            sub_dag_index: sub_dag.sub_dag_index,
-            reputation_score: sub_dag.reputation_score.clone(),
-            commit_timestamp: sub_dag.commit_timestamp,
-        }
-    }
-}
-
-impl ConsensusCommitAPI for ConsensusCommitV2 {
-    fn certificates(&self) -> Vec<CertificateDigest> {
-        self.certificates.clone()
-    }
-
-    fn leader(&self) -> CertificateDigest {
-        self.leader
-    }
-
-    fn leader_round(&self) -> Round {
-        self.leader_round
-    }
-
-    fn sub_dag_index(&self) -> SequenceNumber {
-        self.sub_dag_index
-    }
-
-    fn reputation_score(&self) -> ReputationScores {
-        self.reputation_score.clone()
-    }
-
-    fn commit_timestamp(&self) -> TimestampMs {
-        self.commit_timestamp
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug)]
-#[enum_dispatch(ConsensusCommitAPI)]
-pub enum ConsensusCommit {
-    V1(CommittedSubDagShell),
-    V2(ConsensusCommitV2),
-}
-
-impl ConsensusCommit {
-    pub fn certificates(&self) -> Vec<CertificateDigest> {
-        match self {
-            ConsensusCommit::V1(sub_dag) => sub_dag.certificates(),
-            ConsensusCommit::V2(sub_dag) => sub_dag.certificates(),
-        }
-    }
-
-    pub fn leader(&self) -> CertificateDigest {
-        match self {
-            ConsensusCommit::V1(sub_dag) => sub_dag.leader(),
-            ConsensusCommit::V2(sub_dag) => sub_dag.leader(),
-        }
-    }
-
-    pub fn leader_round(&self) -> Round {
-        match self {
-            ConsensusCommit::V1(sub_dag) => sub_dag.leader_round(),
-            ConsensusCommit::V2(sub_dag) => sub_dag.leader_round(),
-        }
-    }
-
-    pub fn sub_dag_index(&self) -> SequenceNumber {
-        match self {
-            ConsensusCommit::V1(sub_dag) => sub_dag.sub_dag_index(),
-            ConsensusCommit::V2(sub_dag) => sub_dag.sub_dag_index(),
-        }
-    }
-
-    pub fn reputation_score(&self) -> ReputationScores {
-        match self {
-            ConsensusCommit::V1(sub_dag) => sub_dag.reputation_score(),
-            ConsensusCommit::V2(sub_dag) => sub_dag.reputation_score(),
-        }
-    }
-
-    pub fn commit_timestamp(&self) -> TimestampMs {
-        match self {
-            ConsensusCommit::V1(sub_dag) => sub_dag.commit_timestamp(),
-            ConsensusCommit::V2(sub_dag) => sub_dag.commit_timestamp(),
-        }
-    }
-}
-
-impl CommittedSubDagShell {
-    pub fn from_sub_dag(sub_dag: &CommittedSubDag) -> Self {
-        Self {
-            certificates: sub_dag.certificates.iter().map(|x| x.digest()).collect(),
-            leader: sub_dag.leader.digest(),
-            leader_round: sub_dag.leader.round(),
-            sub_dag_index: sub_dag.sub_dag_index,
-            reputation_score: sub_dag.reputation_score.clone(),
-        }
-    }
-}
-
-/// Shutdown token dropped when a task is properly shut down.
-pub type ShutdownToken = mpsc::Sender<()>;
-
-// Digest of ConsususOutput and CommittedSubDag.
-// In non-byzantine environment, ConsensusOutputDigest of each consensus output
-// in different validator must be the same.
-#[derive(Clone, Copy, Default, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
-pub struct ConsensusOutputDigest([u8; crypto::DIGEST_LENGTH]);
-
-impl ConsensusOutputDigest {
-    pub const fn into_inner(self) -> [u8; crypto::DIGEST_LENGTH] {
-        self.0
-    }
-}
-
-impl AsRef<[u8]> for ConsensusOutputDigest {
-    fn as_ref(&self) -> &[u8] {
-        &self.0
-    }
-}
-
-impl From<ConsensusOutputDigest> for Digest<{ crypto::DIGEST_LENGTH }> {
-    fn from(d: ConsensusOutputDigest) -> Self {
-        Digest::new(d.0)
-    }
-}
-
-impl fmt::Debug for ConsensusOutputDigest {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        write!(
-            f,
-            "{}",
-            base64::Engine::encode(&base64::engine::general_purpose::STANDARD, self.0)
-        )
-    }
-}
-
-impl fmt::Display for ConsensusOutputDigest {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        write!(
-            f,
-            "{}",
-            base64::Engine::encode(&base64::engine::general_purpose::STANDARD, self.0)
-                .get(0..16)
-                .ok_or(fmt::Error)?
-        )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::{collections::BTreeSet, num::NonZeroUsize};
-
-    use config::AuthorityIdentifier;
-    use indexmap::IndexMap;
-    use test_utils::CommitteeFixture;
-
-    use crate::{Certificate, CommittedSubDag, Header, HeaderV1Builder, ReputationScores};
-
-    #[test]
-    fn test_zero_timestamp_in_sub_dag() {
-        let fixture = CommitteeFixture::builder().build();
-        let committee = fixture.committee();
-
-        let header_builder = HeaderV1Builder::default();
-        let header = header_builder
-            .author(AuthorityIdentifier(1u16))
-            .round(2)
-            .epoch(0)
-            .created_at(50)
-            .payload(IndexMap::new())
-            .parents(BTreeSet::new())
-            .build()
-            .unwrap();
-
-        let certificate =
-            Certificate::new_unsigned(&committee, Header::V1(header), Vec::new()).unwrap();
-
-        // AND we initialise the sub dag via the "restore" way
-        let sub_dag_round = CommittedSubDag {
-            certificates: vec![certificate.clone()],
-            leader: certificate,
-            sub_dag_index: 1,
-            reputation_score: ReputationScores::default(),
-            commit_timestamp: 0,
-        };
-
-        // AND commit timestamp is the leader's timestamp
-        assert_eq!(sub_dag_round.commit_timestamp(), 50);
-    }
-
-    #[test]
-    fn test_monotonically_incremented_commit_timestamps() {
-        // Create a certificate (leader) of round 2 with a high timestamp
-        let newer_timestamp = 100;
-        let older_timestamp = 50;
-
-        let fixture = CommitteeFixture::builder().build();
-        let committee = fixture.committee();
-
-        let header_builder = HeaderV1Builder::default();
-        let header = header_builder
-            .author(AuthorityIdentifier(1u16))
-            .round(2)
-            .epoch(0)
-            .created_at(newer_timestamp)
-            .payload(IndexMap::new())
-            .parents(BTreeSet::new())
-            .build()
-            .unwrap();
-
-        let certificate =
-            Certificate::new_unsigned(&committee, Header::V1(header), Vec::new()).unwrap();
-
-        // AND
-        let sub_dag_round_2 = CommittedSubDag::new(
-            vec![certificate.clone()],
-            certificate,
-            1,
-            ReputationScores::default(),
-            None,
-        );
-
-        // AND commit timestamp is the leader's timestamp
-        assert_eq!(sub_dag_round_2.commit_timestamp, newer_timestamp);
-
-        // Now create the leader of round 4 with the older timestamp
-        let header_builder = HeaderV1Builder::default();
-        let header = header_builder
-            .author(AuthorityIdentifier(1u16))
-            .round(4)
-            .epoch(0)
-            .created_at(older_timestamp)
-            .payload(IndexMap::new())
-            .parents(BTreeSet::new())
-            .build()
-            .unwrap();
-
-        let certificate =
-            Certificate::new_unsigned(&committee, Header::V1(header), Vec::new()).unwrap();
-
-        // WHEN create the sub dag based on the "previously committed" sub dag.
-        let sub_dag_round_4 = CommittedSubDag::new(
-            vec![certificate.clone()],
-            certificate,
-            2,
-            ReputationScores::default(),
-            Some(&sub_dag_round_2),
-        );
-
-        // THEN the latest sub dag should have the highest committed timestamp -
-        // basically the same as the previous commit round
-        assert_eq!(
-            sub_dag_round_4.commit_timestamp,
-            sub_dag_round_2.commit_timestamp
-        );
-    }
-
-    #[test]
-    fn test_authority_sorting_in_reputation_scores() {
-        let fixture = CommitteeFixture::builder()
-            .committee_size(NonZeroUsize::new(10).unwrap())
-            .build();
-        let committee = fixture.committee();
-
-        let mut scores = ReputationScores::new(&committee);
-
-        let ids: Vec<AuthorityIdentifier> = fixture.authorities().map(|a| a.id()).collect();
-
-        // adding some scores
-        scores.add_score(ids[0], 0);
-        scores.add_score(ids[1], 10);
-        scores.add_score(ids[2], 10);
-        scores.add_score(ids[3], 10);
-        scores.add_score(ids[4], 10);
-        scores.add_score(ids[5], 20);
-        scores.add_score(ids[6], 30);
-        scores.add_score(ids[7], 30);
-        scores.add_score(ids[8], 40);
-        scores.add_score(ids[9], 40);
-
-        // the expected authorities
-        let expected_authorities = vec![
-            (ids[9], 40),
-            (ids[8], 40),
-            (ids[7], 30),
-            (ids[6], 30),
-            (ids[5], 20),
-            (ids[4], 10),
-            (ids[3], 10),
-            (ids[2], 10),
-            (ids[1], 10),
-            (ids[0], 0),
-        ];
-
-        // sorting the authorities
-        let sorted_authorities = scores.authorities_by_score_desc();
-        assert_eq!(sorted_authorities, expected_authorities);
-    }
-}
diff --git a/narwhal/types/src/error.rs b/narwhal/types/src/error.rs
deleted file mode 100644
index 90e1d0b30ab..00000000000
--- a/narwhal/types/src/error.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) 2021, Facebook, Inc. and its affiliates
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-use std::sync::Arc;
-
-use config::Epoch;
-use iota_common::sync::notify_once::NotifyOnce;
-use thiserror::Error;
-
-use crate::HeaderDigest;
-
-#[cfg(test)]
-#[path = "./tests/error_test.rs"]
-mod error_test;
-
-#[macro_export]
-macro_rules! bail {
-    ($e:expr) => {
-        return Err($e);
-    };
-}
-
-#[macro_export(local_inner_macros)]
-macro_rules! ensure {
-    ($cond:expr, $e:expr) => {
-        if !($cond) {
-            bail!($e);
-        }
-    };
-}
-
-pub type DagResult<T> = Result<T, DagError>;
-
-// Notification for certificate accepted.
-pub type AcceptNotification = Arc<NotifyOnce>;
-
-#[derive(Clone, Debug, Error)]
-pub enum DagError {
-    #[error("Invalid Authorities Bitmap: {0}")]
-    InvalidBitmap(String),
-
-    #[error("Invalid signature")]
-    InvalidSignature,
-
-    #[error("Invalid header digest")]
-    InvalidHeaderDigest,
-
-    #[error("Header {0} has bad worker IDs")]
-    HeaderHasBadWorkerIds(HeaderDigest),
-
-    #[error("Received message from unknown authority {0}")]
-    UnknownAuthority(String),
-
-    #[error("Received certificate without a quorum")]
-    CertificateRequiresQuorum,
-
-    #[error("Invalid epoch (expected {expected}, received {received})")]
-    InvalidEpoch { expected: Epoch, received: Epoch },
-
-    #[error("System shutting down")]
-    ShuttingDown,
-
-    #[error("Channel full")]
-    ChannelFull,
-}
-
-impl<T> From<tokio::sync::mpsc::error::TrySendError<T>> for DagError {
-    fn from(err: tokio::sync::mpsc::error::TrySendError<T>) -> Self {
-        match err {
-            tokio::sync::mpsc::error::TrySendError::Full(_) => DagError::ChannelFull,
-            tokio::sync::mpsc::error::TrySendError::Closed(_) => DagError::ShuttingDown,
-        }
-    }
-}
diff --git a/narwhal/types/src/lib.rs b/narwhal/types/src/lib.rs
deleted file mode 100644
index 137fce6551d..00000000000
--- a/narwhal/types/src/lib.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-#![forbid(unsafe_code)]
-
-// Error types
-#[macro_use]
-pub mod error;
-
-mod consensus;
-pub use consensus::*;
-
-mod primary;
-pub use primary::*;
-
-mod proto;
-pub use proto::*;
-
-mod serde;
-
-mod pre_subscribed_broadcast;
-pub use pre_subscribed_broadcast::*;
diff --git a/narwhal/types/src/pre_subscribed_broadcast.rs b/narwhal/types/src/pre_subscribed_broadcast.rs
deleted file mode 100644
index ab99c41055a..00000000000
--- a/narwhal/types/src/pre_subscribed_broadcast.rs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-use tokio::sync::{broadcast, broadcast::error::SendError};
-
-/// PreSubscribedBroadcastSender is a wrapped Broadcast channel that limits
-/// subscription to initialization time. This is designed to be used for
-/// cancellation signal to all the components, and the limitation is intended to
-/// prevent a component missing the shutdown signal due to a subscription that
-/// happens after the shutdown signal was sent. The receivers have a special
-/// peek method which can be used to conditionally check for shutdown signal on
-/// the channel.
-pub struct PreSubscribedBroadcastSender {
-    sender: broadcast::Sender<()>,
-    receivers: Vec<ConditionalBroadcastReceiver>,
-}
-
-#[derive(Debug)]
-pub struct ConditionalBroadcastReceiver {
-    pub receiver: broadcast::Receiver<()>,
-}
-
-/// ConditionalBroadcastReceiver has an additional method for convenience to be
-/// able to use to conditionally check for shutdown in all branches of a select
-/// statement. Using this method will allow for the shutdown signal to propagate
-/// faster, since we will no longer be waiting until the branch that checks the
-/// receiver is randomly selected by the select macro.
-impl ConditionalBroadcastReceiver {
-    pub async fn received_signal(&mut self) -> bool {
-        futures::future::poll_immediate(&mut Box::pin(self.receiver.recv()))
-            .await
-            .is_some()
-    }
-}
-
-impl PreSubscribedBroadcastSender {
-    pub fn new(num_subscribers: u64) -> Self {
-        let (tx_init, _) = broadcast::channel(1);
-        let mut receivers = Vec::new();
-        for _i in 0..num_subscribers {
-            receivers.push(ConditionalBroadcastReceiver {
-                receiver: tx_init.subscribe(),
-            });
-        }
-
-        PreSubscribedBroadcastSender {
-            sender: tx_init,
-            receivers,
-        }
-    }
-
-    pub fn try_subscribe(&mut self) -> Option<ConditionalBroadcastReceiver> {
-        self.receivers.pop()
-    }
-
-    pub fn subscribe(&mut self) -> ConditionalBroadcastReceiver {
-        self.receivers.pop().expect("No remaining subscribers ")
-    }
-
-    pub fn subscribe_n(&mut self, n: u64) -> Vec<ConditionalBroadcastReceiver> {
-        let mut output = Vec::new();
-        for _ in 0..n {
-            output.push(self.subscribe());
-        }
-        output
-    }
-
-    pub fn send(&self) -> Result<usize, SendError<()>> {
-        self.sender.send(())
-    }
-}
-
-#[tokio::test]
-async fn test_pre_subscribed_broadcast() {
-    let mut tx_shutdown = PreSubscribedBroadcastSender::new(2);
-    let mut rx_shutdown_a = tx_shutdown.try_subscribe().unwrap();
-
-    let a = tokio::spawn(async move {
-        loop {
-            tokio::select! {
-                _ = rx_shutdown_a.receiver.recv() => {
-                    return 1
-                }
-
-                _ = async{}, if true => {
-                    if rx_shutdown_a.received_signal().await {
-                        return 1
-                    }
-                }
-            }
-        }
-    });
-
-    let mut rx_shutdown_b = tx_shutdown.try_subscribe().unwrap();
-    let rx_shutdown_c = tx_shutdown.try_subscribe();
-
-    assert!(rx_shutdown_c.is_none());
-
-    // send the shutdown signal before we start component b and started listening
-    // for shutdown there
-    assert!(tx_shutdown.send().is_ok());
-
-    let b = tokio::spawn(async move {
-        loop {
-            tokio::select! {
-                _ = rx_shutdown_b.receiver.recv() => {
-                    return 2
-                }
-
-                _ = async{}, if true => {
-                    if rx_shutdown_b.received_signal().await {
-                        return 2
-                    }
-                }
-            }
-        }
-    });
-
-    // assert that both component a and b loops have exited, effectively shutting
-    // down
-    assert_eq!(a.await.unwrap() + b.await.unwrap(), 3);
-}
-
-#[tokio::test]
-async fn test_conditional_broadcast_receiver() {
-    let mut tx_shutdown = PreSubscribedBroadcastSender::new(2);
-    let mut rx_shutdown = tx_shutdown.try_subscribe().unwrap();
-
-    let a = tokio::spawn(async move {
-        loop {
-            tokio::select! {
-                _ = async{}, if true => {
-                    if rx_shutdown.received_signal().await {
-                        return 1
-                    }
-                }
-            }
-        }
-    });
-
-    assert!(tx_shutdown.send().is_ok());
-
-    assert_eq!(a.await.unwrap(), 1);
-}
diff --git a/narwhal/types/src/primary.rs b/narwhal/types/src/primary.rs
deleted file mode 100644
index d5ebd4cf080..00000000000
--- a/narwhal/types/src/primary.rs
+++ /dev/null
@@ -1,1556 +0,0 @@
-// Copyright (c) 2021, Facebook, Inc. and its affiliates
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-use std::{
-    collections::{BTreeMap, BTreeSet, HashMap, HashSet, VecDeque},
-    fmt,
-    time::{Duration, SystemTime},
-};
-
-use config::{AuthorityIdentifier, Committee, Epoch, Stake, WorkerCache, WorkerId};
-use crypto::{
-    AggregateSignature, AggregateSignatureBytes, NarwhalAuthorityAggregateSignature,
-    NarwhalAuthoritySignature, NetworkPublicKey, PublicKey, Signature, to_intent_message,
-};
-use derive_builder::Builder;
-use enum_dispatch::enum_dispatch;
-use fastcrypto::{
-    hash::{Digest, Hash, HashFunction},
-    signature_service::SignatureService,
-    traits::{AggregateAuthenticator, Signer, VerifyingKey},
-};
-use indexmap::IndexMap;
-use iota_util_mem::MallocSizeOf;
-use once_cell::sync::OnceCell;
-use proptest_derive::Arbitrary;
-use roaring::RoaringBitmap;
-use serde::{Deserialize, Serialize};
-use serde_with::serde_as;
-use tracing::warn;
-
-use crate::{
-    error::{DagError, DagResult},
-    serde::NarwhalBitmap,
-};
-
-/// The round number.
-pub type Round = u64;
-
-/// The epoch UNIX timestamp in milliseconds
-pub type TimestampMs = u64;
-
-pub trait Timestamp {
-    // Returns the time elapsed between the timestamp
-    // and "now". The result is a Duration.
-    fn elapsed(&self) -> Duration;
-}
-
-impl Timestamp for TimestampMs {
-    fn elapsed(&self) -> Duration {
-        let diff = now().saturating_sub(*self);
-        Duration::from_millis(diff)
-    }
-}
-
-// Returns the current time expressed as UNIX
-// timestamp in milliseconds
-pub fn now() -> TimestampMs {
-    match SystemTime::now().duration_since(SystemTime::UNIX_EPOCH) {
-        Ok(n) => n.as_millis() as TimestampMs,
-        Err(_) => panic!("SystemTime before UNIX EPOCH!"),
-    }
-}
-
-/// DEPRECATED. Can't be deleted until tables that use this are removed.
-#[derive(
-    Clone, Copy, Serialize, Deserialize, Debug, PartialEq, Eq, PartialOrd, Ord, MallocSizeOf,
-)]
-pub struct RandomnessRound(pub u64);
-
-// Additional metadata information for an entity.
-//
-// The structure as a whole is not signed. As a result this data
-// should not be treated as trustworthy data and should be used
-// for NON CRITICAL purposes only. For example should not be used
-// for any processes that are part of our protocol that can affect
-// safety or liveness.
-#[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Eq, Arbitrary, MallocSizeOf)]
-pub struct Metadata {
-    // timestamp of when the entity created. This is generated
-    // by the node which creates the entity.
-    pub created_at: TimestampMs,
-}
-
-impl Default for Metadata {
-    fn default() -> Self {
-        Metadata { created_at: now() }
-    }
-}
-
-// This is a versioned `Metadata` type
-// Refer to comments above the original `Metadata` struct for more details.
-#[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Eq, Arbitrary, MallocSizeOf)]
-#[enum_dispatch(MetadataAPI)]
-pub enum VersionedMetadata {
-    V1(MetadataV1),
-}
-
-impl VersionedMetadata {
-    pub fn new() -> Self {
-        Self::V1(MetadataV1 {
-            created_at: now(),
-            received_at: None,
-        })
-    }
-}
-
-impl Default for VersionedMetadata {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-#[enum_dispatch]
-pub trait MetadataAPI {
-    fn created_at(&self) -> &TimestampMs;
-    fn set_created_at(&mut self, ts: TimestampMs);
-    fn received_at(&self) -> Option<TimestampMs>;
-    fn set_received_at(&mut self, ts: TimestampMs);
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Eq, Arbitrary, MallocSizeOf)]
-pub struct MetadataV1 {
-    // timestamp of when the entity created. This is generated
-    // by the node which creates the entity.
-    pub created_at: TimestampMs,
-    // timestamp of when the entity was received by an other node. This will help
-    // us calculate latencies that are not affected by clock drift or network
-    // delays. This field is not set for own batches.
-    pub received_at: Option<TimestampMs>,
-}
-
-impl MetadataAPI for MetadataV1 {
-    fn created_at(&self) -> &TimestampMs {
-        &self.created_at
-    }
-
-    fn set_created_at(&mut self, ts: TimestampMs) {
-        self.created_at = ts;
-    }
-
-    fn received_at(&self) -> Option<TimestampMs> {
-        self.received_at
-    }
-
-    fn set_received_at(&mut self, ts: TimestampMs) {
-        self.received_at = Some(ts);
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Eq, Arbitrary)]
-#[enum_dispatch(BatchAPI)]
-pub enum Batch {
-    V1(BatchV1),
-}
-
-impl Batch {
-    pub fn new(transactions: Vec<Transaction>) -> Self {
-        Self::V1(BatchV1::new(transactions))
-    }
-
-    pub fn size(&self) -> usize {
-        match self {
-            Batch::V1(data) => data.size(),
-        }
-    }
-}
-
-impl Hash<{ crypto::DIGEST_LENGTH }> for Batch {
-    type TypedDigest = BatchDigest;
-
-    fn digest(&self) -> BatchDigest {
-        match self {
-            Batch::V1(data) => data.digest(),
-        }
-    }
-}
-
-#[enum_dispatch]
-pub trait BatchAPI {
-    fn transactions(&self) -> &Vec<Transaction>;
-    fn transactions_mut(&mut self) -> &mut Vec<Transaction>;
-    fn into_transactions(self) -> Vec<Transaction>;
-
-    fn versioned_metadata(&self) -> &VersionedMetadata;
-    fn versioned_metadata_mut(&mut self) -> &mut VersionedMetadata;
-}
-
-pub type Transaction = Vec<u8>;
-
-#[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Eq, Arbitrary)]
-pub struct BatchV1 {
-    pub transactions: Vec<Transaction>,
-    // This field is not included as part of the batch digest
-    pub versioned_metadata: VersionedMetadata,
-}
-
-impl BatchAPI for BatchV1 {
-    fn transactions(&self) -> &Vec<Transaction> {
-        &self.transactions
-    }
-
-    fn transactions_mut(&mut self) -> &mut Vec<Transaction> {
-        &mut self.transactions
-    }
-
-    fn into_transactions(self) -> Vec<Transaction> {
-        self.transactions
-    }
-
-    fn versioned_metadata(&self) -> &VersionedMetadata {
-        &self.versioned_metadata
-    }
-
-    fn versioned_metadata_mut(&mut self) -> &mut VersionedMetadata {
-        &mut self.versioned_metadata
-    }
-}
-
-impl BatchV1 {
-    pub fn new(transactions: Vec<Transaction>) -> Self {
-        Self {
-            transactions,
-            versioned_metadata: VersionedMetadata::new(),
-        }
-    }
-
-    pub fn size(&self) -> usize {
-        self.transactions.iter().map(|t| t.len()).sum()
-    }
-}
-
-#[derive(
-    Clone,
-    Copy,
-    Serialize,
-    Deserialize,
-    Default,
-    PartialEq,
-    Eq,
-    Hash,
-    PartialOrd,
-    Ord,
-    MallocSizeOf,
-    Arbitrary,
-)]
-pub struct BatchDigest(pub [u8; crypto::DIGEST_LENGTH]);
-
-impl fmt::Debug for BatchDigest {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        write!(
-            f,
-            "{}",
-            base64::Engine::encode(&base64::engine::general_purpose::STANDARD, self.0)
-        )
-    }
-}
-
-impl fmt::Display for BatchDigest {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        write!(
-            f,
-            "{}",
-            base64::Engine::encode(&base64::engine::general_purpose::STANDARD, self.0)
-                .get(0..16)
-                .ok_or(fmt::Error)?
-        )
-    }
-}
-
-impl From<BatchDigest> for Digest<{ crypto::DIGEST_LENGTH }> {
-    fn from(digest: BatchDigest) -> Self {
-        Digest::new(digest.0)
-    }
-}
-
-impl AsRef<[u8]> for BatchDigest {
-    fn as_ref(&self) -> &[u8] {
-        &self.0
-    }
-}
-
-impl BatchDigest {
-    pub fn new(val: [u8; crypto::DIGEST_LENGTH]) -> BatchDigest {
-        BatchDigest(val)
-    }
-}
-
-impl Hash<{ crypto::DIGEST_LENGTH }> for BatchV1 {
-    type TypedDigest = BatchDigest;
-
-    fn digest(&self) -> Self::TypedDigest {
-        BatchDigest::new(
-            crypto::DefaultHashFunction::digest_iterator(self.transactions.iter()).into(),
-        )
-    }
-}
-
-#[derive(Clone, Deserialize, MallocSizeOf, Serialize)]
-#[enum_dispatch(HeaderAPI)]
-pub enum Header {
-    V1(HeaderV1),
-}
-
-// TODO: Revisit if we should not impl Default for Header and just use
-// versioned header in Certificate
-impl Default for Header {
-    fn default() -> Self {
-        Self::V1(HeaderV1::default())
-    }
-}
-
-impl Header {
-    pub fn digest(&self) -> HeaderDigest {
-        match self {
-            Header::V1(data) => data.digest(),
-        }
-    }
-
-    pub fn validate(&self, committee: &Committee, worker_cache: &WorkerCache) -> DagResult<()> {
-        match self {
-            Header::V1(data) => data.validate(committee, worker_cache),
-        }
-    }
-
-    pub fn as_v1(&self) -> &HeaderV1 {
-        match self {
-            Header::V1(header) => header,
-        }
-    }
-}
-
-impl Hash<{ crypto::DIGEST_LENGTH }> for Header {
-    type TypedDigest = HeaderDigest;
-
-    fn digest(&self) -> HeaderDigest {
-        match self {
-            Header::V1(data) => data.digest(),
-        }
-    }
-}
-
-impl fmt::Debug for Header {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        write!(
-            f,
-            "{}: B{}({}, E{}, {}B)",
-            self.digest(),
-            self.round(),
-            self.author(),
-            self.epoch(),
-            self.payload()
-                .keys()
-                .map(|x| Digest::from(*x).size())
-                .sum::<usize>(),
-        )
-    }
-}
-
-impl fmt::Display for Header {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        match self {
-            Self::V1(data) => {
-                write!(f, "B{}({})", data.round, data.author)
-            }
-        }
-    }
-}
-
-impl PartialEq for Header {
-    fn eq(&self, other: &Self) -> bool {
-        match self {
-            Self::V1(data) => data.digest() == other.digest(),
-        }
-    }
-}
-
-#[enum_dispatch]
-pub trait HeaderAPI {
-    fn author(&self) -> AuthorityIdentifier;
-    fn round(&self) -> Round;
-    fn epoch(&self) -> Epoch;
-    fn created_at(&self) -> &TimestampMs;
-    fn payload(&self) -> &IndexMap<BatchDigest, (WorkerId, TimestampMs)>;
-    fn parents(&self) -> &BTreeSet<CertificateDigest>;
-
-    // Used for testing.
-    fn update_payload(&mut self, new_payload: IndexMap<BatchDigest, (WorkerId, TimestampMs)>);
-    fn update_round(&mut self, new_round: Round);
-    fn clear_parents(&mut self);
-}
-
-#[derive(Builder, Clone, Default, Deserialize, MallocSizeOf, Serialize)]
-#[builder(pattern = "owned", build_fn(skip))]
-pub struct HeaderV1 {
-    // Primary that created the header. Must be the same primary that broadcasted the header.
-    // Validation is at: https://github.com/iotaledger/iota/blob/f0b80d9eeef44edd9fbe606cee16717622b68651/narwhal/primary/src/primary.rs#L713-L719
-    pub author: AuthorityIdentifier,
-    pub round: Round,
-    pub epoch: Epoch,
-    pub created_at: TimestampMs,
-    #[serde(with = "indexmap::map::serde_seq")]
-    pub payload: IndexMap<BatchDigest, (WorkerId, TimestampMs)>,
-    pub parents: BTreeSet<CertificateDigest>,
-    #[serde(skip)]
-    digest: OnceCell<HeaderDigest>,
-}
-
-impl HeaderAPI for HeaderV1 {
-    fn author(&self) -> AuthorityIdentifier {
-        self.author
-    }
-    fn round(&self) -> Round {
-        self.round
-    }
-    fn epoch(&self) -> Epoch {
-        self.epoch
-    }
-    fn created_at(&self) -> &TimestampMs {
-        &self.created_at
-    }
-    fn payload(&self) -> &IndexMap<BatchDigest, (WorkerId, TimestampMs)> {
-        &self.payload
-    }
-    fn parents(&self) -> &BTreeSet<CertificateDigest> {
-        &self.parents
-    }
-
-    // Used for testing.
-    fn update_payload(&mut self, new_payload: IndexMap<BatchDigest, (WorkerId, TimestampMs)>) {
-        self.payload = new_payload;
-    }
-    fn update_round(&mut self, new_round: Round) {
-        self.round = new_round;
-    }
-    fn clear_parents(&mut self) {
-        self.parents.clear();
-    }
-}
-
-impl HeaderV1Builder {
-    pub fn build(self) -> Result<HeaderV1, fastcrypto::error::FastCryptoError> {
-        let h = HeaderV1 {
-            author: self.author.unwrap(),
-            round: self.round.unwrap(),
-            epoch: self.epoch.unwrap(),
-            created_at: self.created_at.unwrap_or(0),
-            payload: self.payload.unwrap(),
-            parents: self.parents.unwrap(),
-            digest: OnceCell::default(),
-        };
-        h.digest.set(Hash::digest(&h)).unwrap();
-
-        Ok(h)
-    }
-
-    // helper method to set directly values to the payload
-    pub fn with_payload_batch(
-        mut self,
-        batch: Batch,
-        worker_id: WorkerId,
-        created_at: TimestampMs,
-    ) -> Self {
-        if self.payload.is_none() {
-            self.payload = Some(Default::default());
-        }
-        let payload = self.payload.as_mut().unwrap();
-
-        payload.insert(batch.digest(), (worker_id, created_at));
-
-        self
-    }
-}
-
-impl HeaderV1 {
-    pub async fn new(
-        author: AuthorityIdentifier,
-        round: Round,
-        epoch: Epoch,
-        payload: IndexMap<BatchDigest, (WorkerId, TimestampMs)>,
-        parents: BTreeSet<CertificateDigest>,
-    ) -> Self {
-        let header = Self {
-            author,
-            round,
-            epoch,
-            created_at: now(),
-            payload,
-            parents,
-            digest: OnceCell::default(),
-        };
-        let digest = Hash::digest(&header);
-        header.digest.set(digest).unwrap();
-        header
-    }
-
-    pub fn digest(&self) -> HeaderDigest {
-        *self.digest.get_or_init(|| Hash::digest(self))
-    }
-
-    pub fn validate(&self, committee: &Committee, worker_cache: &WorkerCache) -> DagResult<()> {
-        // Ensure the header is from the correct epoch.
-        ensure!(self.epoch == committee.epoch(), DagError::InvalidEpoch {
-            expected: committee.epoch(),
-            received: self.epoch
-        });
-
-        // Ensure the header digest is well formed.
-        ensure!(
-            Hash::digest(self) == self.digest(),
-            DagError::InvalidHeaderDigest
-        );
-
-        // Ensure the authority has voting rights.
-        let voting_rights = committee.stake_by_id(self.author);
-        ensure!(
-            voting_rights > 0,
-            DagError::UnknownAuthority(self.author.to_string())
-        );
-
-        // Ensure all worker ids are correct.
-        for (worker_id, _) in self.payload.values() {
-            worker_cache
-                .worker(
-                    committee.authority(&self.author).unwrap().protocol_key(),
-                    worker_id,
-                )
-                .map_err(|_| DagError::HeaderHasBadWorkerIds(self.digest()))?;
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(
-    Clone,
-    Copy,
-    Serialize,
-    Deserialize,
-    Default,
-    PartialEq,
-    Eq,
-    Hash,
-    PartialOrd,
-    Ord,
-    MallocSizeOf,
-    Arbitrary,
-)]
-pub struct HeaderDigest([u8; crypto::DIGEST_LENGTH]);
-
-impl From<HeaderDigest> for Digest<{ crypto::DIGEST_LENGTH }> {
-    fn from(hd: HeaderDigest) -> Self {
-        Digest::new(hd.0)
-    }
-}
-
-impl AsRef<[u8]> for HeaderDigest {
-    fn as_ref(&self) -> &[u8] {
-        &self.0
-    }
-}
-
-impl fmt::Debug for HeaderDigest {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        write!(
-            f,
-            "{}",
-            base64::Engine::encode(&base64::engine::general_purpose::STANDARD, self.0)
-        )
-    }
-}
-
-impl fmt::Display for HeaderDigest {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        write!(
-            f,
-            "{}",
-            base64::Engine::encode(&base64::engine::general_purpose::STANDARD, self.0)
-                .get(0..16)
-                .ok_or(fmt::Error)?
-        )
-    }
-}
-
-impl Hash<{ crypto::DIGEST_LENGTH }> for HeaderV1 {
-    type TypedDigest = HeaderDigest;
-
-    fn digest(&self) -> HeaderDigest {
-        let mut hasher = crypto::DefaultHashFunction::new();
-        hasher.update(bcs::to_bytes(&self).expect("Serialization should not fail"));
-        HeaderDigest(hasher.finalize().into())
-    }
-}
-
-/// A Vote on a Header is a claim by the voting authority that all payloads and
-/// the full history of Certificates included in the Header are available.
-#[derive(Clone, Serialize, Deserialize)]
-#[enum_dispatch(VoteAPI)]
-pub enum Vote {
-    V1(VoteV1),
-}
-
-impl Vote {
-    // TODO: Add version number and match on that
-    pub async fn new(
-        header: &Header,
-        author: &AuthorityIdentifier,
-        signature_service: &SignatureService<Signature, { crypto::INTENT_MESSAGE_LENGTH }>,
-    ) -> Self {
-        Vote::V1(VoteV1::new(header, author, signature_service).await)
-    }
-
-    pub fn new_with_signer<S>(header: &Header, author: &AuthorityIdentifier, signer: &S) -> Self
-    where
-        S: Signer<Signature>,
-    {
-        Vote::V1(VoteV1::new_with_signer(header, author, signer))
-    }
-}
-
-impl Hash<{ crypto::DIGEST_LENGTH }> for Vote {
-    type TypedDigest = VoteDigest;
-
-    fn digest(&self) -> VoteDigest {
-        match self {
-            Vote::V1(data) => data.digest(),
-        }
-    }
-}
-
-#[enum_dispatch]
-pub trait VoteAPI {
-    fn header_digest(&self) -> HeaderDigest;
-    fn round(&self) -> Round;
-    fn epoch(&self) -> Epoch;
-    fn origin(&self) -> AuthorityIdentifier;
-    fn author(&self) -> AuthorityIdentifier;
-    fn signature(&self) -> &<PublicKey as VerifyingKey>::Sig;
-}
-
-#[derive(Clone, Serialize, Deserialize)]
-pub struct VoteV1 {
-    // HeaderDigest, round, epoch and origin for the header being voted on.
-    pub header_digest: HeaderDigest,
-    pub round: Round,
-    pub epoch: Epoch,
-    pub origin: AuthorityIdentifier,
-    // Author of this vote.
-    pub author: AuthorityIdentifier,
-    // Signature of the HeaderDigest.
-    pub signature: <PublicKey as VerifyingKey>::Sig,
-}
-
-impl VoteAPI for VoteV1 {
-    fn header_digest(&self) -> HeaderDigest {
-        self.header_digest
-    }
-    fn round(&self) -> Round {
-        self.round
-    }
-    fn epoch(&self) -> Epoch {
-        self.epoch
-    }
-    fn origin(&self) -> AuthorityIdentifier {
-        self.origin
-    }
-    fn author(&self) -> AuthorityIdentifier {
-        self.author
-    }
-    fn signature(&self) -> &<PublicKey as VerifyingKey>::Sig {
-        &self.signature
-    }
-}
-
-impl VoteV1 {
-    pub async fn new(
-        header: &Header,
-        author: &AuthorityIdentifier,
-        signature_service: &SignatureService<Signature, { crypto::INTENT_MESSAGE_LENGTH }>,
-    ) -> Self {
-        let vote = Self {
-            header_digest: header.digest(),
-            round: header.round(),
-            epoch: header.epoch(),
-            origin: header.author(),
-            author: *author,
-            signature: Signature::default(),
-        };
-        let signature = signature_service
-            .request_signature(vote.digest().into())
-            .await;
-        Self { signature, ..vote }
-    }
-
-    pub fn new_with_signer<S>(header: &Header, author: &AuthorityIdentifier, signer: &S) -> Self
-    where
-        S: Signer<Signature>,
-    {
-        let vote = Self {
-            header_digest: header.digest(),
-            round: header.round(),
-            epoch: header.epoch(),
-            origin: header.author(),
-            author: *author,
-            signature: Signature::default(),
-        };
-
-        let vote_digest: Digest<{ crypto::DIGEST_LENGTH }> = vote.digest().into();
-        let signature = Signature::new_secure(&to_intent_message(vote_digest), signer);
-
-        Self { signature, ..vote }
-    }
-}
-#[derive(
-    Clone, Serialize, Deserialize, Default, PartialEq, Eq, Hash, PartialOrd, Ord, Copy, Arbitrary,
-)]
-pub struct VoteDigest([u8; crypto::DIGEST_LENGTH]);
-
-impl From<VoteDigest> for Digest<{ crypto::DIGEST_LENGTH }> {
-    fn from(hd: VoteDigest) -> Self {
-        Digest::new(hd.0)
-    }
-}
-
-impl From<VoteDigest> for Digest<{ crypto::INTENT_MESSAGE_LENGTH }> {
-    fn from(digest: VoteDigest) -> Self {
-        let intent_message = to_intent_message(HeaderDigest(digest.0));
-        Digest {
-            digest: bcs::to_bytes(&intent_message)
-                .expect("Serialization message should not fail")
-                .try_into()
-                .expect("INTENT_MESSAGE_LENGTH is correct"),
-        }
-    }
-}
-
-impl fmt::Debug for VoteDigest {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        write!(
-            f,
-            "{}",
-            base64::Engine::encode(&base64::engine::general_purpose::STANDARD, self.0)
-        )
-    }
-}
-
-impl fmt::Display for VoteDigest {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        write!(
-            f,
-            "{}",
-            base64::Engine::encode(&base64::engine::general_purpose::STANDARD, self.0)
-                .get(0..16)
-                .ok_or(fmt::Error)?
-        )
-    }
-}
-
-impl Hash<{ crypto::DIGEST_LENGTH }> for VoteV1 {
-    type TypedDigest = VoteDigest;
-
-    fn digest(&self) -> VoteDigest {
-        VoteDigest(self.header_digest().0)
-    }
-}
-
-impl fmt::Debug for Vote {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        write!(
-            f,
-            "{}: V{}({}, {}, E{})",
-            self.digest(),
-            self.round(),
-            self.author(),
-            self.origin(),
-            self.epoch()
-        )
-    }
-}
-
-impl PartialEq for Vote {
-    fn eq(&self, other: &Self) -> bool {
-        self.digest() == other.digest()
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize, MallocSizeOf)]
-#[enum_dispatch(CertificateAPI)]
-pub enum Certificate {
-    V1(CertificateV1),
-}
-
-impl Certificate {
-    pub fn genesis(committee: &Committee) -> Vec<Self> {
-        CertificateV1::genesis(committee)
-            .into_iter()
-            .map(Self::V1)
-            .collect()
-    }
-
-    pub fn new_unverified(
-        committee: &Committee,
-        header: Header,
-        votes: Vec<(AuthorityIdentifier, Signature)>,
-    ) -> DagResult<Certificate> {
-        CertificateV1::new_unverified(committee, header, votes)
-    }
-
-    pub fn new_unsigned(
-        committee: &Committee,
-        header: Header,
-        votes: Vec<(AuthorityIdentifier, Signature)>,
-    ) -> DagResult<Certificate> {
-        CertificateV1::new_unsigned(committee, header, votes)
-    }
-
-    /// This function requires that certificate was verified against given
-    /// committee
-    pub fn signed_authorities(&self, committee: &Committee) -> Vec<PublicKey> {
-        match self {
-            Self::V1(certificate) => certificate.signed_authorities(committee),
-        }
-    }
-
-    pub fn signed_by(&self, committee: &Committee) -> (Stake, Vec<PublicKey>) {
-        match self {
-            Self::V1(certificate) => certificate.signed_by(committee),
-        }
-    }
-
-    pub fn verify(
-        self,
-        committee: &Committee,
-        worker_cache: &WorkerCache,
-    ) -> DagResult<Certificate> {
-        match self {
-            Self::V1(certificate) => certificate.verify(committee, worker_cache),
-        }
-    }
-
-    pub fn round(&self) -> Round {
-        match self {
-            Self::V1(certificate) => certificate.round(),
-        }
-    }
-
-    pub fn epoch(&self) -> Epoch {
-        match self {
-            Self::V1(certificate) => certificate.epoch(),
-        }
-    }
-
-    pub fn origin(&self) -> AuthorityIdentifier {
-        match self {
-            Self::V1(certificate) => certificate.origin(),
-        }
-    }
-
-    pub fn default_for_testing() -> Certificate {
-        Certificate::V1(CertificateV1::default())
-    }
-}
-
-impl Hash<{ crypto::DIGEST_LENGTH }> for Certificate {
-    type TypedDigest = CertificateDigest;
-
-    fn digest(&self) -> CertificateDigest {
-        match self {
-            Certificate::V1(data) => data.digest(),
-        }
-    }
-}
-
-#[enum_dispatch]
-pub trait CertificateAPI {
-    fn header(&self) -> &Header;
-    fn aggregated_signature(&self) -> Option<&AggregateSignatureBytes>;
-    fn signed_authorities(&self) -> &roaring::RoaringBitmap;
-    fn metadata(&self) -> &Metadata;
-
-    // Used for testing.
-    fn update_header(&mut self, header: Header);
-    fn header_mut(&mut self) -> &mut Header;
-
-    // CertificateV1
-    fn signature_verification_state(&self) -> &SignatureVerificationState;
-    fn set_signature_verification_state(&mut self, state: SignatureVerificationState);
-}
-
-// Holds AggregateSignatureBytes but with the added layer to specify the
-// signatures verification state. This will be used to take advantage of the
-// certificate chain that is formed via the DAG by only verifying the
-// leaves of the certificate chain when they are fetched from validators
-// during catchup.
-#[derive(Clone, Serialize, Deserialize, MallocSizeOf, Debug)]
-pub enum SignatureVerificationState {
-    // This state occurs when the certificate has not yet received a quorum of
-    // signatures.
-    Unsigned(AggregateSignatureBytes),
-    // This state occurs when a certificate has just been received from the network
-    // and has not been verified yet.
-    Unverified(AggregateSignatureBytes),
-    // This state occurs when a certificate was either created locally, received
-    // via broadcast, or fetched but was not the parent of another certificate.
-    // Therefore this certificate had to be verified directly.
-    VerifiedDirectly(AggregateSignatureBytes),
-    // This state occurs when the cert was a parent of another fetched certificate
-    // that was verified directly, then this certificate is verified indirectly.
-    VerifiedIndirectly(AggregateSignatureBytes),
-    // This state occurs only for genesis certificates which always has valid
-    // signatures bytes but the bytes are garbage so we don't mark them as verified.
-    Genesis,
-}
-
-impl Default for SignatureVerificationState {
-    fn default() -> Self {
-        SignatureVerificationState::Unsigned(AggregateSignatureBytes::default())
-    }
-}
-
-#[serde_as]
-#[derive(Clone, Serialize, Deserialize, Default, MallocSizeOf)]
-pub struct CertificateV1 {
-    pub header: Header,
-    pub signature_verification_state: SignatureVerificationState,
-    #[serde_as(as = "NarwhalBitmap")]
-    signed_authorities: roaring::RoaringBitmap,
-    pub metadata: Metadata,
-}
-
-impl CertificateAPI for CertificateV1 {
-    fn header(&self) -> &Header {
-        &self.header
-    }
-
-    fn aggregated_signature(&self) -> Option<&AggregateSignatureBytes> {
-        match &self.signature_verification_state {
-            SignatureVerificationState::VerifiedDirectly(bytes)
-            | SignatureVerificationState::Unverified(bytes)
-            | SignatureVerificationState::VerifiedIndirectly(bytes)
-            | SignatureVerificationState::Unsigned(bytes) => Some(bytes),
-            SignatureVerificationState::Genesis => None,
-        }
-    }
-
-    fn signature_verification_state(&self) -> &SignatureVerificationState {
-        &self.signature_verification_state
-    }
-
-    fn set_signature_verification_state(&mut self, state: SignatureVerificationState) {
-        self.signature_verification_state = state;
-    }
-
-    fn signed_authorities(&self) -> &roaring::RoaringBitmap {
-        &self.signed_authorities
-    }
-
-    fn metadata(&self) -> &Metadata {
-        &self.metadata
-    }
-
-    // Used for testing.
-    fn update_header(&mut self, header: Header) {
-        self.header = header;
-    }
-
-    fn header_mut(&mut self) -> &mut Header {
-        &mut self.header
-    }
-}
-
-impl CertificateV1 {
-    pub fn genesis(committee: &Committee) -> Vec<Self> {
-        committee
-            .authorities()
-            .map(|authority| Self {
-                header: Header::V1(HeaderV1 {
-                    author: authority.id(),
-                    epoch: committee.epoch(),
-                    ..Default::default()
-                }),
-                signature_verification_state: SignatureVerificationState::Genesis,
-                ..Self::default()
-            })
-            .collect()
-    }
-
-    pub fn new_unverified(
-        committee: &Committee,
-        header: Header,
-        votes: Vec<(AuthorityIdentifier, Signature)>,
-    ) -> DagResult<Certificate> {
-        Self::new_unsafe(committee, header, votes, true)
-    }
-
-    pub fn new_unsigned(
-        committee: &Committee,
-        header: Header,
-        votes: Vec<(AuthorityIdentifier, Signature)>,
-    ) -> DagResult<Certificate> {
-        Self::new_unsafe(committee, header, votes, false)
-    }
-
-    fn new_unsafe(
-        committee: &Committee,
-        header: Header,
-        votes: Vec<(AuthorityIdentifier, Signature)>,
-        check_stake: bool,
-    ) -> DagResult<Certificate> {
-        let mut votes = votes;
-        votes.sort_by_key(|(pk, _)| *pk);
-        let mut votes: VecDeque<_> = votes.into_iter().collect();
-
-        let mut weight = 0;
-        let mut sigs = Vec::new();
-
-        let filtered_votes = committee
-            .authorities()
-            .enumerate()
-            .filter(|(_, authority)| {
-                if !votes.is_empty() && authority.id() == votes.front().unwrap().0 {
-                    sigs.push(votes.pop_front().unwrap());
-                    weight += authority.stake();
-                    // If there are repeats, also remove them
-                    while !votes.is_empty() && votes.front().unwrap() == sigs.last().unwrap() {
-                        votes.pop_front().unwrap();
-                    }
-                    return true;
-                }
-                false
-            })
-            .map(|(index, _)| index as u32);
-
-        let signed_authorities = roaring::RoaringBitmap::from_sorted_iter(filtered_votes)
-            .map_err(|_| DagError::InvalidBitmap("Failed to convert votes into a bitmap of authority keys. Something is likely very wrong...".to_string()))?;
-
-        // Ensure that all authorities in the set of votes are known
-        ensure!(
-            votes.is_empty(),
-            DagError::UnknownAuthority(votes.front().unwrap().0.to_string())
-        );
-
-        // Ensure that the authorities have enough weight
-        ensure!(
-            !check_stake || weight >= committee.quorum_threshold(),
-            DagError::CertificateRequiresQuorum
-        );
-
-        let aggregated_signature = if sigs.is_empty() {
-            AggregateSignature::default()
-        } else {
-            AggregateSignature::aggregate::<Signature, Vec<&Signature>>(
-                sigs.iter().map(|(_, sig)| sig).collect(),
-            )
-            .map_err(|_| DagError::InvalidSignature)?
-        };
-
-        let aggregate_signature_bytes = AggregateSignatureBytes::from(&aggregated_signature);
-
-        let signature_verification_state = if !check_stake {
-            SignatureVerificationState::Unsigned(aggregate_signature_bytes)
-        } else {
-            SignatureVerificationState::Unverified(aggregate_signature_bytes)
-        };
-
-        Ok(Certificate::V1(CertificateV1 {
-            header,
-            signature_verification_state,
-            signed_authorities,
-            metadata: Metadata::default(),
-        }))
-    }
-
-    /// This function requires that certificate was verified against given
-    /// committee
-    pub fn signed_authorities(&self, committee: &Committee) -> Vec<PublicKey> {
-        assert_eq!(committee.epoch(), self.epoch());
-        let (_stake, pks) = self.signed_by(committee);
-        pks
-    }
-
-    pub fn signed_by(&self, committee: &Committee) -> (Stake, Vec<PublicKey>) {
-        // Ensure the certificate has a quorum.
-        let mut weight = 0;
-
-        let auth_indexes = self.signed_authorities.iter().collect::<Vec<_>>();
-        let mut auth_iter = 0;
-        let pks = committee
-            .authorities()
-            .enumerate()
-            .filter(|(i, authority)| match auth_indexes.get(auth_iter) {
-                Some(index) if *index == *i as u32 => {
-                    weight += authority.stake();
-                    auth_iter += 1;
-                    true
-                }
-                _ => false,
-            })
-            .map(|(_, authority)| authority.protocol_key().clone())
-            .collect();
-        (weight, pks)
-    }
-
-    /// Verifies the validity of the certificate.
-    pub fn verify(
-        self,
-        committee: &Committee,
-        worker_cache: &WorkerCache,
-    ) -> DagResult<Certificate> {
-        // Ensure the header is from the correct epoch.
-        ensure!(self.epoch() == committee.epoch(), DagError::InvalidEpoch {
-            expected: committee.epoch(),
-            received: self.epoch()
-        });
-
-        // Genesis certificates are always valid.
-        if self.round() == 0 && Self::genesis(committee).contains(&self) {
-            return Ok(Certificate::V1(self));
-        }
-
-        // Save signature verifications when the header is invalid.
-        self.header.validate(committee, worker_cache)?;
-
-        let (weight, pks) = self.signed_by(committee);
-
-        ensure!(
-            weight >= committee.quorum_threshold(),
-            DagError::CertificateRequiresQuorum
-        );
-
-        let verified_cert = self.verify_signature(pks)?;
-
-        Ok(verified_cert)
-    }
-
-    fn verify_signature(mut self, pks: Vec<PublicKey>) -> DagResult<Certificate> {
-        let aggregate_signature_bytes = match self.signature_verification_state {
-            SignatureVerificationState::VerifiedIndirectly(_)
-            | SignatureVerificationState::VerifiedDirectly(_)
-            | SignatureVerificationState::Genesis => return Ok(Certificate::V1(self)),
-            SignatureVerificationState::Unverified(ref bytes) => bytes,
-            SignatureVerificationState::Unsigned(_) => {
-                bail!(DagError::CertificateRequiresQuorum);
-            }
-        };
-
-        // Verify the signatures
-        let certificate_digest: Digest<{ crypto::DIGEST_LENGTH }> = Digest::from(self.digest());
-        AggregateSignature::try_from(aggregate_signature_bytes)
-            .map_err(|_| DagError::InvalidSignature)?
-            .verify_secure(&to_intent_message(certificate_digest), &pks[..])
-            .map_err(|_| DagError::InvalidSignature)?;
-
-        self.signature_verification_state =
-            SignatureVerificationState::VerifiedDirectly(aggregate_signature_bytes.clone());
-
-        Ok(Certificate::V1(self))
-    }
-
-    pub fn round(&self) -> Round {
-        self.header.round()
-    }
-
-    pub fn epoch(&self) -> Epoch {
-        self.header.epoch()
-    }
-
-    pub fn origin(&self) -> AuthorityIdentifier {
-        self.header.author()
-    }
-}
-
-// Certificate version is validated against network protocol version. If
-// CertificateV1 is being used then the cert will also be marked as Unverified
-// as this certificate is assumed to be received from the network. This
-// SignatureVerificationState is why the modified certificate is being returned.
-pub fn validate_received_certificate_version(
-    mut certificate: Certificate,
-) -> anyhow::Result<Certificate> {
-    match certificate {
-        Certificate::V1(_) => {
-            // CertificateV1 was received from the network so we need to mark
-            // certificate aggregated signature state as unverified.
-            certificate.set_signature_verification_state(SignatureVerificationState::Unverified(
-                certificate
-                    .aggregated_signature()
-                    .ok_or(anyhow::anyhow!("Invalid signature"))?
-                    .clone(),
-            ));
-        }
-    };
-    Ok(certificate)
-}
-
-#[derive(
-    Clone,
-    Copy,
-    Serialize,
-    Deserialize,
-    Default,
-    MallocSizeOf,
-    PartialEq,
-    Eq,
-    Hash,
-    PartialOrd,
-    Ord,
-    Arbitrary,
-)]
-
-pub struct CertificateDigest([u8; crypto::DIGEST_LENGTH]);
-
-impl CertificateDigest {
-    pub fn new(digest: [u8; crypto::DIGEST_LENGTH]) -> CertificateDigest {
-        CertificateDigest(digest)
-    }
-}
-
-impl AsRef<[u8]> for CertificateDigest {
-    fn as_ref(&self) -> &[u8] {
-        &self.0
-    }
-}
-
-impl From<CertificateDigest> for Digest<{ crypto::DIGEST_LENGTH }> {
-    fn from(hd: CertificateDigest) -> Self {
-        Digest::new(hd.0)
-    }
-}
-
-impl fmt::Debug for CertificateDigest {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        write!(
-            f,
-            "{}",
-            base64::Engine::encode(&base64::engine::general_purpose::STANDARD, self.0)
-        )
-    }
-}
-
-impl fmt::Display for CertificateDigest {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        write!(
-            f,
-            "{}",
-            base64::Engine::encode(&base64::engine::general_purpose::STANDARD, self.0)
-                .get(0..16)
-                .ok_or(fmt::Error)?
-        )
-    }
-}
-
-impl Hash<{ crypto::DIGEST_LENGTH }> for CertificateV1 {
-    type TypedDigest = CertificateDigest;
-
-    fn digest(&self) -> CertificateDigest {
-        CertificateDigest(self.header.digest().0)
-    }
-}
-
-impl fmt::Debug for Certificate {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
-        match self {
-            Certificate::V1(data) => write!(
-                f,
-                "{}: C{}({}, {}, E{})",
-                data.digest(),
-                data.round(),
-                data.origin(),
-                data.header.digest(),
-                data.epoch()
-            ),
-        }
-    }
-}
-
-impl PartialEq for Certificate {
-    fn eq(&self, other: &Self) -> bool {
-        match (self, other) {
-            (Certificate::V1(data), Certificate::V1(other_data)) => data.eq(other_data),
-        }
-    }
-}
-
-impl PartialEq for CertificateV1 {
-    fn eq(&self, other: &Self) -> bool {
-        let mut ret = self.header().digest() == other.header().digest();
-        ret &= self.round() == other.round();
-        ret &= self.epoch() == other.epoch();
-        ret &= self.origin() == other.origin();
-        ret
-    }
-}
-
-/// Request for broadcasting certificates to peers.
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct SendCertificateRequest {
-    pub certificate: Certificate,
-}
-
-/// Response from peers after receiving a certificate.
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct SendCertificateResponse {
-    pub accepted: bool,
-}
-
-/// Used by the primary to request a vote from other primaries on newly produced
-/// headers.
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct RequestVoteRequest {
-    pub header: Header,
-
-    // Optional parent certificates provided by the requester, in case this primary doesn't yet
-    // have them and requires them in order to offer a vote.
-    pub parents: Vec<Certificate>,
-}
-
-/// Used by the primary to reply to RequestVoteRequest.
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct RequestVoteResponse {
-    pub vote: Option<Vote>,
-
-    // Indicates digests of missing certificates without which a vote cannot be provided.
-    pub missing: Vec<CertificateDigest>,
-}
-
-/// Used by the primary to fetch certificates from other primaries.
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub struct FetchCertificatesRequest {
-    /// The exclusive lower bound is a round number where each primary should
-    /// return certificates above that. This corresponds to the GC round at
-    /// the requestor.
-    pub exclusive_lower_bound: Round,
-    /// This contains per authority serialized RoaringBitmap for the round diffs
-    /// between
-    /// - rounds of certificates to be skipped from the response and
-    /// - the GC round.
-    ///
-    /// These rounds are skipped because the requestor already has them.
-    pub skip_rounds: Vec<(AuthorityIdentifier, Vec<u8>)>,
-    /// Maximum number of certificates that should be returned.
-    pub max_items: usize,
-}
-
-impl FetchCertificatesRequest {
-    #[allow(clippy::mutable_key_type)]
-    pub fn get_bounds(&self) -> (Round, BTreeMap<AuthorityIdentifier, BTreeSet<Round>>) {
-        let skip_rounds: BTreeMap<AuthorityIdentifier, BTreeSet<Round>> = self
-            .skip_rounds
-            .iter()
-            .filter_map(|(k, serialized)| {
-                match RoaringBitmap::deserialize_from(&mut &serialized[..]) {
-                    Ok(bitmap) => {
-                        let rounds: BTreeSet<Round> = bitmap
-                            .into_iter()
-                            .map(|r| self.exclusive_lower_bound + r as Round)
-                            .collect();
-                        Some((*k, rounds))
-                    }
-                    Err(e) => {
-                        warn!("Failed to deserialize RoaringBitmap {e}");
-                        None
-                    }
-                }
-            })
-            .collect();
-        (self.exclusive_lower_bound, skip_rounds)
-    }
-
-    #[allow(clippy::mutable_key_type)]
-    pub fn set_bounds(
-        mut self,
-        gc_round: Round,
-        skip_rounds: BTreeMap<AuthorityIdentifier, BTreeSet<Round>>,
-    ) -> Self {
-        self.exclusive_lower_bound = gc_round;
-        self.skip_rounds = skip_rounds
-            .into_iter()
-            .map(|(k, rounds)| {
-                let mut serialized = Vec::new();
-                rounds
-                    .into_iter()
-                    .map(|v| u32::try_from(v - gc_round).unwrap())
-                    .collect::<RoaringBitmap>()
-                    .serialize_into(&mut serialized)
-                    .unwrap();
-                (k, serialized)
-            })
-            .collect();
-        self
-    }
-
-    pub fn set_max_items(mut self, max_items: usize) -> Self {
-        self.max_items = max_items;
-        self
-    }
-}
-
-/// Used by the primary to reply to FetchCertificatesRequest.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct FetchCertificatesResponse {
-    /// Certificates sorted from lower to higher rounds.
-    pub certificates: Vec<Certificate>,
-}
-
-/// Used by the primary to request that the worker sync the target missing
-/// batches.
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct WorkerSynchronizeMessage {
-    pub digests: Vec<BatchDigest>,
-    pub target: AuthorityIdentifier,
-    // Used to indicate to the worker that it does not need to fully validate
-    // the batch it receives because it is part of a certificate. Only digest
-    // verification is required.
-    pub is_certified: bool,
-}
-
-/// Used by the primary to request that the worker fetch the missing batches and
-/// reply with all of the content.
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct FetchBatchesRequest {
-    pub digests: HashSet<BatchDigest>,
-    pub known_workers: HashSet<NetworkPublicKey>,
-}
-
-/// All batches requested by the primary.
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct FetchBatchesResponse {
-    pub batches: HashMap<BatchDigest, Batch>,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct BatchMessage {
-    // TODO: revisit including the digest here [see #188]
-    pub digest: BatchDigest,
-    pub batch: Batch,
-}
-
-/// Used by worker to inform primary it sealed a new batch.
-#[derive(Clone, Serialize, Deserialize, Eq, PartialEq, Debug)]
-pub struct WorkerOwnBatchMessage {
-    pub digest: BatchDigest,
-    pub worker_id: WorkerId,
-    pub metadata: VersionedMetadata,
-}
-
-/// Used by worker to inform primary it received a batch from another authority.
-#[derive(Clone, Serialize, Deserialize, Eq, PartialEq, Debug)]
-pub struct WorkerOthersBatchMessage {
-    pub digest: BatchDigest,
-    pub worker_id: WorkerId,
-}
-
-#[derive(Clone, Serialize, Deserialize, Eq, PartialEq, Debug)]
-#[enum_dispatch(VoteInfoAPI)]
-pub enum VoteInfo {
-    V1(VoteInfoV1),
-}
-
-#[enum_dispatch]
-pub trait VoteInfoAPI {
-    fn epoch(&self) -> Epoch;
-    fn round(&self) -> Round;
-    fn vote_digest(&self) -> VoteDigest;
-}
-
-#[derive(Clone, Serialize, Deserialize, Eq, PartialEq, Debug)]
-pub struct VoteInfoV1 {
-    /// The latest Epoch for which a vote was sent to given authority
-    pub epoch: Epoch,
-    /// The latest round for which a vote was sent to given authority
-    pub round: Round,
-    /// The hash of the vote used to ensure equality
-    pub vote_digest: VoteDigest,
-}
-
-impl VoteInfoAPI for VoteInfoV1 {
-    fn epoch(&self) -> Epoch {
-        self.epoch
-    }
-
-    fn round(&self) -> Round {
-        self.round
-    }
-
-    fn vote_digest(&self) -> VoteDigest {
-        self.vote_digest
-    }
-}
-
-impl From<&VoteV1> for VoteInfoV1 {
-    fn from(vote: &VoteV1) -> Self {
-        VoteInfoV1 {
-            epoch: vote.epoch(),
-            round: vote.round(),
-            vote_digest: vote.digest(),
-        }
-    }
-}
-
-impl From<&Vote> for VoteInfo {
-    fn from(vote: &Vote) -> Self {
-        match vote {
-            Vote::V1(vote) => VoteInfo::V1(VoteInfoV1::from(vote)),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::time::Duration;
-
-    use tokio::time::sleep;
-
-    use crate::{Batch, BatchAPI, BatchV1, MetadataAPI, MetadataV1, Timestamp, VersionedMetadata};
-
-    #[tokio::test]
-    async fn test_elapsed() {
-        let batch = Batch::new(vec![]);
-
-        assert!(*batch.versioned_metadata().created_at() > 0);
-
-        assert!(batch.versioned_metadata().received_at().is_none());
-
-        sleep(Duration::from_secs(2)).await;
-
-        assert!(
-            batch
-                .versioned_metadata()
-                .created_at()
-                .elapsed()
-                .as_secs_f64()
-                >= 2.0
-        );
-    }
-
-    #[test]
-    fn test_elapsed_when_newer_than_now() {
-        let batch = Batch::V1(BatchV1 {
-            transactions: vec![],
-            versioned_metadata: VersionedMetadata::V1(MetadataV1 {
-                created_at: 2999309726980, // something in the future - Fri Jan 16 2065 05:35:26
-                received_at: None,
-            }),
-        });
-
-        assert_eq!(
-            batch
-                .versioned_metadata()
-                .created_at()
-                .elapsed()
-                .as_secs_f64(),
-            0.0
-        );
-    }
-}
diff --git a/narwhal/types/src/proto.rs b/narwhal/types/src/proto.rs
deleted file mode 100644
index 1a7483120ac..00000000000
--- a/narwhal/types/src/proto.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-mod narwhal {
-    #[derive(Clone, PartialEq, ::prost::Message)]
-    pub struct Transaction {
-        #[prost(bytes = "bytes", repeated, tag = "1")]
-        pub transactions: ::prost::alloc::vec::Vec<::prost::bytes::Bytes>,
-    }
-    /// Empty message for when we don't have anything to return
-    #[derive(Clone, Copy, PartialEq, ::prost::Message)]
-    pub struct Empty {}
-
-    include!(concat!(env!("OUT_DIR"), "/narwhal.Transactions.rs"));
-}
-
-use bytes::Bytes;
-pub use narwhal::{
-    Empty, Transaction as TransactionProto,
-    transactions_client::TransactionsClient,
-    transactions_server::{Transactions, TransactionsServer},
-};
-
-use crate::Transaction;
-
-impl From<Transaction> for TransactionProto {
-    fn from(transaction: Transaction) -> Self {
-        TransactionProto {
-            transactions: vec![Bytes::from(transaction)],
-        }
-    }
-}
-
-impl From<Vec<Transaction>> for TransactionProto {
-    fn from(transactions: Vec<Transaction>) -> Self {
-        TransactionProto {
-            transactions: transactions.into_iter().map(Bytes::from).collect(),
-        }
-    }
-}
diff --git a/narwhal/types/src/serde.rs b/narwhal/types/src/serde.rs
deleted file mode 100644
index 462f25e44eb..00000000000
--- a/narwhal/types/src/serde.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-use std::fmt::Debug;
-
-use serde::{
-    de::{Deserializer, Error},
-    ser::{Error as SerError, Serializer},
-};
-use serde_with::{Bytes, DeserializeAs, SerializeAs};
-
-#[cfg(test)]
-#[path = "./tests/batch_serde.rs"]
-mod batch_serde;
-
-#[inline]
-fn to_custom_error<'de, D, E>(e: E) -> D::Error
-where
-    E: Debug,
-    D: Deserializer<'de>,
-{
-    Error::custom(format!("byte deserialization failed, cause by: {:?}", e))
-}
-
-#[inline]
-fn to_custom_ser_error<S, E>(e: E) -> S::Error
-where
-    E: Debug,
-    S: Serializer,
-{
-    S::Error::custom(format!("byte serialization failed, cause by: {:?}", e))
-}
-
-// Serializes a bitmap according to the roaring bitmap on-disk standard.
-/// https://github.com/RoaringBitmap/RoaringFormatSpec
-pub struct NarwhalBitmap;
-
-impl SerializeAs<roaring::RoaringBitmap> for NarwhalBitmap {
-    fn serialize_as<S>(source: &roaring::RoaringBitmap, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut bytes = vec![];
-
-        source
-            .serialize_into(&mut bytes)
-            .map_err(to_custom_ser_error::<S, _>)?;
-        Bytes::serialize_as(&bytes, serializer)
-    }
-}
-
-impl<'de> DeserializeAs<'de, roaring::RoaringBitmap> for NarwhalBitmap {
-    fn deserialize_as<D>(deserializer: D) -> Result<roaring::RoaringBitmap, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let bytes: Vec<u8> = Bytes::deserialize_as(deserializer)?;
-        roaring::RoaringBitmap::deserialize_from(&bytes[..]).map_err(to_custom_error::<'de, D, _>)
-    }
-}
diff --git a/narwhal/types/src/tests/batch_serde.rs b/narwhal/types/src/tests/batch_serde.rs
deleted file mode 100644
index 3529421ae9f..00000000000
--- a/narwhal/types/src/tests/batch_serde.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-use serde_test::{Token, assert_tokens};
-
-use crate::{
-    Batch, BatchV1, MetadataV1, VersionedMetadata, serde::batch_serde::Token::NewtypeVariant,
-};
-#[test]
-fn test_serde_batch() {
-    let tx = || vec![1; 5];
-
-    let batch = Batch::V1(BatchV1 {
-        transactions: (0..2).map(|_| tx()).collect(),
-        versioned_metadata: VersionedMetadata::V1(MetadataV1 {
-            created_at: 1666205365890,
-            received_at: None,
-        }),
-    });
-
-    assert_tokens(&batch, &[
-        NewtypeVariant {
-            name: "Batch",
-            variant: "V1",
-        },
-        Token::Struct {
-            name: "BatchV1",
-            len: 2,
-        },
-        Token::Str("transactions"),
-        Token::Seq { len: Some(2) },
-        Token::Seq { len: Some(5) },
-        Token::U8(1),
-        Token::U8(1),
-        Token::U8(1),
-        Token::U8(1),
-        Token::U8(1),
-        Token::SeqEnd,
-        Token::Seq { len: Some(5) },
-        Token::U8(1),
-        Token::U8(1),
-        Token::U8(1),
-        Token::U8(1),
-        Token::U8(1),
-        Token::SeqEnd,
-        Token::SeqEnd,
-        Token::Str("versioned_metadata"),
-        NewtypeVariant {
-            name: "VersionedMetadata",
-            variant: "V1",
-        },
-        Token::Struct {
-            name: "MetadataV1",
-            len: 2,
-        },
-        Token::Str("created_at"),
-        Token::U64(1666205365890),
-        Token::Str("received_at"),
-        Token::None,
-        Token::StructEnd,
-        Token::StructEnd,
-    ]);
-}
diff --git a/narwhal/types/src/tests/error_test.rs b/narwhal/types/src/tests/error_test.rs
deleted file mode 100644
index 0c26b098aff..00000000000
--- a/narwhal/types/src/tests/error_test.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-use std::{future, time::Duration};
-
-use futures::{StreamExt, stream::FuturesUnordered};
-use iota_metrics::metered_channel::{Receiver, Sender, WithPermit, channel};
-use prometheus::IntGauge;
-
-use super::DagError;
-
-pub struct Processor {
-    input: Receiver<usize>,
-    output: Sender<usize>,
-}
-
-impl Processor {
-    pub fn new(input: Receiver<usize>, output: Sender<usize>) -> Self {
-        Self { input, output }
-    }
-
-    pub fn spawn(input: Receiver<usize>, output: Sender<usize>) {
-        tokio::spawn(async move {
-            let mut processor = Processor::new(input, output);
-            processor.run().await;
-        });
-    }
-
-    pub async fn run(&mut self) {
-        let mut waiting = FuturesUnordered::new();
-
-        loop {
-            tokio::select! {
-                Some(input) = self.input.recv() => {
-                    let deliver: future::Ready<Result<usize, DagError>> = future::ready(
-                        Ok(input)
-                    );
-                    waiting.push(deliver)
-                }
-
-
-                Some((permit, Some(res_value))) = self.output.with_permit(waiting.next())  => {
-                    permit.send(res_value.unwrap());
-                }
-            }
-        }
-    }
-}
-
-#[tokio::test]
-async fn with_permit_unhappy_case() {
-    let counter = IntGauge::new("TEST_COUNTER", "test").unwrap();
-
-    let (tx_inbound, rx_inbound) = channel(100, &counter); // we'll make sure we always have stuff inbound
-    let (tx_outbound, mut rx_outbound) = channel(1, &counter); // we'll constrain the output
-
-    Processor::spawn(rx_inbound, tx_outbound);
-    // we fill the inbound channel with stuff
-    (0..100).for_each(|i| {
-        tx_inbound
-            .try_send(i)
-            .expect("failed to send to inbound channel");
-    });
-
-    tokio::time::sleep(Duration::from_secs(1)).await;
-    // by now, the outbound channel should fail to deliver permits on each loop
-    // pass, whereas the inbound channel is full
-
-    // we now try to receive all the things we can from the outbound channel
-    let mut recvd = vec![];
-    while let Ok(Some(val)) = tokio::time::timeout(Duration::from_secs(1), rx_outbound.recv()).await
-    {
-        recvd.push(val);
-    }
-
-    assert_eq!(recvd, (0..100).collect::<Vec<usize>>());
-}
diff --git a/narwhal/types/tests/primary_tests.rs b/narwhal/types/tests/primary_tests.rs
deleted file mode 100644
index 3c31c2f8bb0..00000000000
--- a/narwhal/types/tests/primary_tests.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// Modifications Copyright (c) 2024 IOTA Stiftung
-// SPDX-License-Identifier: Apache-2.0
-
-use std::{collections::BTreeSet, num::NonZeroUsize};
-
-use config::{AuthorityIdentifier, Committee, Stake};
-use crypto::{PublicKey, Signature};
-use fastcrypto::traits::KeyPair;
-use indexmap::IndexMap;
-use narwhal_types::{Certificate, Header, HeaderV1, Vote, VoteAPI};
-use rand::{rngs::OsRng, seq::SliceRandom};
-use test_utils::{AuthorityFixture, CommitteeFixture};
-
-#[tokio::test]
-async fn test_certificate_signers_are_ordered() {
-    // GIVEN
-    let fixture = CommitteeFixture::builder()
-        .committee_size(NonZeroUsize::new(4).unwrap())
-        .stake_distribution((1..=4).collect()) // provide some non-uniform stake
-        .build();
-    let committee: Committee = fixture.committee();
-
-    let authorities = fixture.authorities().collect::<Vec<&AuthorityFixture>>();
-
-    // The authority that creates the Header
-    let authority = authorities[0];
-
-    let header = HeaderV1::new(authority.id(), 1, 1, IndexMap::new(), BTreeSet::new()).await;
-
-    // WHEN
-    let mut votes: Vec<(AuthorityIdentifier, Signature)> = Vec::new();
-    let mut sorted_signers: Vec<PublicKey> = Vec::new();
-
-    // The authorities on position 1, 2, 3 are the ones who would sign
-    for authority in &authorities[1..=3] {
-        sorted_signers.push(authority.keypair().public().clone());
-
-        let vote = Vote::new_with_signer(
-            &Header::V1(header.clone()),
-            &authority.id(),
-            authority.keypair(),
-        );
-        votes.push((vote.author(), vote.signature().clone()));
-    }
-
-    // Just shuffle to ensure that any underlying sorting will work correctly
-    votes.shuffle(&mut OsRng);
-
-    // Create a certificate
-    let certificate = Certificate::new_unverified(&committee, Header::V1(header), votes).unwrap();
-
-    let (stake, signers) = certificate.signed_by(&committee);
-
-    // THEN
-    assert_eq!(signers.len(), 3);
-
-    // AND authorities public keys are returned in order
-    assert_eq!(signers, sorted_signers);
-
-    assert_eq!(stake, 9 as Stake);
-}
diff --git a/nre/ansible/roles/iota-node/files/iota-node.service b/nre/ansible/roles/iota-node/files/iota-node.service
index f24b17b6748..76512d92601 100644
--- a/nre/ansible/roles/iota-node/files/iota-node.service
+++ b/nre/ansible/roles/iota-node/files/iota-node.service
@@ -5,7 +5,7 @@ Description=Iota Node
 User=iota
 WorkingDirectory=/opt/iota/
 Environment=RUST_BACKTRACE=1
-Environment=RUST_LOG=info,iota_core=debug,narwhal=debug,consensus=debug,jsonrpsee=error
+Environment=RUST_LOG=info,iota_core=debug,consensus=debug,jsonrpsee=error
 ExecStart=/opt/iota/bin/iota-node --config-path /opt/iota/config/validator.yaml
 Restart=always
 
diff --git a/nre/config/validator.yaml b/nre/config/validator.yaml
index 57773f17f7d..4b2f60eba69 100644
--- a/nre/config/validator.yaml
+++ b/nre/config/validator.yaml
@@ -12,21 +12,6 @@ admin-interface-port: 1337
 consensus-config:
   db-path: /opt/iota/db/consensus_db
   internal-worker-address: null
-  narwhal-config:
-    header_num_of_batches_threshold: 32
-    max_header_num_of_batches: 1000
-    max_header_delay: 1000ms
-    gc_depth: 50
-    sync_retry_delay: 5000ms
-    sync_retry_nodes: 3
-    batch_size: 500000
-    max_batch_delay: 100ms
-    max_concurrent_requests: 500000
-    prometheus_metrics:
-      socket_addr: /ip4/127.0.0.1/tcp/33291/http
-    network_admin_server:
-      primary_network_admin_server_port: 41303
-      worker_network_admin_server_base_port: 41669
 enable-event-processing: false
 p2p-config:
   listen-address: 0.0.0.0:8084
diff --git a/nre/dashboards/iota_mainnet_validators.json b/nre/dashboards/iota_mainnet_validators.json
index 7b4e69ac19e..ccba9b70714 100644
--- a/nre/dashboards/iota_mainnet_validators.json
+++ b/nre/dashboards/iota_mainnet_validators.json
@@ -1128,7 +1128,7 @@
         "type": "prometheus",
         "uid": "e6b9ae38-5a18-477b-bd96-c67b655dd4aa"
       },
-      "description": "e2e latency of handling certificates that go through Narwhal (p67 across validators)",
+      "description": "e2e latency of handling certificates that go through consensus (p67 across validators)",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -1457,119 +1457,6 @@
       "title": "Average time to generate consensus proposal latency",
       "type": "status-history"
     },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "e6b9ae38-5a18-477b-bd96-c67b655dd4aa"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {
-            "fillOpacity": 70,
-            "lineWidth": 1
-          },
-          "mappings": [
-            {
-              "options": {
-                "from": 20,
-                "result": {
-                  "color": "red",
-                  "index": 0
-                },
-                "to": 100000000
-              },
-              "type": "range"
-            },
-            {
-              "options": {
-                "from": 10,
-                "result": {
-                  "color": "orange",
-                  "index": 1
-                },
-                "to": 20
-              },
-              "type": "range"
-            },
-            {
-              "options": {
-                "from": 0,
-                "result": {
-                  "color": "dark-green",
-                  "index": 2
-                },
-                "to": 10
-              },
-              "type": "range"
-            },
-            {
-              "options": {
-                "match": "null+nan",
-                "result": {
-                  "color": "transparent",
-                  "index": 3
-                }
-              },
-              "type": "special"
-            }
-          ],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "dark-green",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 29,
-        "w": 8,
-        "x": 16,
-        "y": 36
-      },
-      "id": 262,
-      "interval": "2m",
-      "options": {
-        "colWidth": 0.9,
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "rowHeight": 0.9,
-        "showValue": "never",
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "e6b9ae38-5a18-477b-bd96-c67b655dd4aa"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "histogram_quantile(0.5, sum by(le, host) (rate(primary_inbound_request_latency_bucket{network=\"mainnet\", route=\"/narwhal.PrimaryToPrimary/SendCertificate\"}[5m]))) * 1000",
-          "format": "time_series",
-          "instant": false,
-          "legendFormat": "{{host}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "p50 process certificate (internal processing only)",
-      "type": "status-history"
-    },
     {
       "datasource": {
         "type": "prometheus",
@@ -1764,7 +1651,7 @@
         "type": "prometheus",
         "uid": "e6b9ae38-5a18-477b-bd96-c67b655dd4aa"
       },
-      "description": "The rate of node participation in consensus via sending certified Narwhal proposals.",
+      "description": "The rate of node participation in consensus via sending certified consensus proposals.",
       "fieldConfig": {
         "defaults": {
           "color": {
diff --git a/nre/docker/docker-compose.yaml b/nre/docker/docker-compose.yaml
index 40b43da228e..d5d56fc1368 100644
--- a/nre/docker/docker-compose.yaml
+++ b/nre/docker/docker-compose.yaml
@@ -7,7 +7,7 @@ services:
     image: iotaledger/iota-node:${IOTA_SHA} # UPDATE HERE
     environment:
       - RUST_BACKTRACE=1
-      - RUST_LOG=info,iota_core=debug,narwhal=debug,consensus=debug,jsonrpsee=error
+      - RUST_LOG=info,iota_core=debug,consensus=debug,jsonrpsee=error
     labels:
       org.label-schema.name: "validator"
     ports:
diff --git a/nre/k8s/iota-node-statefulset.yaml b/nre/k8s/iota-node-statefulset.yaml
index 2e616e27d27..cbf5c09b40b 100644
--- a/nre/k8s/iota-node-statefulset.yaml
+++ b/nre/k8s/iota-node-statefulset.yaml
@@ -59,7 +59,7 @@ spec:
             - name: RUST_BACKTRACE
               value: "1"
             - name: RUST_LOG
-              value: info,iota_core=debug,iota_network=debug,narwhal=info,consensus=debug,jsonrpsee=error
+              value: info,iota_core=debug,iota_network=debug,consensus=debug,jsonrpsee=error
           image: x
           imagePullPolicy: Always
           name: iota-node
diff --git a/nre/systemd/iota-node.service b/nre/systemd/iota-node.service
index f24b17b6748..76512d92601 100644
--- a/nre/systemd/iota-node.service
+++ b/nre/systemd/iota-node.service
@@ -5,7 +5,7 @@ Description=Iota Node
 User=iota
 WorkingDirectory=/opt/iota/
 Environment=RUST_BACKTRACE=1
-Environment=RUST_LOG=info,iota_core=debug,narwhal=debug,consensus=debug,jsonrpsee=error
+Environment=RUST_LOG=info,iota_core=debug,consensus=debug,jsonrpsee=error
 ExecStart=/opt/iota/bin/iota-node --config-path /opt/iota/config/validator.yaml
 Restart=always
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9883c275a4a..6b17bc9516e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -58,13 +58,13 @@ importers:
         version: 9.1.0(eslint@8.57.1)
       eslint-import-resolver-typescript:
         specifier: ^3.6.1
-        version: 3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1)
+        version: 3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1)
       eslint-plugin-header:
         specifier: ^3.1.1
         version: 3.1.1(eslint@8.57.1)
       eslint-plugin-import:
         specifier: ^2.29.1
-        version: 2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)
+        version: 2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1)
       eslint-plugin-license-check:
         specifier: link:linting/license-check
         version: link:linting/license-check
@@ -118,7 +118,7 @@ importers:
         version: link:../../sdk/typescript
       '@nestjs/cache-manager':
         specifier: ^2.2.2
-        version: 2.2.2(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.4(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.4)(reflect-metadata@0.2.2)(rxjs@7.8.1))(cache-manager@5.7.6)(rxjs@7.8.1)
+        version: 2.2.2(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.4)(cache-manager@5.7.6)(rxjs@7.8.1)
       '@nestjs/common':
         specifier: ^10.0.0
         version: 10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1)
@@ -133,7 +133,7 @@ importers:
         version: 10.4.4(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.4)
       '@nestjs/schedule':
         specifier: ^4.0.2
-        version: 4.1.1(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.4(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.4)(reflect-metadata@0.2.2)(rxjs@7.8.1))
+        version: 4.1.1(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.4)
       cache-manager:
         specifier: ^5.6.1
         version: 5.7.6
@@ -143,13 +143,13 @@ importers:
     devDependencies:
       '@nestjs/cli':
         specifier: ^10.0.0
-        version: 10.4.5(@swc/core@1.7.28)
+        version: 10.4.5(@swc/core@1.7.28(@swc/helpers@0.5.5))
       '@nestjs/schematics':
         specifier: ^10.0.0
         version: 10.1.4(chokidar@3.6.0)(typescript@5.6.2)
       '@nestjs/testing':
         specifier: ^10.0.0
-        version: 10.4.4(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.4(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.4)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.4(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.4))
+        version: 10.4.4(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.4)(@nestjs/platform-express@10.4.4)
       '@types/express':
         specifier: ^4.17.17
         version: 4.17.21
@@ -179,7 +179,7 @@ importers:
         version: 5.2.1(@types/eslint@8.56.12)(eslint-config-prettier@9.1.0(eslint@8.57.1))(eslint@8.57.1)(prettier@3.3.3)
       jest:
         specifier: ^29.5.0
-        version: 29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))
+        version: 29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))
       prettier:
         specifier: ^3.3.1
         version: 3.3.3
@@ -191,13 +191,13 @@ importers:
         version: 6.3.4
       ts-jest:
         specifier: ^29.1.0
-        version: 29.2.5(@babel/core@7.25.2)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.2))(jest@29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2)))(typescript@5.6.2)
+        version: 29.2.5(@babel/core@7.25.2)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.2))(jest@29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2)))(typescript@5.6.2)
       ts-loader:
         specifier: ^9.4.4
-        version: 9.5.1(typescript@5.6.2)(webpack@5.95.0(@swc/core@1.7.28))
+        version: 9.5.1(typescript@5.6.2)(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       ts-node:
         specifier: ^10.9.1
-        version: 10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2)
+        version: 10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2)
       tsconfig-paths:
         specifier: ^4.2.0
         version: 4.2.0
@@ -261,13 +261,13 @@ importers:
     devDependencies:
       '@headlessui/tailwindcss':
         specifier: ^0.1.3
-        version: 0.1.3(tailwindcss@3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2)))
+        version: 0.1.3(tailwindcss@3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2)))
       '@tailwindcss/aspect-ratio':
         specifier: ^0.4.2
-        version: 0.4.2(tailwindcss@3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2)))
+        version: 0.4.2(tailwindcss@3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2)))
       '@tailwindcss/forms':
         specifier: ^0.5.7
-        version: 0.5.9(tailwindcss@3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2)))
+        version: 0.5.9(tailwindcss@3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2)))
       '@types/react':
         specifier: ^18.3.3
         version: 18.3.9
@@ -279,7 +279,7 @@ importers:
         version: 8.4.47
       tailwindcss:
         specifier: ^3.3.3
-        version: 3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2))
+        version: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2))
       typescript:
         specifier: ^5.5.3
         version: 5.6.2
@@ -502,7 +502,7 @@ importers:
         version: 2.0.8
       tailwindcss:
         specifier: ^3.3.3
-        version: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))
+        version: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))
       tsconfig-paths:
         specifier: ^4.2.0
         version: 4.2.0
@@ -629,7 +629,7 @@ importers:
         version: 4.0.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@7.6.20)
       tailwindcss:
         specifier: ^3.3.3
-        version: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))
+        version: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))
       typescript:
         specifier: ^5.5.3
         version: 5.6.2
@@ -897,7 +897,7 @@ importers:
         version: 0.10.7
       '@types/webpack':
         specifier: ^5.28.1
-        version: 5.28.5(@swc/core@1.7.28)(webpack-cli@5.1.4(webpack@5.95.0))
+        version: 5.28.5(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4)
       '@types/zxcvbn':
         specifier: ^4.4.1
         version: 4.4.5
@@ -906,19 +906,19 @@ importers:
         version: 4.3.1(vite@5.4.8(@types/node@20.16.9)(sass@1.79.3)(terser@5.34.0))
       copy-webpack-plugin:
         specifier: ^11.0.0
-        version: 11.0.0(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4))
+        version: 11.0.0(webpack@5.95.0)
       cross-env:
         specifier: ^7.0.3
         version: 7.0.3
       css-loader:
         specifier: ^6.7.3
-        version: 6.11.0(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4))
+        version: 6.11.0(webpack@5.95.0)
       dotenv:
         specifier: ^16.4.5
         version: 16.4.5
       eslint-webpack-plugin:
         specifier: ^4.0.1
-        version: 4.2.0(eslint@8.57.1)(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4))
+        version: 4.2.0(eslint@8.57.1)(webpack@5.95.0)
       git-rev-sync:
         specifier: ^3.0.2
         version: 3.0.2
@@ -927,10 +927,10 @@ importers:
         version: 10.11.2
       html-webpack-plugin:
         specifier: ^5.5.3
-        version: 5.6.0(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4))
+        version: 5.6.0(webpack@5.95.0)
       mini-css-extract-plugin:
         specifier: ^2.7.6
-        version: 2.9.1(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4))
+        version: 2.9.1(webpack@5.95.0)
       onchange:
         specifier: ^7.1.0
         version: 7.1.0
@@ -939,7 +939,7 @@ importers:
         version: 8.4.47
       postcss-loader:
         specifier: ^7.3.3
-        version: 7.3.4(postcss@8.4.47)(typescript@5.6.2)(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4))
+        version: 7.3.4(postcss@8.4.47)(typescript@5.6.2)(webpack@5.95.0)
       postcss-preset-env:
         specifier: ^9.0.0
         version: 9.6.0(postcss@8.4.47)
@@ -948,19 +948,19 @@ importers:
         version: 1.79.3
       sass-loader:
         specifier: ^13.3.2
-        version: 13.3.3(sass@1.79.3)(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4))
+        version: 13.3.3(sass@1.79.3)(webpack@5.95.0)
       tailwindcss:
         specifier: ^3.3.3
-        version: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))
+        version: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))
       tailwindcss-animate:
         specifier: ^1.0.7
-        version: 1.0.7(tailwindcss@3.4.13(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2)))
+        version: 1.0.7(tailwindcss@3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2)))
       ts-loader:
         specifier: ^9.4.4
-        version: 9.5.1(typescript@5.6.2)(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4))
+        version: 9.5.1(typescript@5.6.2)(webpack@5.95.0)
       ts-node:
         specifier: ^10.9.1
-        version: 10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2)
+        version: 10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2)
       tsconfig-paths:
         specifier: ^4.2.0
         version: 4.2.0
@@ -981,7 +981,7 @@ importers:
         version: 7.12.0(body-parser@1.20.3)
       webpack:
         specifier: ^5.79.0
-        version: 5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)
+        version: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4)
       webpack-cli:
         specifier: ^5.0.1
         version: 5.1.4(webpack@5.95.0)
@@ -991,6 +991,12 @@ importers:
 
   apps/wallet-dashboard:
     dependencies:
+      '@growthbook/growthbook':
+        specifier: ^1.0.0
+        version: 1.2.0
+      '@growthbook/growthbook-react':
+        specifier: ^1.0.0
+        version: 1.2.0(react@18.3.1)
       '@iota/apps-ui-kit':
         specifier: workspace:*
         version: link:../ui-kit
@@ -1021,6 +1027,9 @@ importers:
       react:
         specifier: ^18.3.1
         version: 18.3.1
+      react-hot-toast:
+        specifier: ^2.4.1
+        version: 2.4.1(csstype@3.1.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       zustand:
         specifier: ^4.4.1
         version: 4.5.5(@types/react@18.3.9)(immer@9.0.21)(react@18.3.1)
@@ -1042,16 +1051,16 @@ importers:
         version: 14.2.3(eslint@8.57.1)(typescript@5.6.2)
       jest:
         specifier: ^29.5.0
-        version: 29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))
+        version: 29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))
       postcss:
         specifier: ^8.4.31
         version: 8.4.47
       tailwindcss:
         specifier: ^3.3.3
-        version: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))
+        version: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))
       ts-jest:
         specifier: ^29.1.0
-        version: 29.2.5(@babel/core@7.25.2)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.2))(jest@29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2)))(typescript@5.6.2)
+        version: 29.2.5(@babel/core@7.25.2)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.2))(jest@29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2)))(typescript@5.6.2)
       typescript:
         specifier: ^5.5.3
         version: 5.6.2
@@ -1091,7 +1100,7 @@ importers:
     devDependencies:
       '@headlessui/tailwindcss':
         specifier: ^0.1.3
-        version: 0.1.3(tailwindcss@3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2)))
+        version: 0.1.3(tailwindcss@3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2)))
       '@types/react':
         specifier: ^18.3.3
         version: 18.3.9
@@ -1109,7 +1118,7 @@ importers:
         version: 8.4.47
       tailwindcss:
         specifier: ^3.3.3
-        version: 3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2))
+        version: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2))
       typescript:
         specifier: ^5.5.3
         version: 5.6.2
@@ -1203,7 +1212,7 @@ importers:
     devDependencies:
       '@tailwindcss/forms':
         specifier: ^0.5.7
-        version: 0.5.9(tailwindcss@3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2)))
+        version: 0.5.9(tailwindcss@3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2)))
       '@tsconfig/docusaurus':
         specifier: ^2.0.3
         version: 2.0.3
@@ -1224,10 +1233,10 @@ importers:
         version: 8.4.47
       tailwindcss:
         specifier: ^3.3.3
-        version: 3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2))
+        version: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2))
       tailwindcss-animate:
         specifier: ^1.0.7
-        version: 1.0.7(tailwindcss@3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2)))
+        version: 1.0.7(tailwindcss@3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2)))
       typescript:
         specifier: ^5.5.3
         version: 5.6.2
@@ -1273,7 +1282,7 @@ importers:
         version: 8.4.47
       tailwindcss:
         specifier: ^3.3.3
-        version: 3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2))
+        version: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2))
       typescript:
         specifier: ^5.5.3
         version: 5.6.2
@@ -1291,25 +1300,25 @@ importers:
         version: 3.6.1(@algolia/client-search@4.24.0)(@types/react@18.3.9)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@docusaurus/core':
         specifier: 3.5.2
-        version: 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+        version: 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
       '@docusaurus/preset-classic':
         specifier: 3.5.2
-        version: 3.5.2(@algolia/client-search@4.24.0)(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@types/react@18.3.9)(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+        version: 3.5.2(@algolia/client-search@4.24.0)(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/react@18.3.9)(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
       '@docusaurus/remark-plugin-npm2yarn':
         specifier: ^3.5.2
         version: 3.5.2
       '@docusaurus/theme-common':
         specifier: ^3.5.2
-        version: 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
+        version: 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
       '@docusaurus/theme-live-codeblock':
         specifier: ^3.5.2
-        version: 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+        version: 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
       '@docusaurus/theme-mermaid':
         specifier: ^3.5.2
-        version: 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+        version: 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
       '@docusaurus/theme-search-algolia':
         specifier: ^3.5.2
-        version: 3.5.2(@algolia/client-search@4.24.0)(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@types/react@18.3.9)(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+        version: 3.5.2(@algolia/client-search@4.24.0)(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/react@18.3.9)(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
       '@emotion/react':
         specifier: ^11.11.4
         version: 11.13.3(@types/react@18.3.9)(react@18.3.1)
@@ -1318,7 +1327,7 @@ importers:
         version: 11.13.0(@emotion/react@11.13.3(@types/react@18.3.9)(react@18.3.1))(@types/react@18.3.9)(react@18.3.1)
       '@graphql-markdown/docusaurus':
         specifier: ^1.24.1
-        version: 1.26.2(@docusaurus/logger@3.5.2)(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(graphql-config@5.1.2(@types/node@22.7.3)(graphql@16.9.0)(typescript@5.6.2))(graphql@16.9.0)(prettier@3.3.3)(typescript@5.6.2)
+        version: 1.26.2(@docusaurus/logger@3.5.2)(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(graphql-config@5.1.2(@types/node@22.7.3)(graphql@16.9.0)(typescript@5.6.2))(graphql@16.9.0)(prettier@3.3.3)(typescript@5.6.2)
       '@graphql-tools/graphql-file-loader':
         specifier: ^8.0.1
         version: 8.0.1(graphql@16.9.0)
@@ -1351,7 +1360,7 @@ importers:
         version: 3.2.0
       docusaurus-theme-search-typesense:
         specifier: 0.20.0-0
-        version: 0.20.0-0(@algolia/client-search@4.24.0)(@babel/runtime@7.25.6)(@docusaurus/core@3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/theme-common@3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2))(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.9)(algoliasearch@4.24.0)(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+        version: 0.20.0-0(iea5eyhbiud2dlcqtud2g4pxzm)
       dotenv:
         specifier: ^16.4.5
         version: 16.4.5
@@ -1405,7 +1414,7 @@ importers:
         version: 6.0.0
       tailwindcss:
         specifier: ^3.3.3
-        version: 3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2))
+        version: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2))
       web3:
         specifier: ^4.2.2
         version: 4.13.0(typescript@5.6.2)(zod@3.23.8)
@@ -1415,13 +1424,13 @@ importers:
         version: 7.25.2(@babel/core@7.25.2)
       '@docusaurus/module-type-aliases':
         specifier: 3.5.2
-        version: 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@docusaurus/tsconfig':
         specifier: 3.5.2
         version: 3.5.2
       '@docusaurus/types':
         specifier: 3.5.2
-        version: 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@metamask/providers':
         specifier: ^10.2.1
         version: 10.2.1
@@ -1783,6 +1792,9 @@ importers:
       '@iota/iota-sdk':
         specifier: workspace:*
         version: link:../typescript
+      dotenv:
+        specifier: ^16.4.5
+        version: 16.4.5
     devDependencies:
       '@iota/build-scripts':
         specifier: workspace:*
@@ -1987,7 +1999,7 @@ importers:
         version: 5.6.2
       typescript-json-schema:
         specifier: ^0.64.0
-        version: 0.64.0(@swc/core@1.7.28)
+        version: 0.64.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
 
 packages:
 
@@ -18431,7 +18443,7 @@ snapshots:
     transitivePeerDependencies:
       - '@algolia/client-search'
 
-  '@docusaurus/core@3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
+  '@docusaurus/core@3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
     dependencies:
       '@babel/core': 7.25.2
       '@babel/generator': 7.25.6
@@ -18445,12 +18457,12 @@ snapshots:
       '@babel/traverse': 7.25.6
       '@docusaurus/cssnano-preset': 3.4.0
       '@docusaurus/logger': 3.4.0
-      '@docusaurus/mdx-loader': 3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
-      '@docusaurus/utils': 3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
-      '@docusaurus/utils-common': 3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
-      '@docusaurus/utils-validation': 3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/mdx-loader': 3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
+      '@docusaurus/utils': 3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
+      '@docusaurus/utils-common': 3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
+      '@docusaurus/utils-validation': 3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       autoprefixer: 10.4.20(postcss@8.4.47)
-      babel-loader: 9.2.1(@babel/core@7.25.2)(webpack@5.95.0)
+      babel-loader: 9.2.1(@babel/core@7.25.2)(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       babel-plugin-dynamic-import-node: 2.3.3
       boxen: 6.2.1
       chalk: 4.1.2
@@ -18459,34 +18471,34 @@ snapshots:
       cli-table3: 0.6.5
       combine-promises: 1.2.0
       commander: 5.1.0
-      copy-webpack-plugin: 11.0.0(webpack@5.95.0)
+      copy-webpack-plugin: 11.0.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       core-js: 3.38.1
-      css-loader: 6.11.0(webpack@5.95.0)
-      css-minimizer-webpack-plugin: 5.0.1(clean-css@5.3.3)(webpack@5.95.0)
+      css-loader: 6.11.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
+      css-minimizer-webpack-plugin: 5.0.1(clean-css@5.3.3)(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       cssnano: 6.1.2(postcss@8.4.47)
       del: 6.1.1
       detect-port: 1.6.1
       escape-html: 1.0.3
       eta: 2.2.0
       eval: 0.1.8
-      file-loader: 6.2.0(webpack@5.95.0)
+      file-loader: 6.2.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       fs-extra: 11.2.0
       html-minifier-terser: 7.2.0
       html-tags: 3.3.1
-      html-webpack-plugin: 5.6.0(webpack@5.95.0)
+      html-webpack-plugin: 5.6.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       leven: 3.1.0
       lodash: 4.17.21
-      mini-css-extract-plugin: 2.9.1(webpack@5.95.0)
+      mini-css-extract-plugin: 2.9.1(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       p-map: 4.0.0
       postcss: 8.4.47
-      postcss-loader: 7.3.4(postcss@8.4.47)(typescript@5.6.2)(webpack@5.95.0)
+      postcss-loader: 7.3.4(postcss@8.4.47)(typescript@5.6.2)(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       prompts: 2.4.2
       react: 18.3.1
-      react-dev-utils: 12.0.1(eslint@8.57.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)(webpack@5.95.0)
+      react-dev-utils: 12.0.1(eslint@8.57.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       react-dom: 18.3.1(react@18.3.1)
       react-helmet-async: 1.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react-loadable: '@docusaurus/react-loadable@6.0.0(react@18.3.1)'
-      react-loadable-ssr-addon-v5-slorber: 1.0.1(@docusaurus/react-loadable@6.0.0(react@18.3.1))(webpack@5.95.0)
+      react-loadable-ssr-addon-v5-slorber: 1.0.1(@docusaurus/react-loadable@6.0.0(react@18.3.1))(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       react-router: 5.3.4(react@18.3.1)
       react-router-config: 5.1.1(react-router@5.3.4(react@18.3.1))(react@18.3.1)
       react-router-dom: 5.3.4(react@18.3.1)
@@ -18494,15 +18506,15 @@ snapshots:
       semver: 7.6.3
       serve-handler: 6.1.5
       shelljs: 0.8.5
-      terser-webpack-plugin: 5.3.10(webpack@5.95.0)
+      terser-webpack-plugin: 5.3.10(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       tslib: 2.7.0
       update-notifier: 6.0.2
-      url-loader: 4.1.1(file-loader@6.2.0(webpack@5.95.0))(webpack@5.95.0)
-      webpack: 5.95.0
+      url-loader: 4.1.1(file-loader@6.2.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))))(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
       webpack-bundle-analyzer: 4.10.2
-      webpack-dev-server: 4.15.2(webpack@5.95.0)
+      webpack-dev-server: 4.15.2(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       webpack-merge: 5.10.0
-      webpackbar: 5.0.2(webpack@5.95.0)
+      webpackbar: 5.0.2(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
     transitivePeerDependencies:
       - '@docusaurus/types'
       - '@parcel/css'
@@ -18522,7 +18534,7 @@ snapshots:
       - vue-template-compiler
       - webpack-cli
 
-  '@docusaurus/core@3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
+  '@docusaurus/core@3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
     dependencies:
       '@babel/core': 7.25.2
       '@babel/generator': 7.25.6
@@ -18536,13 +18548,13 @@ snapshots:
       '@babel/traverse': 7.25.6
       '@docusaurus/cssnano-preset': 3.5.2
       '@docusaurus/logger': 3.5.2
-      '@docusaurus/mdx-loader': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
-      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
-      '@docusaurus/utils-common': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
-      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/mdx-loader': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
+      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
+      '@docusaurus/utils-common': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
+      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       '@mdx-js/react': 3.0.1(@types/react@18.3.9)(react@18.3.1)
       autoprefixer: 10.4.20(postcss@8.4.47)
-      babel-loader: 9.2.1(@babel/core@7.25.2)(webpack@5.95.0)
+      babel-loader: 9.2.1(@babel/core@7.25.2)(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       babel-plugin-dynamic-import-node: 2.3.3
       boxen: 6.2.1
       chalk: 4.1.2
@@ -18551,34 +18563,34 @@ snapshots:
       cli-table3: 0.6.5
       combine-promises: 1.2.0
       commander: 5.1.0
-      copy-webpack-plugin: 11.0.0(webpack@5.95.0)
+      copy-webpack-plugin: 11.0.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       core-js: 3.38.1
-      css-loader: 6.11.0(webpack@5.95.0)
-      css-minimizer-webpack-plugin: 5.0.1(clean-css@5.3.3)(webpack@5.95.0)
+      css-loader: 6.11.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
+      css-minimizer-webpack-plugin: 5.0.1(clean-css@5.3.3)(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       cssnano: 6.1.2(postcss@8.4.47)
       del: 6.1.1
       detect-port: 1.6.1
       escape-html: 1.0.3
       eta: 2.2.0
       eval: 0.1.8
-      file-loader: 6.2.0(webpack@5.95.0)
+      file-loader: 6.2.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       fs-extra: 11.2.0
       html-minifier-terser: 7.2.0
       html-tags: 3.3.1
-      html-webpack-plugin: 5.6.0(webpack@5.95.0)
+      html-webpack-plugin: 5.6.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       leven: 3.1.0
       lodash: 4.17.21
-      mini-css-extract-plugin: 2.9.1(webpack@5.95.0)
+      mini-css-extract-plugin: 2.9.1(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       p-map: 4.0.0
       postcss: 8.4.47
-      postcss-loader: 7.3.4(postcss@8.4.47)(typescript@5.6.2)(webpack@5.95.0)
+      postcss-loader: 7.3.4(postcss@8.4.47)(typescript@5.6.2)(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       prompts: 2.4.2
       react: 18.3.1
-      react-dev-utils: 12.0.1(eslint@8.57.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)(webpack@5.95.0)
+      react-dev-utils: 12.0.1(eslint@8.57.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       react-dom: 18.3.1(react@18.3.1)
       react-helmet-async: 1.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react-loadable: '@docusaurus/react-loadable@6.0.0(react@18.3.1)'
-      react-loadable-ssr-addon-v5-slorber: 1.0.1(@docusaurus/react-loadable@6.0.0(react@18.3.1))(webpack@5.95.0)
+      react-loadable-ssr-addon-v5-slorber: 1.0.1(@docusaurus/react-loadable@6.0.0(react@18.3.1))(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       react-router: 5.3.4(react@18.3.1)
       react-router-config: 5.1.1(react-router@5.3.4(react@18.3.1))(react@18.3.1)
       react-router-dom: 5.3.4(react@18.3.1)
@@ -18586,15 +18598,15 @@ snapshots:
       semver: 7.6.3
       serve-handler: 6.1.5
       shelljs: 0.8.5
-      terser-webpack-plugin: 5.3.10(webpack@5.95.0)
+      terser-webpack-plugin: 5.3.10(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       tslib: 2.7.0
       update-notifier: 6.0.2
-      url-loader: 4.1.1(file-loader@6.2.0(webpack@5.95.0))(webpack@5.95.0)
-      webpack: 5.95.0
+      url-loader: 4.1.1(file-loader@6.2.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))))(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
       webpack-bundle-analyzer: 4.10.2
-      webpack-dev-server: 4.15.2(webpack@5.95.0)
+      webpack-dev-server: 4.15.2(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       webpack-merge: 5.10.0
-      webpackbar: 5.0.2(webpack@5.95.0)
+      webpackbar: 5.0.2(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
     transitivePeerDependencies:
       - '@docusaurus/types'
       - '@parcel/css'
@@ -18638,16 +18650,16 @@ snapshots:
       chalk: 4.1.2
       tslib: 2.7.0
 
-  '@docusaurus/mdx-loader@3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)':
+  '@docusaurus/mdx-loader@3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)':
     dependencies:
       '@docusaurus/logger': 3.4.0
-      '@docusaurus/utils': 3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
-      '@docusaurus/utils-validation': 3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/utils': 3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
+      '@docusaurus/utils-validation': 3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       '@mdx-js/mdx': 3.0.1
       '@slorber/remark-comment': 1.0.0
       escape-html: 1.0.3
       estree-util-value-to-estree: 3.1.2
-      file-loader: 6.2.0(webpack@5.95.0)
+      file-loader: 6.2.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       fs-extra: 11.2.0
       image-size: 1.1.1
       mdast-util-mdx: 3.0.0
@@ -18663,9 +18675,9 @@ snapshots:
       tslib: 2.7.0
       unified: 11.0.5
       unist-util-visit: 5.0.0
-      url-loader: 4.1.1(file-loader@6.2.0(webpack@5.95.0))(webpack@5.95.0)
+      url-loader: 4.1.1(file-loader@6.2.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))))(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       vfile: 6.0.3
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
     transitivePeerDependencies:
       - '@docusaurus/types'
       - '@swc/core'
@@ -18675,16 +18687,16 @@ snapshots:
       - uglify-js
       - webpack-cli
 
-  '@docusaurus/mdx-loader@3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)':
+  '@docusaurus/mdx-loader@3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)':
     dependencies:
       '@docusaurus/logger': 3.5.2
-      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
-      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
+      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       '@mdx-js/mdx': 3.0.1
       '@slorber/remark-comment': 1.0.0
       escape-html: 1.0.3
       estree-util-value-to-estree: 3.1.2
-      file-loader: 6.2.0(webpack@5.95.0)
+      file-loader: 6.2.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       fs-extra: 11.2.0
       image-size: 1.1.1
       mdast-util-mdx: 3.0.0
@@ -18700,9 +18712,9 @@ snapshots:
       tslib: 2.7.0
       unified: 11.0.5
       unist-util-visit: 5.0.0
-      url-loader: 4.1.1(file-loader@6.2.0(webpack@5.95.0))(webpack@5.95.0)
+      url-loader: 4.1.1(file-loader@6.2.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))))(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       vfile: 6.0.3
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
     transitivePeerDependencies:
       - '@docusaurus/types'
       - '@swc/core'
@@ -18712,9 +18724,9 @@ snapshots:
       - uglify-js
       - webpack-cli
 
-  '@docusaurus/module-type-aliases@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@docusaurus/module-type-aliases@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@docusaurus/types': 3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/types': 3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@types/history': 4.7.11
       '@types/react': 18.3.9
       '@types/react-router-config': 5.0.11
@@ -18730,9 +18742,9 @@ snapshots:
       - uglify-js
       - webpack-cli
 
-  '@docusaurus/module-type-aliases@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@docusaurus/module-type-aliases@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@docusaurus/types': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/types': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@types/history': 4.7.11
       '@types/react': 18.3.9
       '@types/react-router-config': 5.0.11
@@ -18748,17 +18760,17 @@ snapshots:
       - uglify-js
       - webpack-cli
 
-  '@docusaurus/plugin-content-blog@3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
+  '@docusaurus/plugin-content-blog@3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
     dependencies:
-      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
       '@docusaurus/logger': 3.5.2
-      '@docusaurus/mdx-loader': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
-      '@docusaurus/plugin-content-docs': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/theme-common': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
-      '@docusaurus/types': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
-      '@docusaurus/utils-common': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
-      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/mdx-loader': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
+      '@docusaurus/plugin-content-docs': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/theme-common': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
+      '@docusaurus/types': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
+      '@docusaurus/utils-common': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
+      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       cheerio: 1.0.0-rc.12
       feed: 4.2.2
       fs-extra: 11.2.0
@@ -18770,7 +18782,7 @@ snapshots:
       tslib: 2.7.0
       unist-util-visit: 5.0.0
       utility-types: 3.11.0
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
     transitivePeerDependencies:
       - '@mdx-js/react'
       - '@parcel/css'
@@ -18790,16 +18802,16 @@ snapshots:
       - vue-template-compiler
       - webpack-cli
 
-  '@docusaurus/plugin-content-docs@3.4.0(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
+  '@docusaurus/plugin-content-docs@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
     dependencies:
-      '@docusaurus/core': 3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/core': 3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
       '@docusaurus/logger': 3.4.0
-      '@docusaurus/mdx-loader': 3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
-      '@docusaurus/module-type-aliases': 3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@docusaurus/types': 3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@docusaurus/utils': 3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
-      '@docusaurus/utils-common': 3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
-      '@docusaurus/utils-validation': 3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/mdx-loader': 3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
+      '@docusaurus/module-type-aliases': 3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/types': 3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/utils': 3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
+      '@docusaurus/utils-common': 3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
+      '@docusaurus/utils-validation': 3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       '@types/react-router-config': 5.0.11
       combine-promises: 1.2.0
       fs-extra: 11.2.0
@@ -18809,7 +18821,7 @@ snapshots:
       react-dom: 18.3.1(react@18.3.1)
       tslib: 2.7.0
       utility-types: 3.11.0
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
     transitivePeerDependencies:
       - '@parcel/css'
       - '@rspack/core'
@@ -18828,17 +18840,17 @@ snapshots:
       - vue-template-compiler
       - webpack-cli
 
-  '@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
+  '@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
     dependencies:
-      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
       '@docusaurus/logger': 3.5.2
-      '@docusaurus/mdx-loader': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
-      '@docusaurus/module-type-aliases': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@docusaurus/theme-common': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
-      '@docusaurus/types': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
-      '@docusaurus/utils-common': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
-      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/mdx-loader': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
+      '@docusaurus/module-type-aliases': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/theme-common': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
+      '@docusaurus/types': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
+      '@docusaurus/utils-common': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
+      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       '@types/react-router-config': 5.0.11
       combine-promises: 1.2.0
       fs-extra: 11.2.0
@@ -18848,7 +18860,7 @@ snapshots:
       react-dom: 18.3.1(react@18.3.1)
       tslib: 2.7.0
       utility-types: 3.11.0
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
     transitivePeerDependencies:
       - '@mdx-js/react'
       - '@parcel/css'
@@ -18868,18 +18880,18 @@ snapshots:
       - vue-template-compiler
       - webpack-cli
 
-  '@docusaurus/plugin-content-pages@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
+  '@docusaurus/plugin-content-pages@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
     dependencies:
-      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/mdx-loader': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
-      '@docusaurus/types': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
-      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/mdx-loader': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
+      '@docusaurus/types': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
+      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       fs-extra: 11.2.0
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
       tslib: 2.7.0
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
     transitivePeerDependencies:
       - '@mdx-js/react'
       - '@parcel/css'
@@ -18899,11 +18911,11 @@ snapshots:
       - vue-template-compiler
       - webpack-cli
 
-  '@docusaurus/plugin-debug@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
+  '@docusaurus/plugin-debug@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
     dependencies:
-      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/types': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/types': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       fs-extra: 11.2.0
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
@@ -18928,11 +18940,11 @@ snapshots:
       - vue-template-compiler
       - webpack-cli
 
-  '@docusaurus/plugin-google-analytics@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
+  '@docusaurus/plugin-google-analytics@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
     dependencies:
-      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/types': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/types': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
       tslib: 2.7.0
@@ -18955,11 +18967,11 @@ snapshots:
       - vue-template-compiler
       - webpack-cli
 
-  '@docusaurus/plugin-google-gtag@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
+  '@docusaurus/plugin-google-gtag@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
     dependencies:
-      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/types': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/types': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       '@types/gtag.js': 0.0.12
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
@@ -18983,11 +18995,11 @@ snapshots:
       - vue-template-compiler
       - webpack-cli
 
-  '@docusaurus/plugin-google-tag-manager@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
+  '@docusaurus/plugin-google-tag-manager@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
     dependencies:
-      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/types': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/types': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
       tslib: 2.7.0
@@ -19010,14 +19022,14 @@ snapshots:
       - vue-template-compiler
       - webpack-cli
 
-  '@docusaurus/plugin-sitemap@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
+  '@docusaurus/plugin-sitemap@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
     dependencies:
-      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
       '@docusaurus/logger': 3.5.2
-      '@docusaurus/types': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
-      '@docusaurus/utils-common': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
-      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/types': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
+      '@docusaurus/utils-common': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
+      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       fs-extra: 11.2.0
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
@@ -19042,21 +19054,21 @@ snapshots:
       - vue-template-compiler
       - webpack-cli
 
-  '@docusaurus/preset-classic@3.5.2(@algolia/client-search@4.24.0)(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@types/react@18.3.9)(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
-    dependencies:
-      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/plugin-content-blog': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/plugin-content-docs': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/plugin-content-pages': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/plugin-debug': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/plugin-google-analytics': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/plugin-google-gtag': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/plugin-google-tag-manager': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/plugin-sitemap': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/theme-classic': 3.5.2(@types/react@18.3.9)(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/theme-common': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
-      '@docusaurus/theme-search-algolia': 3.5.2(@algolia/client-search@4.24.0)(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@types/react@18.3.9)(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/types': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+  '@docusaurus/preset-classic@3.5.2(@algolia/client-search@4.24.0)(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/react@18.3.9)(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
+    dependencies:
+      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/plugin-content-blog': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/plugin-content-docs': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/plugin-content-pages': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/plugin-debug': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/plugin-google-analytics': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/plugin-google-gtag': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/plugin-google-tag-manager': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/plugin-sitemap': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/theme-classic': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/react@18.3.9)(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/theme-common': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
+      '@docusaurus/theme-search-algolia': 3.5.2(@algolia/client-search@4.24.0)(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/react@18.3.9)(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/types': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
     transitivePeerDependencies:
@@ -19096,20 +19108,20 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@docusaurus/theme-classic@3.5.2(@types/react@18.3.9)(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
+  '@docusaurus/theme-classic@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/react@18.3.9)(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
     dependencies:
-      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/mdx-loader': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
-      '@docusaurus/module-type-aliases': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@docusaurus/plugin-content-blog': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/plugin-content-docs': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/plugin-content-pages': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/theme-common': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
+      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/mdx-loader': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
+      '@docusaurus/module-type-aliases': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/plugin-content-blog': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/plugin-content-docs': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/plugin-content-pages': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/theme-common': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
       '@docusaurus/theme-translations': 3.5.2
-      '@docusaurus/types': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
-      '@docusaurus/utils-common': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
-      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/types': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
+      '@docusaurus/utils-common': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
+      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       '@mdx-js/react': 3.0.1(@types/react@18.3.9)(react@18.3.1)
       clsx: 2.1.1
       copy-text-to-clipboard: 3.2.0
@@ -19144,13 +19156,13 @@ snapshots:
       - vue-template-compiler
       - webpack-cli
 
-  '@docusaurus/theme-common@3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)':
+  '@docusaurus/theme-common@3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)':
     dependencies:
-      '@docusaurus/mdx-loader': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
-      '@docusaurus/module-type-aliases': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@docusaurus/plugin-content-docs': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
-      '@docusaurus/utils-common': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
+      '@docusaurus/mdx-loader': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
+      '@docusaurus/module-type-aliases': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/plugin-content-docs': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
+      '@docusaurus/utils-common': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
       '@types/history': 4.7.11
       '@types/react': 18.3.9
       '@types/react-router-config': 5.0.11
@@ -19170,12 +19182,12 @@ snapshots:
       - uglify-js
       - webpack-cli
 
-  '@docusaurus/theme-live-codeblock@3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
+  '@docusaurus/theme-live-codeblock@3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
     dependencies:
-      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/theme-common': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
+      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/theme-common': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
       '@docusaurus/theme-translations': 3.5.2
-      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       '@philpl/buble': 0.19.7
       clsx: 2.1.1
       fs-extra: 11.2.0
@@ -19204,13 +19216,13 @@ snapshots:
       - vue-template-compiler
       - webpack-cli
 
-  '@docusaurus/theme-mermaid@3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
+  '@docusaurus/theme-mermaid@3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
     dependencies:
-      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/module-type-aliases': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@docusaurus/theme-common': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
-      '@docusaurus/types': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/module-type-aliases': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/theme-common': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
+      '@docusaurus/types': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       mermaid: 10.9.3
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
@@ -19235,16 +19247,16 @@ snapshots:
       - vue-template-compiler
       - webpack-cli
 
-  '@docusaurus/theme-search-algolia@3.5.2(@algolia/client-search@4.24.0)(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@types/react@18.3.9)(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
+  '@docusaurus/theme-search-algolia@3.5.2(@algolia/client-search@4.24.0)(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/react@18.3.9)(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)':
     dependencies:
       '@docsearch/react': 3.6.1(@algolia/client-search@4.24.0)(@types/react@18.3.9)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
       '@docusaurus/logger': 3.5.2
-      '@docusaurus/plugin-content-docs': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/theme-common': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
+      '@docusaurus/plugin-content-docs': 3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/theme-common': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
       '@docusaurus/theme-translations': 3.5.2
-      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
-      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
+      '@docusaurus/utils-validation': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       algoliasearch: 4.24.0
       algoliasearch-helper: 3.22.5(algoliasearch@4.24.0)
       clsx: 2.1.1
@@ -19290,7 +19302,7 @@ snapshots:
 
   '@docusaurus/tsconfig@3.5.2': {}
 
-  '@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@mdx-js/mdx': 3.0.1
       '@types/history': 4.7.11
@@ -19301,7 +19313,7 @@ snapshots:
       react-dom: 18.3.1(react@18.3.1)
       react-helmet-async: 1.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       utility-types: 3.11.0
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
       webpack-merge: 5.10.0
     transitivePeerDependencies:
       - '@swc/core'
@@ -19310,7 +19322,7 @@ snapshots:
       - uglify-js
       - webpack-cli
 
-  '@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@mdx-js/mdx': 3.0.1
       '@types/history': 4.7.11
@@ -19321,7 +19333,7 @@ snapshots:
       react-dom: 18.3.1(react@18.3.1)
       react-helmet-async: 1.3.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       utility-types: 3.11.0
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
       webpack-merge: 5.10.0
     transitivePeerDependencies:
       - '@swc/core'
@@ -19330,29 +19342,29 @@ snapshots:
       - uglify-js
       - webpack-cli
 
-  '@docusaurus/utils-common@3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))':
+  '@docusaurus/utils-common@3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))':
     dependencies:
       tslib: 2.7.0
     optionalDependencies:
-      '@docusaurus/types': 3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/types': 3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
 
-  '@docusaurus/utils-common@3.4.0(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))':
+  '@docusaurus/utils-common@3.4.0(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))':
     dependencies:
       tslib: 2.7.0
     optionalDependencies:
-      '@docusaurus/types': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/types': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
 
-  '@docusaurus/utils-common@3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))':
+  '@docusaurus/utils-common@3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))':
     dependencies:
       tslib: 2.7.0
     optionalDependencies:
-      '@docusaurus/types': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/types': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
 
-  '@docusaurus/utils-validation@3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)':
+  '@docusaurus/utils-validation@3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)':
     dependencies:
       '@docusaurus/logger': 3.4.0
-      '@docusaurus/utils': 3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
-      '@docusaurus/utils-common': 3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
+      '@docusaurus/utils': 3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
+      '@docusaurus/utils-common': 3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
       fs-extra: 11.2.0
       joi: 17.13.3
       js-yaml: 4.1.0
@@ -19367,11 +19379,11 @@ snapshots:
       - uglify-js
       - webpack-cli
 
-  '@docusaurus/utils-validation@3.4.0(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)':
+  '@docusaurus/utils-validation@3.4.0(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)':
     dependencies:
       '@docusaurus/logger': 3.4.0
-      '@docusaurus/utils': 3.4.0(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
-      '@docusaurus/utils-common': 3.4.0(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
+      '@docusaurus/utils': 3.4.0(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
+      '@docusaurus/utils-common': 3.4.0(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
       fs-extra: 11.2.0
       joi: 17.13.3
       js-yaml: 4.1.0
@@ -19386,11 +19398,11 @@ snapshots:
       - uglify-js
       - webpack-cli
 
-  '@docusaurus/utils-validation@3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)':
+  '@docusaurus/utils-validation@3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)':
     dependencies:
       '@docusaurus/logger': 3.5.2
-      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
-      '@docusaurus/utils-common': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
+      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
+      '@docusaurus/utils-common': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
       fs-extra: 11.2.0
       joi: 17.13.3
       js-yaml: 4.1.0
@@ -19405,13 +19417,13 @@ snapshots:
       - uglify-js
       - webpack-cli
 
-  '@docusaurus/utils@3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)':
+  '@docusaurus/utils@3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)':
     dependencies:
       '@docusaurus/logger': 3.4.0
-      '@docusaurus/utils-common': 3.4.0(@docusaurus/types@3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
+      '@docusaurus/utils-common': 3.4.0(@docusaurus/types@3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
       '@svgr/webpack': 8.1.0(typescript@5.6.2)
       escape-string-regexp: 4.0.0
-      file-loader: 6.2.0(webpack@5.95.0)
+      file-loader: 6.2.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       fs-extra: 11.2.0
       github-slugger: 1.5.0
       globby: 11.1.0
@@ -19424,11 +19436,11 @@ snapshots:
       resolve-pathname: 3.0.0
       shelljs: 0.8.5
       tslib: 2.7.0
-      url-loader: 4.1.1(file-loader@6.2.0(webpack@5.95.0))(webpack@5.95.0)
+      url-loader: 4.1.1(file-loader@6.2.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))))(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       utility-types: 3.11.0
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
     optionalDependencies:
-      '@docusaurus/types': 3.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/types': 3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild
@@ -19437,13 +19449,13 @@ snapshots:
       - uglify-js
       - webpack-cli
 
-  '@docusaurus/utils@3.4.0(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)':
+  '@docusaurus/utils@3.4.0(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)':
     dependencies:
       '@docusaurus/logger': 3.4.0
-      '@docusaurus/utils-common': 3.4.0(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
+      '@docusaurus/utils-common': 3.4.0(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
       '@svgr/webpack': 8.1.0(typescript@5.6.2)
       escape-string-regexp: 4.0.0
-      file-loader: 6.2.0(webpack@5.95.0)
+      file-loader: 6.2.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       fs-extra: 11.2.0
       github-slugger: 1.5.0
       globby: 11.1.0
@@ -19456,11 +19468,11 @@ snapshots:
       resolve-pathname: 3.0.0
       shelljs: 0.8.5
       tslib: 2.7.0
-      url-loader: 4.1.1(file-loader@6.2.0(webpack@5.95.0))(webpack@5.95.0)
+      url-loader: 4.1.1(file-loader@6.2.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))))(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       utility-types: 3.11.0
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
     optionalDependencies:
-      '@docusaurus/types': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/types': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild
@@ -19469,13 +19481,13 @@ snapshots:
       - uglify-js
       - webpack-cli
 
-  '@docusaurus/utils@3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)':
+  '@docusaurus/utils@3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)':
     dependencies:
       '@docusaurus/logger': 3.5.2
-      '@docusaurus/utils-common': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
+      '@docusaurus/utils-common': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
       '@svgr/webpack': 8.1.0(typescript@5.6.2)
       escape-string-regexp: 4.0.0
-      file-loader: 6.2.0(webpack@5.95.0)
+      file-loader: 6.2.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       fs-extra: 11.2.0
       github-slugger: 1.5.0
       globby: 11.1.0
@@ -19488,11 +19500,11 @@ snapshots:
       resolve-pathname: 3.0.0
       shelljs: 0.8.5
       tslib: 2.7.0
-      url-loader: 4.1.1(file-loader@6.2.0(webpack@5.95.0))(webpack@5.95.0)
+      url-loader: 4.1.1(file-loader@6.2.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))))(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       utility-types: 3.11.0
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
     optionalDependencies:
-      '@docusaurus/types': 3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@docusaurus/types': 3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild
@@ -20075,24 +20087,24 @@ snapshots:
       - encoding
       - supports-color
 
-  '@graphql-markdown/core@1.12.0(@graphql-markdown/printer-legacy@1.9.0(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(graphql@16.9.0)(prettier@3.3.3)(typescript@5.6.2))(graphql-config@5.1.2(@types/node@22.7.3)(graphql@16.9.0)(typescript@5.6.2))(graphql@16.9.0)(prettier@3.3.3)':
+  '@graphql-markdown/core@1.12.0(@graphql-markdown/printer-legacy@1.9.0(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(graphql@16.9.0)(prettier@3.3.3)(typescript@5.6.2))(graphql-config@5.1.2(@types/node@22.7.3)(graphql@16.9.0)(typescript@5.6.2))(graphql@16.9.0)(prettier@3.3.3)':
     dependencies:
       '@graphql-markdown/graphql': 1.1.4(graphql@16.9.0)(prettier@3.3.3)
       '@graphql-markdown/logger': 1.0.4
       '@graphql-markdown/utils': 1.7.0(prettier@3.3.3)
     optionalDependencies:
-      '@graphql-markdown/printer-legacy': 1.9.0(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(graphql@16.9.0)(prettier@3.3.3)(typescript@5.6.2)
+      '@graphql-markdown/printer-legacy': 1.9.0(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(graphql@16.9.0)(prettier@3.3.3)(typescript@5.6.2)
       graphql-config: 5.1.2(@types/node@22.7.3)(graphql@16.9.0)(typescript@5.6.2)
     transitivePeerDependencies:
       - graphql
       - prettier
 
-  '@graphql-markdown/docusaurus@1.26.2(@docusaurus/logger@3.5.2)(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(graphql-config@5.1.2(@types/node@22.7.3)(graphql@16.9.0)(typescript@5.6.2))(graphql@16.9.0)(prettier@3.3.3)(typescript@5.6.2)':
+  '@graphql-markdown/docusaurus@1.26.2(@docusaurus/logger@3.5.2)(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(graphql-config@5.1.2(@types/node@22.7.3)(graphql@16.9.0)(typescript@5.6.2))(graphql@16.9.0)(prettier@3.3.3)(typescript@5.6.2)':
     dependencies:
       '@docusaurus/logger': 3.5.2
-      '@graphql-markdown/core': 1.12.0(@graphql-markdown/printer-legacy@1.9.0(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(graphql@16.9.0)(prettier@3.3.3)(typescript@5.6.2))(graphql-config@5.1.2(@types/node@22.7.3)(graphql@16.9.0)(typescript@5.6.2))(graphql@16.9.0)(prettier@3.3.3)
+      '@graphql-markdown/core': 1.12.0(@graphql-markdown/printer-legacy@1.9.0(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(graphql@16.9.0)(prettier@3.3.3)(typescript@5.6.2))(graphql-config@5.1.2(@types/node@22.7.3)(graphql@16.9.0)(typescript@5.6.2))(graphql@16.9.0)(prettier@3.3.3)
       '@graphql-markdown/logger': 1.0.4
-      '@graphql-markdown/printer-legacy': 1.9.0(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(graphql@16.9.0)(prettier@3.3.3)(typescript@5.6.2)
+      '@graphql-markdown/printer-legacy': 1.9.0(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(graphql@16.9.0)(prettier@3.3.3)(typescript@5.6.2)
     transitivePeerDependencies:
       - '@docusaurus/types'
       - '@graphql-markdown/diff'
@@ -20117,9 +20129,9 @@ snapshots:
 
   '@graphql-markdown/logger@1.0.4': {}
 
-  '@graphql-markdown/printer-legacy@1.9.0(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(graphql@16.9.0)(prettier@3.3.3)(typescript@5.6.2)':
+  '@graphql-markdown/printer-legacy@1.9.0(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(graphql@16.9.0)(prettier@3.3.3)(typescript@5.6.2)':
     dependencies:
-      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/utils': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       '@graphql-markdown/graphql': 1.1.4(graphql@16.9.0)(prettier@3.3.3)
       '@graphql-markdown/utils': 1.7.0(prettier@3.3.3)
     transitivePeerDependencies:
@@ -20457,9 +20469,9 @@ snapshots:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
 
-  '@headlessui/tailwindcss@0.1.3(tailwindcss@3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2)))':
+  '@headlessui/tailwindcss@0.1.3(tailwindcss@3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2)))':
     dependencies:
-      tailwindcss: 3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2))
+      tailwindcss: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2))
 
   '@hookform/resolvers@3.9.0(react-hook-form@7.53.0(react@18.3.1))':
     dependencies:
@@ -20537,7 +20549,7 @@ snapshots:
       jest-util: 29.7.0
       slash: 3.0.0
 
-  '@jest/core@29.7.0(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))':
+  '@jest/core@29.7.0(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))':
     dependencies:
       '@jest/console': 29.7.0
       '@jest/reporters': 29.7.0(node-notifier@10.0.0)
@@ -20551,7 +20563,7 @@ snapshots:
       exit: 0.1.2
       graceful-fs: 4.2.11
       jest-changed-files: 29.7.0
-      jest-config: 29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))
+      jest-config: 29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))
       jest-haste-map: 29.7.0
       jest-message-util: 29.7.0
       jest-regex-util: 29.6.3
@@ -21076,14 +21088,14 @@ snapshots:
       pump: 3.0.2
       tar-fs: 2.1.1
 
-  '@nestjs/cache-manager@2.2.2(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.4(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.4)(reflect-metadata@0.2.2)(rxjs@7.8.1))(cache-manager@5.7.6)(rxjs@7.8.1)':
+  '@nestjs/cache-manager@2.2.2(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.4)(cache-manager@5.7.6)(rxjs@7.8.1)':
     dependencies:
       '@nestjs/common': 10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1)
       '@nestjs/core': 10.4.4(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.4)(reflect-metadata@0.2.2)(rxjs@7.8.1)
       cache-manager: 5.7.6
       rxjs: 7.8.1
 
-  '@nestjs/cli@10.4.5(@swc/core@1.7.28)':
+  '@nestjs/cli@10.4.5(@swc/core@1.7.28(@swc/helpers@0.5.5))':
     dependencies:
       '@angular-devkit/core': 17.3.8(chokidar@3.6.0)
       '@angular-devkit/schematics': 17.3.8(chokidar@3.6.0)
@@ -21093,7 +21105,7 @@ snapshots:
       chokidar: 3.6.0
       cli-table3: 0.6.5
       commander: 4.1.1
-      fork-ts-checker-webpack-plugin: 9.0.2(typescript@5.3.3)(webpack@5.94.0(@swc/core@1.7.28))
+      fork-ts-checker-webpack-plugin: 9.0.2(typescript@5.3.3)(webpack@5.94.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       glob: 10.4.2
       inquirer: 8.2.6
       node-emoji: 1.11.0
@@ -21102,7 +21114,7 @@ snapshots:
       tsconfig-paths: 4.2.0
       tsconfig-paths-webpack-plugin: 4.1.0
       typescript: 5.3.3
-      webpack: 5.94.0(@swc/core@1.7.28)
+      webpack: 5.94.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
       webpack-node-externals: 3.0.0
     optionalDependencies:
       '@swc/core': 1.7.28(@swc/helpers@0.5.5)
@@ -21155,7 +21167,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@nestjs/schedule@4.1.1(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.4(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.4)(reflect-metadata@0.2.2)(rxjs@7.8.1))':
+  '@nestjs/schedule@4.1.1(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.4)':
     dependencies:
       '@nestjs/common': 10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1)
       '@nestjs/core': 10.4.4(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.4)(reflect-metadata@0.2.2)(rxjs@7.8.1)
@@ -21184,7 +21196,7 @@ snapshots:
     transitivePeerDependencies:
       - chokidar
 
-  '@nestjs/testing@10.4.4(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.4(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.4)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.4(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.4))':
+  '@nestjs/testing@10.4.4(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.4)(@nestjs/platform-express@10.4.4)':
     dependencies:
       '@nestjs/common': 10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1)
       '@nestjs/core': 10.4.4(@nestjs/common@10.4.4(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.4)(reflect-metadata@0.2.2)(rxjs@7.8.1)
@@ -23782,14 +23794,14 @@ snapshots:
     dependencies:
       defer-to-connect: 2.0.1
 
-  '@tailwindcss/aspect-ratio@0.4.2(tailwindcss@3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2)))':
+  '@tailwindcss/aspect-ratio@0.4.2(tailwindcss@3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2)))':
     dependencies:
-      tailwindcss: 3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2))
+      tailwindcss: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2))
 
-  '@tailwindcss/forms@0.5.9(tailwindcss@3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2)))':
+  '@tailwindcss/forms@0.5.9(tailwindcss@3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2)))':
     dependencies:
       mini-svg-data-uri: 1.4.4
-      tailwindcss: 3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2))
+      tailwindcss: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2))
 
   '@tanstack/eslint-plugin-query@5.58.1(eslint@8.57.1)(typescript@5.6.2)':
     dependencies:
@@ -24293,11 +24305,11 @@ snapshots:
 
   '@types/webextension-polyfill@0.10.7': {}
 
-  '@types/webpack@5.28.5(@swc/core@1.7.28)(webpack-cli@5.1.4(webpack@5.95.0))':
+  '@types/webpack@5.28.5(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4)':
     dependencies:
       '@types/node': 20.16.9
       tapable: 2.2.1
-      webpack: 5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4)
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild
@@ -25072,19 +25084,19 @@ snapshots:
       '@webassemblyjs/ast': 1.12.1
       '@xtuc/long': 4.2.2
 
-  '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4(webpack@5.95.0))(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4))':
+  '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.95.0)':
     dependencies:
-      webpack: 5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4)
       webpack-cli: 5.1.4(webpack@5.95.0)
 
-  '@webpack-cli/info@2.0.2(webpack-cli@5.1.4(webpack@5.95.0))(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4))':
+  '@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.95.0)':
     dependencies:
-      webpack: 5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4)
       webpack-cli: 5.1.4(webpack@5.95.0)
 
-  '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4(webpack@5.95.0))(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4))':
+  '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack@5.95.0)':
     dependencies:
-      webpack: 5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4)
       webpack-cli: 5.1.4(webpack@5.95.0)
 
   '@whatwg-node/events@0.0.3': {}
@@ -25575,12 +25587,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  babel-loader@9.2.1(@babel/core@7.25.2)(webpack@5.95.0):
+  babel-loader@9.2.1(@babel/core@7.25.2)(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       '@babel/core': 7.25.2
       find-cache-dir: 4.0.0
       schema-utils: 4.2.0
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
 
   babel-plugin-dynamic-import-node@2.3.3:
     dependencies:
@@ -26380,7 +26392,7 @@ snapshots:
 
   copy-text-to-clipboard@3.2.0: {}
 
-  copy-webpack-plugin@11.0.0(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)):
+  copy-webpack-plugin@11.0.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       fast-glob: 3.3.2
       glob-parent: 6.0.2
@@ -26388,7 +26400,7 @@ snapshots:
       normalize-path: 3.0.0
       schema-utils: 4.2.0
       serialize-javascript: 6.0.2
-      webpack: 5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
 
   copy-webpack-plugin@11.0.0(webpack@5.95.0):
     dependencies:
@@ -26398,7 +26410,7 @@ snapshots:
       normalize-path: 3.0.0
       schema-utils: 4.2.0
       serialize-javascript: 6.0.2
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4)
 
   core-js-compat@3.38.1:
     dependencies:
@@ -26468,13 +26480,13 @@ snapshots:
 
   crc-32@1.2.2: {}
 
-  create-jest@29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2)):
+  create-jest@29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2)):
     dependencies:
       '@jest/types': 29.6.3
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.11
-      jest-config: 29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))
+      jest-config: 29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))
       jest-util: 29.7.0
       prompts: 2.4.2
     transitivePeerDependencies:
@@ -26544,7 +26556,7 @@ snapshots:
       postcss-selector-parser: 6.1.2
       postcss-value-parser: 4.2.0
 
-  css-loader@6.11.0(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)):
+  css-loader@6.11.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       icss-utils: 5.1.0(postcss@8.4.47)
       postcss: 8.4.47
@@ -26555,7 +26567,7 @@ snapshots:
       postcss-value-parser: 4.2.0
       semver: 7.6.3
     optionalDependencies:
-      webpack: 5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
 
   css-loader@6.11.0(webpack@5.95.0):
     dependencies:
@@ -26568,9 +26580,9 @@ snapshots:
       postcss-value-parser: 4.2.0
       semver: 7.6.3
     optionalDependencies:
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4)
 
-  css-minimizer-webpack-plugin@5.0.1(clean-css@5.3.3)(webpack@5.95.0):
+  css-minimizer-webpack-plugin@5.0.1(clean-css@5.3.3)(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
       cssnano: 6.1.2(postcss@8.4.47)
@@ -26578,7 +26590,7 @@ snapshots:
       postcss: 8.4.47
       schema-utils: 4.2.0
       serialize-javascript: 6.0.2
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
     optionalDependencies:
       clean-css: 5.3.3
 
@@ -27123,15 +27135,15 @@ snapshots:
     dependencies:
       esutils: 2.0.3
 
-  docusaurus-theme-search-typesense@0.20.0-0(@algolia/client-search@4.24.0)(@babel/runtime@7.25.6)(@docusaurus/core@3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/theme-common@3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2))(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.9)(algoliasearch@4.24.0)(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16):
+  docusaurus-theme-search-typesense@0.20.0-0(iea5eyhbiud2dlcqtud2g4pxzm):
     dependencies:
-      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/core': 3.5.2(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
       '@docusaurus/logger': 3.4.0
-      '@docusaurus/plugin-content-docs': 3.4.0(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
-      '@docusaurus/theme-common': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
+      '@docusaurus/plugin-content-docs': 3.4.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)
+      '@docusaurus/theme-common': 3.5.2(@docusaurus/plugin-content-docs@3.5.2(@mdx-js/react@3.0.1(@types/react@18.3.9)(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(eslint@8.57.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)(vue-template-compiler@2.7.16))(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.6.2)
       '@docusaurus/theme-translations': 3.4.0
-      '@docusaurus/utils': 3.4.0(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
-      '@docusaurus/utils-validation': 3.4.0(@docusaurus/types@3.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(typescript@5.6.2)
+      '@docusaurus/utils': 3.4.0(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
+      '@docusaurus/utils-validation': 3.4.0(@docusaurus/types@3.5.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@swc/core@1.7.28(@swc/helpers@0.5.5))(typescript@5.6.2)
       algoliasearch-helper: 3.22.5(algoliasearch@4.24.0)
       clsx: 1.2.1
       eta: 2.2.0
@@ -27548,7 +27560,7 @@ snapshots:
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
       eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1)
-      eslint-plugin-import: 2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)
+      eslint-plugin-import: 2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1)
       eslint-plugin-jsx-a11y: 6.10.0(eslint@8.57.1)
       eslint-plugin-react: 7.37.0(eslint@8.57.1)
       eslint-plugin-react-hooks: 4.6.2(eslint@8.57.1)
@@ -27572,25 +27584,6 @@ snapshots:
       - supports-color
 
   eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1):
-    dependencies:
-      '@nolyfill/is-core-module': 1.0.39
-      debug: 4.3.7(supports-color@8.1.1)
-      enhanced-resolve: 5.17.1
-      eslint: 8.57.1
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1)
-      fast-glob: 3.3.2
-      get-tsconfig: 4.8.1
-      is-bun-module: 1.2.1
-      is-glob: 4.0.3
-    optionalDependencies:
-      eslint-plugin-import: 2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)
-    transitivePeerDependencies:
-      - '@typescript-eslint/parser'
-      - eslint-import-resolver-node
-      - eslint-import-resolver-webpack
-      - supports-color
-
-  eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1):
     dependencies:
       '@nolyfill/is-core-module': 1.0.39
       debug: 4.3.7(supports-color@8.1.1)
@@ -27602,24 +27595,13 @@ snapshots:
       is-bun-module: 1.2.1
       is-glob: 4.0.3
     optionalDependencies:
-      eslint-plugin-import: 2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1)
+      eslint-plugin-import: 2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1)
     transitivePeerDependencies:
       - '@typescript-eslint/parser'
       - eslint-import-resolver-node
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-module-utils@2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1):
-    dependencies:
-      debug: 3.2.7
-    optionalDependencies:
-      '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.6.2)
-      eslint: 8.57.1
-      eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1)
-    transitivePeerDependencies:
-      - supports-color
-
   eslint-module-utils@2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
       debug: 3.2.7
@@ -27627,7 +27609,7 @@ snapshots:
       '@typescript-eslint/parser': 6.21.0(eslint@8.57.1)(typescript@5.6.2)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -27635,7 +27617,7 @@ snapshots:
     dependencies:
       eslint: 8.57.1
 
-  eslint-plugin-import@2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1):
+  eslint-plugin-import@2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.8
@@ -27761,7 +27743,7 @@ snapshots:
 
   eslint-visitor-keys@4.1.0: {}
 
-  eslint-webpack-plugin@4.2.0(eslint@8.57.1)(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)):
+  eslint-webpack-plugin@4.2.0(eslint@8.57.1)(webpack@5.95.0):
     dependencies:
       '@types/eslint': 8.56.12
       eslint: 8.57.1
@@ -27769,7 +27751,7 @@ snapshots:
       micromatch: 4.0.8
       normalize-path: 3.0.0
       schema-utils: 4.2.0
-      webpack: 5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4)
 
   eslint@8.57.1:
     dependencies:
@@ -28134,11 +28116,11 @@ snapshots:
     dependencies:
       flat-cache: 3.2.0
 
-  file-loader@6.2.0(webpack@5.95.0):
+  file-loader@6.2.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       loader-utils: 2.0.4
       schema-utils: 3.3.0
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
 
   file-system-cache@2.3.0:
     dependencies:
@@ -28246,7 +28228,7 @@ snapshots:
 
   forever-agent@0.6.1: {}
 
-  fork-ts-checker-webpack-plugin@6.5.3(eslint@8.57.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)(webpack@5.95.0):
+  fork-ts-checker-webpack-plugin@6.5.3(eslint@8.57.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       '@babel/code-frame': 7.24.7
       '@types/json-schema': 7.0.15
@@ -28262,12 +28244,12 @@ snapshots:
       semver: 7.6.3
       tapable: 1.1.3
       typescript: 5.6.2
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
     optionalDependencies:
       eslint: 8.57.1
       vue-template-compiler: 2.7.16
 
-  fork-ts-checker-webpack-plugin@9.0.2(typescript@5.3.3)(webpack@5.94.0(@swc/core@1.7.28)):
+  fork-ts-checker-webpack-plugin@9.0.2(typescript@5.3.3)(webpack@5.94.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       '@babel/code-frame': 7.24.7
       chalk: 4.1.2
@@ -28282,7 +28264,7 @@ snapshots:
       semver: 7.6.3
       tapable: 2.2.1
       typescript: 5.3.3
-      webpack: 5.94.0(@swc/core@1.7.28)
+      webpack: 5.94.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
 
   form-data-encoder@2.1.4: {}
 
@@ -29030,7 +29012,7 @@ snapshots:
 
   html-void-elements@3.0.0: {}
 
-  html-webpack-plugin@5.6.0(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)):
+  html-webpack-plugin@5.6.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       '@types/html-minifier-terser': 6.1.0
       html-minifier-terser: 6.1.0
@@ -29038,7 +29020,7 @@ snapshots:
       pretty-error: 4.0.0
       tapable: 2.2.1
     optionalDependencies:
-      webpack: 5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
 
   html-webpack-plugin@5.6.0(webpack@5.95.0):
     dependencies:
@@ -29048,7 +29030,7 @@ snapshots:
       pretty-error: 4.0.0
       tapable: 2.2.1
     optionalDependencies:
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4)
 
   htmlparser2@6.1.0:
     dependencies:
@@ -29683,16 +29665,16 @@ snapshots:
       - babel-plugin-macros
       - supports-color
 
-  jest-cli@29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2)):
+  jest-cli@29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2)):
     dependencies:
-      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))
+      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
       chalk: 4.1.2
-      create-jest: 29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))
+      create-jest: 29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))
       exit: 0.1.2
       import-local: 3.2.0
-      jest-config: 29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))
+      jest-config: 29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))
       jest-util: 29.7.0
       jest-validate: 29.7.0
       yargs: 17.7.2
@@ -29704,7 +29686,7 @@ snapshots:
       - supports-color
       - ts-node
 
-  jest-config@29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2)):
+  jest-config@29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2)):
     dependencies:
       '@babel/core': 7.25.2
       '@jest/test-sequencer': 29.7.0
@@ -29730,7 +29712,7 @@ snapshots:
       strip-json-comments: 3.1.1
     optionalDependencies:
       '@types/node': 20.16.9
-      ts-node: 10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2)
+      ts-node: 10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2)
     transitivePeerDependencies:
       - babel-plugin-macros
       - supports-color
@@ -29961,12 +29943,12 @@ snapshots:
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
-  jest@29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2)):
+  jest@29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2)):
     dependencies:
-      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))
+      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))
       '@jest/types': 29.6.3
       import-local: 3.2.0
-      jest-cli: 29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))
+      jest-cli: 29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))
     optionalDependencies:
       node-notifier: 10.0.0
     transitivePeerDependencies:
@@ -31232,17 +31214,17 @@ snapshots:
 
   min-indent@1.0.1: {}
 
-  mini-css-extract-plugin@2.9.1(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)):
+  mini-css-extract-plugin@2.9.1(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       schema-utils: 4.2.0
       tapable: 2.2.1
-      webpack: 5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
 
   mini-css-extract-plugin@2.9.1(webpack@5.95.0):
     dependencies:
       schema-utils: 4.2.0
       tapable: 2.2.1
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4)
 
   mini-svg-data-uri@1.4.4: {}
 
@@ -32173,29 +32155,29 @@ snapshots:
       '@csstools/utilities': 1.0.0(postcss@8.4.47)
       postcss: 8.4.47
 
-  postcss-load-config@4.0.2(postcss@8.4.47)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2)):
+  postcss-load-config@4.0.2(postcss@8.4.47)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2)):
     dependencies:
       lilconfig: 3.1.2
       yaml: 2.5.1
     optionalDependencies:
       postcss: 8.4.47
-      ts-node: 10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2)
+      ts-node: 10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2)
 
-  postcss-load-config@4.0.2(postcss@8.4.47)(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2)):
+  postcss-load-config@4.0.2(postcss@8.4.47)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2)):
     dependencies:
       lilconfig: 3.1.2
       yaml: 2.5.1
     optionalDependencies:
       postcss: 8.4.47
-      ts-node: 10.9.2(@types/node@22.7.3)(typescript@5.6.2)
+      ts-node: 10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2)
 
-  postcss-loader@7.3.4(postcss@8.4.47)(typescript@5.6.2)(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)):
+  postcss-loader@7.3.4(postcss@8.4.47)(typescript@5.6.2)(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       cosmiconfig: 8.3.6(typescript@5.6.2)
       jiti: 1.21.6
       postcss: 8.4.47
       semver: 7.6.3
-      webpack: 5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
     transitivePeerDependencies:
       - typescript
 
@@ -32205,7 +32187,7 @@ snapshots:
       jiti: 1.21.6
       postcss: 8.4.47
       semver: 7.6.3
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4)
     transitivePeerDependencies:
       - typescript
 
@@ -32710,7 +32692,7 @@ snapshots:
       react: 18.3.1
       tween-functions: 1.2.0
 
-  react-dev-utils@12.0.1(eslint@8.57.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)(webpack@5.95.0):
+  react-dev-utils@12.0.1(eslint@8.57.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       '@babel/code-frame': 7.24.7
       address: 1.2.2
@@ -32721,7 +32703,7 @@ snapshots:
       escape-string-regexp: 4.0.0
       filesize: 8.0.7
       find-up: 5.0.0
-      fork-ts-checker-webpack-plugin: 6.5.3(eslint@8.57.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)(webpack@5.95.0)
+      fork-ts-checker-webpack-plugin: 6.5.3(eslint@8.57.1)(typescript@5.6.2)(vue-template-compiler@2.7.16)(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       global-modules: 2.0.0
       globby: 11.1.0
       gzip-size: 6.0.0
@@ -32736,7 +32718,7 @@ snapshots:
       shell-quote: 1.8.1
       strip-ansi: 6.0.1
       text-table: 0.2.0
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
     optionalDependencies:
       typescript: 5.6.2
     transitivePeerDependencies:
@@ -32837,11 +32819,11 @@ snapshots:
       sucrase: 3.35.0
       use-editable: 2.3.3(react@18.3.1)
 
-  react-loadable-ssr-addon-v5-slorber@1.0.1(@docusaurus/react-loadable@6.0.0(react@18.3.1))(webpack@5.95.0):
+  react-loadable-ssr-addon-v5-slorber@1.0.1(@docusaurus/react-loadable@6.0.0(react@18.3.1))(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       '@babel/runtime': 7.25.6
       react-loadable: '@docusaurus/react-loadable@6.0.0(react@18.3.1)'
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
 
   react-number-format@5.4.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
@@ -33531,10 +33513,10 @@ snapshots:
 
   safer-buffer@2.1.2: {}
 
-  sass-loader@13.3.3(sass@1.79.3)(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)):
+  sass-loader@13.3.3(sass@1.79.3)(webpack@5.95.0):
     dependencies:
       neo-async: 2.6.2
-      webpack: 5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4)
     optionalDependencies:
       sass: 1.79.3
 
@@ -34257,15 +34239,15 @@ snapshots:
 
   tailwind-merge@2.5.2: {}
 
-  tailwindcss-animate@1.0.7(tailwindcss@3.4.13(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))):
+  tailwindcss-animate@1.0.7(tailwindcss@3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))):
     dependencies:
-      tailwindcss: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))
+      tailwindcss: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))
 
-  tailwindcss-animate@1.0.7(tailwindcss@3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2))):
+  tailwindcss-animate@1.0.7(tailwindcss@3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2))):
     dependencies:
-      tailwindcss: 3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2))
+      tailwindcss: 3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2))
 
-  tailwindcss@3.4.13(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2)):
+  tailwindcss@3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2)):
     dependencies:
       '@alloc/quick-lru': 5.2.0
       arg: 5.0.2
@@ -34284,7 +34266,7 @@ snapshots:
       postcss: 8.4.47
       postcss-import: 15.1.0(postcss@8.4.47)
       postcss-js: 4.0.1(postcss@8.4.47)
-      postcss-load-config: 4.0.2(postcss@8.4.47)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))
+      postcss-load-config: 4.0.2(postcss@8.4.47)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))
       postcss-nested: 6.2.0(postcss@8.4.47)
       postcss-selector-parser: 6.1.2
       resolve: 1.22.8
@@ -34292,7 +34274,7 @@ snapshots:
     transitivePeerDependencies:
       - ts-node
 
-  tailwindcss@3.4.13(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2)):
+  tailwindcss@3.4.13(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2)):
     dependencies:
       '@alloc/quick-lru': 5.2.0
       arg: 5.0.2
@@ -34311,7 +34293,7 @@ snapshots:
       postcss: 8.4.47
       postcss-import: 15.1.0(postcss@8.4.47)
       postcss-js: 4.0.1(postcss@8.4.47)
-      postcss-load-config: 4.0.2(postcss@8.4.47)(ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2))
+      postcss-load-config: 4.0.2(postcss@8.4.47)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2))
       postcss-nested: 6.2.0(postcss@8.4.47)
       postcss-selector-parser: 6.1.2
       resolve: 1.22.8
@@ -34367,48 +34349,39 @@ snapshots:
 
   term-size@2.2.1: {}
 
-  terser-webpack-plugin@5.3.10(@swc/core@1.7.28)(webpack@5.94.0(@swc/core@1.7.28)):
+  terser-webpack-plugin@5.3.10(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack@5.94.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
       jest-worker: 27.5.1
       schema-utils: 3.3.0
       serialize-javascript: 6.0.2
       terser: 5.34.0
-      webpack: 5.94.0(@swc/core@1.7.28)
+      webpack: 5.94.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
     optionalDependencies:
       '@swc/core': 1.7.28(@swc/helpers@0.5.5)
 
-  terser-webpack-plugin@5.3.10(@swc/core@1.7.28)(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)):
+  terser-webpack-plugin@5.3.10(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
       jest-worker: 27.5.1
       schema-utils: 3.3.0
       serialize-javascript: 6.0.2
       terser: 5.34.0
-      webpack: 5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
     optionalDependencies:
       '@swc/core': 1.7.28(@swc/helpers@0.5.5)
 
-  terser-webpack-plugin@5.3.10(@swc/core@1.7.28)(webpack@5.95.0(@swc/core@1.7.28)):
+  terser-webpack-plugin@5.3.10(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack@5.95.0):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
       jest-worker: 27.5.1
       schema-utils: 3.3.0
       serialize-javascript: 6.0.2
       terser: 5.34.0
-      webpack: 5.95.0(@swc/core@1.7.28)
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4)
     optionalDependencies:
       '@swc/core': 1.7.28(@swc/helpers@0.5.5)
 
-  terser-webpack-plugin@5.3.10(webpack@5.95.0):
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.25
-      jest-worker: 27.5.1
-      schema-utils: 3.3.0
-      serialize-javascript: 6.0.2
-      terser: 5.34.0
-      webpack: 5.95.0
-
   terser@5.34.0:
     dependencies:
       '@jridgewell/source-map': 0.3.6
@@ -34553,12 +34526,12 @@ snapshots:
 
   ts-interface-checker@0.1.13: {}
 
-  ts-jest@29.2.5(@babel/core@7.25.2)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.2))(jest@29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2)))(typescript@5.6.2):
+  ts-jest@29.2.5(@babel/core@7.25.2)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.2))(jest@29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2)))(typescript@5.6.2):
     dependencies:
       bs-logger: 0.2.6
       ejs: 3.1.10
       fast-json-stable-stringify: 2.1.0
-      jest: 29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2))
+      jest: 29.7.0(@types/node@20.16.9)(babel-plugin-macros@3.1.0)(node-notifier@10.0.0)(ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2))
       jest-util: 29.7.0
       json5: 2.2.3
       lodash.memoize: 4.1.2
@@ -34572,7 +34545,7 @@ snapshots:
       '@jest/types': 29.6.3
       babel-jest: 29.7.0(@babel/core@7.25.2)
 
-  ts-loader@9.5.1(typescript@5.6.2)(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)):
+  ts-loader@9.5.1(typescript@5.6.2)(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       chalk: 4.1.2
       enhanced-resolve: 5.17.1
@@ -34580,9 +34553,9 @@ snapshots:
       semver: 7.6.3
       source-map: 0.7.4
       typescript: 5.6.2
-      webpack: 5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
 
-  ts-loader@9.5.1(typescript@5.6.2)(webpack@5.95.0(@swc/core@1.7.28)):
+  ts-loader@9.5.1(typescript@5.6.2)(webpack@5.95.0):
     dependencies:
       chalk: 4.1.2
       enhanced-resolve: 5.17.1
@@ -34590,11 +34563,11 @@ snapshots:
       semver: 7.6.3
       source-map: 0.7.4
       typescript: 5.6.2
-      webpack: 5.95.0(@swc/core@1.7.28)
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4)
 
   ts-log@2.2.5: {}
 
-  ts-node@10.9.2(@swc/core@1.7.28)(@types/node@16.18.111)(typescript@5.1.6):
+  ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@16.18.111)(typescript@5.1.6):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
       '@tsconfig/node10': 1.0.11
@@ -34614,7 +34587,7 @@ snapshots:
     optionalDependencies:
       '@swc/core': 1.7.28(@swc/helpers@0.5.5)
 
-  ts-node@10.9.2(@swc/core@1.7.28)(@types/node@20.16.9)(typescript@5.6.2):
+  ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@20.16.9)(typescript@5.6.2):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
       '@tsconfig/node10': 1.0.11
@@ -34634,7 +34607,7 @@ snapshots:
     optionalDependencies:
       '@swc/core': 1.7.28(@swc/helpers@0.5.5)
 
-  ts-node@10.9.2(@types/node@22.7.3)(typescript@5.6.2):
+  ts-node@10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@22.7.3)(typescript@5.6.2):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
       '@tsconfig/node10': 1.0.11
@@ -34651,6 +34624,8 @@ snapshots:
       typescript: 5.6.2
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
+    optionalDependencies:
+      '@swc/core': 1.7.28(@swc/helpers@0.5.5)
     optional: true
 
   ts-retry-promise@0.8.1: {}
@@ -34807,14 +34782,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  typescript-json-schema@0.64.0(@swc/core@1.7.28):
+  typescript-json-schema@0.64.0(@swc/core@1.7.28(@swc/helpers@0.5.5)):
     dependencies:
       '@types/json-schema': 7.0.15
       '@types/node': 16.18.111
       glob: 7.2.3
       path-equal: 1.2.5
       safe-stable-stringify: 2.5.0
-      ts-node: 10.9.2(@swc/core@1.7.28)(@types/node@16.18.111)(typescript@5.1.6)
+      ts-node: 10.9.2(@swc/core@1.7.28(@swc/helpers@0.5.5))(@types/node@16.18.111)(typescript@5.1.6)
       typescript: 5.1.6
       yargs: 17.7.2
     transitivePeerDependencies:
@@ -35053,14 +35028,14 @@ snapshots:
     dependencies:
       punycode: 2.3.1
 
-  url-loader@4.1.1(file-loader@6.2.0(webpack@5.95.0))(webpack@5.95.0):
+  url-loader@4.1.1(file-loader@6.2.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))))(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       loader-utils: 2.0.4
       mime-types: 2.1.35
       schema-utils: 3.3.0
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
     optionalDependencies:
-      file-loader: 6.2.0(webpack@5.95.0)
+      file-loader: 6.2.0(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
 
   url-parse@1.5.10:
     dependencies:
@@ -35807,9 +35782,9 @@ snapshots:
   webpack-cli@5.1.4(webpack@5.95.0):
     dependencies:
       '@discoveryjs/json-ext': 0.5.7
-      '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4(webpack@5.95.0))(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4))
-      '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4(webpack@5.95.0))(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4))
-      '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4(webpack@5.95.0))(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4))
+      '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4)(webpack@5.95.0)
+      '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4)(webpack@5.95.0)
+      '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4)(webpack@5.95.0)
       colorette: 2.0.20
       commander: 10.0.1
       cross-spawn: 7.0.3
@@ -35818,19 +35793,19 @@ snapshots:
       import-local: 3.2.0
       interpret: 3.1.1
       rechoir: 0.8.0
-      webpack: 5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4)
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4)
       webpack-merge: 5.10.0
 
-  webpack-dev-middleware@5.3.4(webpack@5.95.0):
+  webpack-dev-middleware@5.3.4(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       colorette: 2.0.20
       memfs: 3.5.3
       mime-types: 2.1.35
       range-parser: 1.2.1
       schema-utils: 4.2.0
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
 
-  webpack-dev-server@4.15.2(webpack@5.95.0):
+  webpack-dev-server@4.15.2(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       '@types/bonjour': 3.5.13
       '@types/connect-history-api-fallback': 1.5.4
@@ -35860,10 +35835,10 @@ snapshots:
       serve-index: 1.9.1
       sockjs: 0.3.24
       spdy: 4.0.2
-      webpack-dev-middleware: 5.3.4(webpack@5.95.0)
+      webpack-dev-middleware: 5.3.4(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       ws: 8.18.0
     optionalDependencies:
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
     transitivePeerDependencies:
       - bufferutil
       - debug
@@ -35882,37 +35857,7 @@ snapshots:
 
   webpack-virtual-modules@0.6.2: {}
 
-  webpack@5.94.0(@swc/core@1.7.28):
-    dependencies:
-      '@types/estree': 1.0.6
-      '@webassemblyjs/ast': 1.12.1
-      '@webassemblyjs/wasm-edit': 1.12.1
-      '@webassemblyjs/wasm-parser': 1.12.1
-      acorn: 8.12.1
-      acorn-import-attributes: 1.9.5(acorn@8.12.1)
-      browserslist: 4.24.0
-      chrome-trace-event: 1.0.4
-      enhanced-resolve: 5.17.1
-      es-module-lexer: 1.5.4
-      eslint-scope: 5.1.1
-      events: 3.3.0
-      glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.11
-      json-parse-even-better-errors: 2.3.1
-      loader-runner: 4.3.0
-      mime-types: 2.1.35
-      neo-async: 2.6.2
-      schema-utils: 3.3.0
-      tapable: 2.2.1
-      terser-webpack-plugin: 5.3.10(@swc/core@1.7.28)(webpack@5.94.0(@swc/core@1.7.28))
-      watchpack: 2.4.2
-      webpack-sources: 3.2.3
-    transitivePeerDependencies:
-      - '@swc/core'
-      - esbuild
-      - uglify-js
-
-  webpack@5.95.0:
+  webpack@5.94.0(@swc/core@1.7.28(@swc/helpers@0.5.5)):
     dependencies:
       '@types/estree': 1.0.6
       '@webassemblyjs/ast': 1.12.1
@@ -35934,7 +35879,7 @@ snapshots:
       neo-async: 2.6.2
       schema-utils: 3.3.0
       tapable: 2.2.1
-      terser-webpack-plugin: 5.3.10(webpack@5.95.0)
+      terser-webpack-plugin: 5.3.10(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack@5.94.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       watchpack: 2.4.2
       webpack-sources: 3.2.3
     transitivePeerDependencies:
@@ -35942,7 +35887,7 @@ snapshots:
       - esbuild
       - uglify-js
 
-  webpack@5.95.0(@swc/core@1.7.28):
+  webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)):
     dependencies:
       '@types/estree': 1.0.6
       '@webassemblyjs/ast': 1.12.1
@@ -35964,7 +35909,7 @@ snapshots:
       neo-async: 2.6.2
       schema-utils: 3.3.0
       tapable: 2.2.1
-      terser-webpack-plugin: 5.3.10(@swc/core@1.7.28)(webpack@5.95.0(@swc/core@1.7.28))
+      terser-webpack-plugin: 5.3.10(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5)))
       watchpack: 2.4.2
       webpack-sources: 3.2.3
     transitivePeerDependencies:
@@ -35972,7 +35917,7 @@ snapshots:
       - esbuild
       - uglify-js
 
-  webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4):
+  webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack-cli@5.1.4):
     dependencies:
       '@types/estree': 1.0.6
       '@webassemblyjs/ast': 1.12.1
@@ -35994,7 +35939,7 @@ snapshots:
       neo-async: 2.6.2
       schema-utils: 3.3.0
       tapable: 2.2.1
-      terser-webpack-plugin: 5.3.10(@swc/core@1.7.28)(webpack@5.95.0(@swc/core@1.7.28)(webpack-cli@5.1.4))
+      terser-webpack-plugin: 5.3.10(@swc/core@1.7.28(@swc/helpers@0.5.5))(webpack@5.95.0)
       watchpack: 2.4.2
       webpack-sources: 3.2.3
     optionalDependencies:
@@ -36004,13 +35949,13 @@ snapshots:
       - esbuild
       - uglify-js
 
-  webpackbar@5.0.2(webpack@5.95.0):
+  webpackbar@5.0.2(webpack@5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))):
     dependencies:
       chalk: 4.1.2
       consola: 2.15.3
       pretty-time: 1.1.0
       std-env: 3.7.0
-      webpack: 5.95.0
+      webpack: 5.95.0(@swc/core@1.7.28(@swc/helpers@0.5.5))
 
   websocket-driver@0.7.4:
     dependencies:
diff --git a/scripts/dependency.py b/scripts/dependency.py
index 3565e018efa..0deb1bb3d55 100644
--- a/scripts/dependency.py
+++ b/scripts/dependency.py
@@ -68,7 +68,6 @@ def try_match_line(line):
 def switch_to_local(project):
     default_path_map = {
         "move": "move/language",
-        "narwhal": "narwhal",
     }
     # Packages that don't directly map to a directory under move/language
     # go here as special cases. By default, we just use language/[name].
@@ -98,7 +97,6 @@ def switch_to_local(project):
             "move-table-extension": "extensions/move-table-extension",
             "move-transactional-test-runner": "testing-infra/transactional-test-runner",
         },
-        "narwhal": {},
     }
 
     def process_line(line, depth):
@@ -109,8 +107,6 @@ def process_line(line, depth):
             path = default_path_map[project]
             if project == "move":
                 subpath = subpath_path_map[project].get(name, name)
-            elif project == "narwhal":
-                subpath = name.replace("narwhal-", "")
             return '{} = {{ path = "{}{}/{}"{} }}\n'.format(
                 name, go_back, path, subpath, extra
             )
@@ -138,7 +134,7 @@ def process_line(line, _):
 
 
 args = parse_args()
-assert (args.project == "move" or args.project == "narwhal")
+assert (args.project == "move")
 
 PATTERN = re.compile(
     '(.+)={git="https://github.com/.+/' +
diff --git a/scripts/generate-release-notes.sh b/scripts/generate-release-notes.sh
index d13b374aa50..ed757cc67e2 100755
--- a/scripts/generate-release-notes.sh
+++ b/scripts/generate-release-notes.sh
@@ -15,7 +15,7 @@ else
 fi
 
 echo -e "Iota Protocol Version in this release: XX\n"
-for pr_number in $(git log --grep "\[x\]" --pretty=oneline --abbrev-commit origin/"${new_branch}"...origin/"${prev_branch}" -- crates dashboards doc docker external-crates kiosk narwhal nre iota-execution | grep -o '#[0-9]\+' | grep -o '[0-9]\+')
+for pr_number in $(git log --grep "\[x\]" --pretty=oneline --abbrev-commit origin/"${new_branch}"...origin/"${prev_branch}" -- crates dashboards doc docker external-crates kiosk nre iota-execution | grep -o '#[0-9]\+' | grep -o '[0-9]\+')
 do
     pr_body=$(gh api -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" /repos/iotaledger/iota/pulls/"${pr_number}" --jq ".body")
     release_notes="${pr_body#*### Release notes}"
diff --git a/scripts/release_notes.py b/scripts/release_notes.py
index ac3715a63a5..f3afcb8fda9 100755
--- a/scripts/release_notes.py
+++ b/scripts/release_notes.py
@@ -44,7 +44,6 @@
     "docker",
     "external-crates",
     "kiosk",
-    "narwhal",
     "nre",
     "iota-execution",
 ]
diff --git a/scripts/update_narwhal.sh b/scripts/update_narwhal.sh
deleted file mode 100755
index 30f5d7b0536..00000000000
--- a/scripts/update_narwhal.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-# Copyright (c) Mysten Labs, Inc.
-# Modifications Copyright (c) 2024 IOTA Stiftung
-# SPDX-License-Identifier: Apache-2.0
-
-# shellcheck disable=SC2181
-# This script attempts to update the Narwhal pointer in Iota
-# It is expected to fail in cases 
-set -e
-set -eo pipefail
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-TOPLEVEL="${DIR}/../"
-GREP=${GREP:=grep}
-
-# Crutch for old bash versions
-# Very minimal readarray implementation using read. Does NOT work with lines that contain double-quotes due to eval()
-readarray() {
-	while IFS= read -r var; do
-        MAPFILE+=("$var")
-	done
-}
-
-
-# check for the presence of needed executables:
-# - we use GNU grep in perl re mode
-function check_gnu_grep() {
-	GNUSTRING=$($GREP --version|head -n1| grep 'GNU grep')
-	if [[ -z $GNUSTRING ]];
-	then 
-		echo "Could not find GNU grep. This requires GNU grep 3.7 with PCRE expressions"; exit 1
-	else 
-		return 0
-	fi
-}
-
-
-function latest_nw_revision() {
-	NW_CHECKOUT=$(mktemp -d)
-	cd "$NW_CHECKOUT"
-	git clone --depth 1 https://github.com/mystenlabs/narwhal
-	cd narwhal
-	git rev-parse HEAD
-}
-
-function current_nw_revision() {
-	cd "$TOPLEVEL"
-	readarray -t <<< "$(find ./ -iname '*.toml' -exec $GREP -oPe 'git = "https://github.com/MystenLabs/narwhal", *rev *= *\"\K[0-9a-fA-F]+' '{}' \;)"
-	watermark=${MAPFILE[0]}
-	for i in "${MAPFILE[@]}"; do
-	    if [[ "$watermark" != "$i" ]]; then
-        	not_equal=true
-	        break
-	    fi
-	done
-
-	[[ -n "$not_equal" ]] && echo "Different values found for the current NW revision in Iota, aborting" && exit 1
-	echo "$watermark"
-}
-
-# Check for tooling
-check_gnu_grep
-
-# Debug prints
-CURRENT_NW=$(current_nw_revision)
-LATEST_NW=$(latest_nw_revision)
-if [[ "$CURRENT_NW" != "$LATEST_NW" ]]; then
-	echo "About to replace $CURRENT_NW with $LATEST_NW as the Narwhal pointer in Iota"
-else
-	exit 0
-fi
-
-# Edit the source
-find ./ -iname "*.toml"  -execdir sed -i '' -re "s/$CURRENT_NW/$LATEST_NW/" '{}' \;
diff --git a/sdk/dapp-kit/test/hooks/useSignAndExecuteTransaction.test.tsx b/sdk/dapp-kit/test/hooks/useSignAndExecuteTransaction.test.tsx
index 73b348cc3fc..5cf63eb64b7 100644
--- a/sdk/dapp-kit/test/hooks/useSignAndExecuteTransaction.test.tsx
+++ b/sdk/dapp-kit/test/hooks/useSignAndExecuteTransaction.test.tsx
@@ -164,7 +164,7 @@ describe('useSignAndExecuteTransaction', () => {
             ]),
         );
         const effectsBcs = bcs.TransactionEffects.serialize({
-            V2: {
+            V1: {
                 status: {
                     Success: true,
                 },
diff --git a/sdk/graphql-transport/src/generated/queries.ts b/sdk/graphql-transport/src/generated/queries.ts
index ac36d66bdf4..af75693d249 100644
--- a/sdk/graphql-transport/src/generated/queries.ts
+++ b/sdk/graphql-transport/src/generated/queries.ts
@@ -342,7 +342,7 @@ export type AuthenticatorStateCreateTransaction = {
 
 export type AuthenticatorStateExpireTransaction = {
   __typename?: 'AuthenticatorStateExpireTransaction';
-  /** The initial version that the AuthenticatorStateUpdate was shared at. */
+  /** The initial version that the AuthenticatorStateUpdateV1 was shared at. */
   authenticatorObjInitialSharedVersion: Scalars['UInt53']['output'];
   /** Expire JWKs that have a lower epoch than this. */
   minEpoch?: Maybe<Epoch>;
@@ -5018,7 +5018,7 @@ export type Validator = {
   stakingPool?: Maybe<MoveObject>;
   /** The epoch at which this pool became active. */
   stakingPoolActivationEpoch?: Maybe<Scalars['UInt53']['output']>;
-  /** The ID of this validator's `0x3::staking_pool::StakingPool`. */
+  /** The ID of this validator's `0x3::staking_pool::StakingPoolV1`. */
   stakingPoolId: Scalars['IotaAddress']['output'];
   /** The total number of IOTA tokens in this pool. */
   stakingPoolIotaBalance?: Maybe<Scalars['BigInt']['output']>;
diff --git a/sdk/graphql-transport/src/mappers/transaction-block.ts b/sdk/graphql-transport/src/mappers/transaction-block.ts
index 02f82f95c49..f722709dc7e 100644
--- a/sdk/graphql-transport/src/mappers/transaction-block.ts
+++ b/sdk/graphql-transport/src/mappers/transaction-block.ts
@@ -14,8 +14,10 @@ import type {
     IotaTransactionBlockResponse,
     IotaTransactionBlockResponseOptions,
 } from '@iota/iota-sdk/client';
+import type { IotaObjectRef } from '@iota/iota-sdk/client';
 import { normalizeIotaAddress } from '@iota/iota-sdk/utils';
 
+import type { ObjectOut } from '@iota/iota-sdk/src/bcs/effects.js';
 import type { Rpc_Transaction_FieldsFragment } from '../generated/queries.js';
 import { toShortTypeString } from './util.js';
 
@@ -351,250 +353,236 @@ const ADDRESS_ZERO = normalizeIotaAddress('0x0');
 export function mapEffects(data: string): IotaTransactionBlockResponse['effects'] {
     const effects = bcs.TransactionEffects.parse(fromB64(data));
 
-    let effectsV1 = effects.V1;
-
-    if (effects.V2) {
-        const sharedObjects = effects.V2.unchangedSharedObjects.map(([id, sharedObject]) => {
-            switch (sharedObject.$kind) {
-                case 'ReadOnlyRoot':
-                    return {
-                        objectId: id,
-                        version: Number(sharedObject.ReadOnlyRoot[0]) as unknown as string,
-                        digest: sharedObject.ReadOnlyRoot[1],
-                    };
-                case 'MutateDeleted':
-                    return {
-                        objectId: id,
-                        version: Number(sharedObject.MutateDeleted) as unknown as string,
-                        digest: OBJECT_DIGEST_DELETED,
-                    };
-                case 'ReadDeleted':
-                    return {
-                        objectId: id,
-                        version: Number(sharedObject.ReadDeleted) as unknown as string,
-                        digest: OBJECT_DIGEST_DELETED,
-                    };
-                default:
-                    throw new Error(`Unknown shared object type: ${sharedObject}`);
-            }
-        });
+    type InferedOwner = Exclude<(typeof ObjectOut)['$inferType']['ObjectWrite'], undefined>[1];
 
-        effects.V2.changedObjects
-            .filter(([_id, change]) => change.inputState.Exist?.[1].Shared)
-            .forEach(([id, change]) => {
-                sharedObjects.push({
+    const sharedObjects = effects.V1.unchangedSharedObjects.map(([id, sharedObject]) => {
+        switch (sharedObject.$kind) {
+            case 'ReadOnlyRoot':
+                return {
                     objectId: id,
-                    version: Number(change.inputState.Exist![0][0]) as unknown as string,
-                    digest: change.inputState.Exist![0][1],
-                });
-            });
-
-        const gasObject =
-            effects.V2.gasObjectIndex != null
-                ? effects.V2.changedObjects[effects.V2.gasObjectIndex]
-                : null;
-
-        effectsV1 = {
-            status: effects.V2.status,
-            executedEpoch: effects.V2.executedEpoch,
-            gasUsed: effects.V2.gasUsed,
-            modifiedAtVersions: effects.V2.changedObjects
-                .filter(([_id, change]) => change.inputState.Exist)
-                .map(([id, change]) => [id, change.inputState.Exist![0][0]] as const),
-            sharedObjects,
-            transactionDigest: effects.V2.transactionDigest,
-            created: effects.V2.changedObjects
-                .filter(
-                    ([_id, change]) =>
-                        change.inputState.NotExist &&
-                        (change.outputState.ObjectWrite || change.outputState.PackageWrite) &&
-                        change.idOperation.Created,
-                )
-                .map(([objectId, change]) =>
-                    change.outputState.PackageWrite
-                        ? ([
-                              {
-                                  objectId,
-                                  version: Number(
-                                      change.outputState.PackageWrite[0],
-                                  ) as unknown as string,
-                                  digest: change.outputState.PackageWrite[1],
-                              },
-                              { $kind: 'Immutable', Immutable: true },
-                          ] as const)
-                        : ([
-                              {
-                                  objectId,
-                                  version: Number(effects.V2.lamportVersion) as unknown as string,
-                                  digest: change.outputState.ObjectWrite![0],
-                              },
-                              change.outputState.ObjectWrite![1],
-                          ] as const),
-                ),
-            mutated: effects.V2.changedObjects
-                .filter(
-                    ([_id, change]) =>
-                        change.inputState.Exist &&
-                        (change.outputState.ObjectWrite || change.outputState.PackageWrite),
-                )
-                .map(([objectId, change]) => [
-                    change.outputState.PackageWrite
-                        ? {
-                              objectId,
-                              version: Number(
-                                  change.outputState.PackageWrite[0],
-                              ) as unknown as string,
-                              digest: change.outputState.PackageWrite[1],
-                          }
-                        : {
-                              objectId,
-                              version: Number(effects.V2.lamportVersion) as unknown as string,
-                              digest: change.outputState.ObjectWrite![0],
-                          },
-                    change.outputState.ObjectWrite
-                        ? change.outputState.ObjectWrite[1]
-                        : { $kind: 'Immutable', Immutable: true },
-                ]),
-            unwrapped: effects.V2.changedObjects
-                .filter(
-                    ([_id, change]) =>
-                        change.inputState.NotExist &&
-                        change.outputState.ObjectWrite &&
-                        change.idOperation.None,
-                )
-                .map(([objectId, change]) => [
-                    {
-                        objectId,
-                        version: Number(effects.V2.lamportVersion) as unknown as string,
-                        digest: change.outputState.ObjectWrite![0],
-                    },
-                    change.outputState.ObjectWrite![1],
-                ]),
-            deleted: effects.V2.changedObjects
-                .filter(
-                    ([_id, change]) =>
-                        change.inputState.Exist &&
-                        change.outputState.NotExist &&
-                        change.idOperation.Deleted,
-                )
-                .map(([objectId, _change]) => ({
-                    objectId,
-                    version: Number(effects.V2.lamportVersion) as unknown as string,
+                    version: Number(sharedObject.ReadOnlyRoot[0]) as unknown as string,
+                    digest: sharedObject.ReadOnlyRoot[1],
+                };
+            case 'MutateDeleted':
+                return {
+                    objectId: id,
+                    version: Number(sharedObject.MutateDeleted) as unknown as string,
                     digest: OBJECT_DIGEST_DELETED,
-                })),
-            unwrappedThenDeleted: effects.V2.changedObjects
-                .filter(
-                    ([_id, change]) =>
-                        change.inputState.NotExist &&
-                        change.outputState.NotExist &&
-                        change.idOperation.Deleted,
-                )
-                .map(([objectId, _change]) => ({
-                    objectId,
-                    version: Number(effects.V2.lamportVersion) as unknown as string,
+                };
+            case 'ReadDeleted':
+                return {
+                    objectId: id,
+                    version: Number(sharedObject.ReadDeleted) as unknown as string,
                     digest: OBJECT_DIGEST_DELETED,
-                })),
-            wrapped: effects.V2.changedObjects
-                .filter(
-                    ([_id, change]) =>
-                        change.inputState.Exist &&
-                        change.outputState.NotExist &&
-                        change.idOperation.None,
-                )
-                .map(([objectId, _change]) => ({
-                    objectId,
-                    version: Number(effects.V2.lamportVersion) as unknown as string,
-                    digest: OBJECT_DIGEST_WRAPPED,
-                })),
-            gasObject: gasObject
-                ? [
-                      {
-                          objectId: gasObject[0],
-                          digest: gasObject[1].outputState.ObjectWrite![0],
-                          version: Number(effects.V2.lamportVersion) as unknown as string,
-                      },
-                      gasObject[1].outputState.ObjectWrite![1],
-                  ]
-                : [
+                };
+            default:
+                throw new Error(`Unknown shared object type: ${sharedObject}`);
+        }
+    });
+
+    effects.V1.changedObjects
+        .filter(([_id, change]) => change.inputState.Exist?.[1].Shared)
+        .forEach(([id, change]) => {
+            sharedObjects.push({
+                objectId: id,
+                version: Number(change.inputState.Exist![0][0]) as unknown as string,
+                digest: change.inputState.Exist![0][1],
+            });
+        });
+
+    const modifiedAtVersions = effects.V1.changedObjects
+        .filter(([_id, change]) => change.inputState.Exist)
+        .map(([id, change]) => [id, change.inputState.Exist![0][0]] as const);
+
+    const created = effects.V1.changedObjects
+        .filter(
+            ([_id, change]) =>
+                change.inputState.NotExist &&
+                (change.outputState.ObjectWrite || change.outputState.PackageWrite) &&
+                change.idOperation.Created,
+        )
+        .map(([objectId, change]) =>
+            change.outputState.PackageWrite
+                ? ([
                       {
-                          objectId: ADDRESS_ZERO,
-                          version: '0',
-                          digest: OBJECT_DIGEST_ZERO,
+                          objectId,
+                          version: Number(change.outputState.PackageWrite[0]) as unknown as string,
+                          digest: change.outputState.PackageWrite[1],
                       },
+                      { $kind: 'Immutable', Immutable: true },
+                  ] as const)
+                : ([
                       {
-                          $kind: 'AddressOwner',
-                          AddressOwner: ADDRESS_ZERO,
+                          objectId,
+                          version: Number(effects.V1.lamportVersion) as unknown as string,
+                          digest: change.outputState.ObjectWrite![0],
                       },
-                  ],
-            eventsDigest: effects.V2.eventsDigest,
-            dependencies: effects.V2.dependencies,
-        };
-    }
+                      change.outputState.ObjectWrite![1],
+                  ] as const),
+        );
 
-    if (!effectsV1) {
-        throw new Error('Invalid effects');
-    }
+    const mutated: Array<[IotaObjectRef, InferedOwner]> = effects.V1.changedObjects
+        .filter(
+            ([_id, change]) =>
+                change.inputState.Exist &&
+                (change.outputState.ObjectWrite || change.outputState.PackageWrite),
+        )
+        .map(([objectId, change]) => [
+            change.outputState.PackageWrite
+                ? {
+                      objectId,
+                      version: Number(change.outputState.PackageWrite[0]) as unknown as string,
+                      digest: change.outputState.PackageWrite[1],
+                  }
+                : {
+                      objectId,
+                      version: Number(effects.V1.lamportVersion) as unknown as string,
+                      digest: change.outputState.ObjectWrite![0],
+                  },
+            change.outputState.ObjectWrite
+                ? change.outputState.ObjectWrite[1]
+                : { $kind: 'Immutable', Immutable: true },
+        ]);
+
+    const unwrapped: Array<[IotaObjectRef, InferedOwner]> = effects.V1.changedObjects
+        .filter(
+            ([_id, change]) =>
+                change.inputState.NotExist &&
+                change.outputState.ObjectWrite &&
+                change.idOperation.None,
+        )
+        .map(([objectId, change]) => [
+            {
+                objectId,
+                version: Number(effects.V1.lamportVersion) as unknown as string,
+                digest: change.outputState.ObjectWrite![0],
+            },
+            change.outputState.ObjectWrite![1],
+        ]);
+
+    const deleted = effects.V1.changedObjects
+        .filter(
+            ([_id, change]) =>
+                change.inputState.Exist &&
+                change.outputState.NotExist &&
+                change.idOperation.Deleted,
+        )
+        .map(([objectId, _change]) => ({
+            objectId,
+            version: Number(effects.V1.lamportVersion) as unknown as string,
+            digest: OBJECT_DIGEST_DELETED,
+        }));
+
+    const unwrappedThenDeleted = effects.V1.changedObjects
+        .filter(
+            ([_id, change]) =>
+                change.inputState.NotExist &&
+                change.outputState.NotExist &&
+                change.idOperation.Deleted,
+        )
+        .map(([objectId, _change]) => ({
+            objectId,
+            version: Number(effects.V1.lamportVersion) as unknown as string,
+            digest: OBJECT_DIGEST_DELETED,
+        }));
+
+    const wrapped = effects.V1.changedObjects
+        .filter(
+            ([_id, change]) =>
+                change.inputState.Exist && change.outputState.NotExist && change.idOperation.None,
+        )
+        .map(([objectId, _change]) => ({
+            objectId,
+            version: Number(effects.V1.lamportVersion) as unknown as string,
+            digest: OBJECT_DIGEST_WRAPPED,
+        }));
+
+    const gasObjectFromV1 =
+        effects.V1.gasObjectIndex != null
+            ? effects.V1.changedObjects[effects.V1.gasObjectIndex]
+            : null;
+
+    const gasObject: [IotaObjectRef, InferedOwner] = gasObjectFromV1
+        ? [
+              {
+                  objectId: gasObjectFromV1[0],
+                  digest: gasObjectFromV1[1].outputState.ObjectWrite![0],
+                  version: Number(effects.V1.lamportVersion) as unknown as string,
+              },
+              gasObjectFromV1[1].outputState.ObjectWrite![1],
+          ]
+        : [
+              {
+                  objectId: ADDRESS_ZERO,
+                  version: '0',
+                  digest: OBJECT_DIGEST_ZERO,
+              },
+              {
+                  $kind: 'AddressOwner',
+                  AddressOwner: ADDRESS_ZERO,
+              },
+          ];
 
     return {
         messageVersion: 'v1',
-        status: effectsV1.status.Success
+        status: effects.V1.status.Success
             ? {
                   status: 'success',
               }
             : {
                   status: 'failure',
                   // TODO: we don't have the error message from bcs effects
-                  error: effectsV1.status.$kind,
+                  error: effects.V1.status.$kind,
               },
-        executedEpoch: effectsV1.executedEpoch,
-        gasUsed: effectsV1.gasUsed,
-        modifiedAtVersions: effectsV1.modifiedAtVersions.map(([objectId, sequenceNumber]) => ({
+        executedEpoch: effects.V1.executedEpoch,
+        gasUsed: effects.V1.gasUsed,
+        modifiedAtVersions: modifiedAtVersions.map(([objectId, sequenceNumber]) => ({
             objectId,
             sequenceNumber,
         })),
-        ...(effectsV1.sharedObjects.length === 0 ? {} : { sharedObjects: effectsV1.sharedObjects }),
-        transactionDigest: effectsV1.transactionDigest,
-        ...(effectsV1.created.length === 0
+        ...(sharedObjects.length === 0 ? {} : { sharedObjects }),
+        transactionDigest: effects.V1.transactionDigest,
+        ...(created.length === 0
             ? {}
             : {
-                  created: effectsV1.created.map(([reference, owner]) => ({
+                  created: created.map(([reference, owner]) => ({
                       reference,
                       owner: mapEffectsOwner(owner),
                   })),
               }),
-        ...(effectsV1.mutated.length === 0
+        ...(mutated.length === 0
             ? {}
             : {
-                  mutated: effectsV1.mutated.map(([reference, owner]) => ({
+                  mutated: mutated.map(([reference, owner]) => ({
                       reference,
-                      owner: mapEffectsOwner(owner),
+                      owner: mapEffectsOwner(owner as InferedOwner),
                   })),
               }),
-        ...(effectsV1.unwrapped.length === 0
+        ...(unwrapped.length === 0
             ? {}
             : {
                   unwrapped:
-                      effectsV1.unwrapped.length === 0
+                      unwrapped.length === 0
                           ? undefined
-                          : effectsV1.unwrapped.map(([reference, owner]) => ({
+                          : unwrapped.map(([reference, owner]) => ({
                                 reference,
-                                owner: mapEffectsOwner(owner),
+                                owner: mapEffectsOwner(owner as InferedOwner),
                             })),
               }),
-        ...(effectsV1.deleted.length === 0 ? {} : { deleted: effectsV1.deleted }),
-        ...(effectsV1.unwrappedThenDeleted.length === 0
+        ...(deleted.length === 0 ? {} : { deleted: deleted }),
+        ...(unwrappedThenDeleted.length === 0
             ? {}
-            : { unwrappedThenDeleted: effectsV1.unwrappedThenDeleted }),
-        ...(effectsV1.wrapped.length === 0 ? {} : { wrapped: effectsV1.wrapped }),
+            : { unwrappedThenDeleted: unwrappedThenDeleted }),
+        ...(wrapped.length === 0 ? {} : { wrapped: wrapped }),
         gasObject: {
-            reference: effectsV1.gasObject[0],
-            owner: mapEffectsOwner(effectsV1.gasObject[1]),
+            reference: gasObject[0],
+            owner: mapEffectsOwner(gasObject[1]),
         },
-        ...(effectsV1.eventsDigest ? { eventsDigest: effectsV1.eventsDigest } : {}),
-        dependencies: effectsV1.dependencies,
+        ...(effects.V1.eventsDigest ? { eventsDigest: effects.V1.eventsDigest } : {}),
+        dependencies: effects.V1.dependencies,
     };
 
-    function mapEffectsOwner(owner: NonNullable<typeof effectsV1>['gasObject'][1]) {
+    function mapEffectsOwner(owner: NonNullable<InferedOwner>) {
         if (owner.Immutable) {
             return 'Immutable';
         } else if (owner.Shared) {
diff --git a/sdk/graphql-transport/src/methods.ts b/sdk/graphql-transport/src/methods.ts
index 67d420b43ce..60e39b15542 100644
--- a/sdk/graphql-transport/src/methods.ts
+++ b/sdk/graphql-transport/src/methods.ts
@@ -799,6 +799,7 @@ export const RPC_METHODS: {
             iotaTotalSupply: String(systemState.iotaTotalSupply),
             iotaTreasuryCapId: String(systemState.iotaTreasuryCapId),
             maxValidatorCount: String(systemState.systemParameters?.maxValidatorCount),
+            minValidatorCount: String(systemState.systemParameters?.minValidatorCount),
             minValidatorJoiningStake: String(
                 systemState.systemParameters?.minValidatorJoiningStake,
             ),
@@ -1343,7 +1344,6 @@ export const RPC_METHODS: {
         const attributes: Record<string, ProtocolConfigValue | null> = {};
 
         const configTypeMap: Record<string, string> = {
-            max_accumulated_txn_cost_per_object_in_narwhal_commit: 'u64',
             max_arguments: 'u32',
             max_gas_payment_objects: 'u32',
             max_modules_in_publish: 'u32',
diff --git a/sdk/kiosk/package.json b/sdk/kiosk/package.json
index b5b4e1bc43d..d1c39f30b59 100644
--- a/sdk/kiosk/package.json
+++ b/sdk/kiosk/package.json
@@ -38,7 +38,8 @@
         "prepare:e2e": "cargo build --bin iota --profile dev && cross-env RUST_LOG=warn,iota=error,anemo_tower=warn,consensus=off cargo run --bin iota start --with-faucet --force-regenesis"
     },
     "dependencies": {
-        "@iota/iota-sdk": "workspace:*"
+        "@iota/iota-sdk": "workspace:*",
+        "dotenv": "^16.4.5"
     },
     "devDependencies": {
         "@iota/build-scripts": "workspace:*",
diff --git a/sdk/kiosk/src/bcs.ts b/sdk/kiosk/src/bcs.ts
index a7133601ddc..8f3af53a276 100644
--- a/sdk/kiosk/src/bcs.ts
+++ b/sdk/kiosk/src/bcs.ts
@@ -17,7 +17,6 @@ export const KioskType = bcs.struct(KIOSK_TYPE, {
     profits: bcs.u64(),
     owner: bcs.Address,
     itemCount: bcs.u32(),
-    allowExtensions: bcs.bool(),
 });
 
 // Register the `PurchaseCap` for faster queries.
diff --git a/sdk/kiosk/src/client/kiosk-client.ts b/sdk/kiosk/src/client/kiosk-client.ts
index f01db6ef159..82f079b2c25 100644
--- a/sdk/kiosk/src/client/kiosk-client.ts
+++ b/sdk/kiosk/src/client/kiosk-client.ts
@@ -157,11 +157,13 @@ export class KioskClient {
 
         const networkKiosk = getNetwork(network).kiosk;
 
-        /// Check existence of rule based on network and throw an error if it's not found.
-        if (!rules[rule] || !networkKiosk) {
+        const rulePackageId = rules[rule] || networkKiosk?.[rule];
+
+        /// Check existence of rule throw an error if it's not found.
+        if (!rulePackageId) {
             throw new Error(`Missing packageId for rule ${rule}`);
         }
 
-        return rules[rule] || networkKiosk[rule];
+        return rulePackageId;
     }
 }
diff --git a/sdk/kiosk/src/types/kiosk.ts b/sdk/kiosk/src/types/kiosk.ts
index 8b2d5c2972c..699d343dbf9 100644
--- a/sdk/kiosk/src/types/kiosk.ts
+++ b/sdk/kiosk/src/types/kiosk.ts
@@ -40,7 +40,6 @@ export type Kiosk = {
     profits: string;
     owner: string;
     itemCount: number;
-    allowExtensions: boolean;
 };
 
 /**
diff --git a/sdk/kiosk/test/e2e/e2e.test.ts b/sdk/kiosk/test/e2e/e2e.test.ts
index 3195b806b20..80bb966263e 100644
--- a/sdk/kiosk/test/e2e/e2e.test.ts
+++ b/sdk/kiosk/test/e2e/e2e.test.ts
@@ -9,7 +9,6 @@ import { beforeAll, describe, expect, it } from 'vitest';
 import {
     KioskClient,
     KioskTransaction,
-    Network,
     percentageToBasisPoints,
     TransferPolicyTransaction,
 } from '../../src';
@@ -56,7 +55,7 @@ describe('Testing Kiosk SDK transaction building & querying e2e', () => {
 
         kioskClient = new KioskClient({
             client: toolbox.client,
-            network: Network.CUSTOM,
+            network: 'localnet',
             packageIds: {
                 kioskLockRulePackageId: extensionsPackageId,
                 royaltyRulePackageId: extensionsPackageId,
diff --git a/sdk/kiosk/test/e2e/setup.ts b/sdk/kiosk/test/e2e/setup.ts
index 77bb9f31eeb..4271feaf61e 100644
--- a/sdk/kiosk/test/e2e/setup.ts
+++ b/sdk/kiosk/test/e2e/setup.ts
@@ -4,6 +4,7 @@
 
 import { execSync } from 'child_process';
 import { mkdtemp } from 'fs/promises';
+import { writeFileSync } from 'fs';
 import { tmpdir } from 'os';
 import path from 'path';
 import type {
@@ -15,7 +16,7 @@ import { getFullnodeUrl, IotaClient } from '@iota/iota-sdk/client';
 import {
     FaucetRateLimitError,
     getFaucetHost,
-    requestIotaFromFaucetV0,
+    requestIotaFromFaucetV1,
 } from '@iota/iota-sdk/faucet';
 import { Ed25519Keypair } from '@iota/iota-sdk/keypairs/ed25519';
 import { Transaction } from '@iota/iota-sdk/transactions';
@@ -33,6 +34,18 @@ const DEFAULT_FULLNODE_URL = import.meta.env.VITE_FULLNODE_URL ?? getFullnodeUrl
 //@ts-expect-error env not found on meta
 const IOTA_BIN = import.meta.env.VITE_IOTA_BIN ?? 'cargo run --bin iota';
 
+const CONFIG_DATA = `
+---
+keystore:
+  File: ~/.iota/iota_config/iota.keystore
+envs:
+  - alias: localnet
+    rpc: "http://localhost:9000"
+    ws: ~
+    basic_auth: ~
+active_env: localnet
+`;
+
 export class TestToolbox {
     keypair: Ed25519Keypair;
     client: IotaClient;
@@ -64,7 +77,7 @@ export async function setupIotaClient() {
     const keypair = Ed25519Keypair.generate();
     const address = keypair.getPublicKey().toIotaAddress();
     const client = getClient();
-    await retry(() => requestIotaFromFaucetV0({ host: DEFAULT_FAUCET_URL, recipient: address }), {
+    await retry(() => requestIotaFromFaucetV1({ host: DEFAULT_FAUCET_URL, recipient: address }), {
         backoff: 'EXPONENTIAL',
         // overall timeout in 60 seconds
         timeout: 1000 * 60,
@@ -76,6 +89,7 @@ export async function setupIotaClient() {
     const tmpDirPath = path.join(tmpdir(), 'config-');
     const tmpDir = await mkdtemp(tmpDirPath);
     const configPath = path.join(tmpDir, 'client.yaml');
+    writeFileSync(configPath, CONFIG_DATA, { flag: 'w', flush: true });
     execSync(`${IOTA_BIN} client --yes --client.config ${configPath}`, { encoding: 'utf-8' });
     return new TestToolbox(keypair, client, configPath);
 }
@@ -221,6 +235,7 @@ export async function executeTransaction(
             showEvents: true,
             showObjectChanges: true,
         },
+        requestType: 'WaitForLocalExecution',
     });
     expect(resp.effects?.status.status).toEqual('success');
     return resp;
diff --git a/sdk/kiosk/vitest.config.ts b/sdk/kiosk/vitest.config.ts
index f9ddd6d1d8b..458d3c2cdad 100644
--- a/sdk/kiosk/vitest.config.ts
+++ b/sdk/kiosk/vitest.config.ts
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { defineConfig } from 'vitest/config';
+import { config } from 'dotenv';
 
 export default defineConfig({
     test: {
@@ -12,6 +13,7 @@ export default defineConfig({
         testTimeout: 1000000,
         env: {
             NODE_ENV: 'test',
+            ...config({ path: '../.env.defaults' }).parsed,
         },
     },
     resolve: {
diff --git a/sdk/move-bytecode-template/Cargo.toml b/sdk/move-bytecode-template/Cargo.toml
index 5728535a27f..c9d71c3886e 100644
--- a/sdk/move-bytecode-template/Cargo.toml
+++ b/sdk/move-bytecode-template/Cargo.toml
@@ -5,7 +5,6 @@ authors = ["IOTA Foundation <info@iota.org>"]
 edition = "2021"
 license = "Apache-2.0"
 publish = false
-repository = "https://github.com/iotaledger/iota.git"
 description = "WASM variant of the move-binary-format which allows bytecode templates"
 
 [dependencies]
diff --git a/sdk/typescript/src/bcs/effects.ts b/sdk/typescript/src/bcs/effects.ts
index 08cc8d8fe06..bb9f23c37c0 100644
--- a/sdk/typescript/src/bcs/effects.ts
+++ b/sdk/typescript/src/bcs/effects.ts
@@ -4,7 +4,7 @@
 
 import { bcs } from '@iota/bcs';
 
-import { Address, ObjectDigest, IotaObjectRef } from './bcs.js';
+import { Address, ObjectDigest } from './bcs.js';
 
 const PackageUpgradeError = bcs.enum('PackageUpgradeError', {
     UnableToFetchPackage: bcs.struct('UnableToFetchPackage', { packageId: Address }),
@@ -132,24 +132,6 @@ const Owner = bcs.enum('Owner', {
     Immutable: null,
 });
 
-const TransactionEffectsV1 = bcs.struct('TransactionEffectsV1', {
-    status: ExecutionStatus,
-    executedEpoch: bcs.u64(),
-    gasUsed: GasCostSummary,
-    modifiedAtVersions: bcs.vector(bcs.tuple([Address, bcs.u64()])),
-    sharedObjects: bcs.vector(IotaObjectRef),
-    transactionDigest: ObjectDigest,
-    created: bcs.vector(bcs.tuple([IotaObjectRef, Owner])),
-    mutated: bcs.vector(bcs.tuple([IotaObjectRef, Owner])),
-    unwrapped: bcs.vector(bcs.tuple([IotaObjectRef, Owner])),
-    deleted: bcs.vector(IotaObjectRef),
-    unwrappedThenDeleted: bcs.vector(IotaObjectRef),
-    wrapped: bcs.vector(IotaObjectRef),
-    gasObject: bcs.tuple([IotaObjectRef, Owner]),
-    eventsDigest: bcs.option(ObjectDigest),
-    dependencies: bcs.vector(ObjectDigest),
-});
-
 const VersionDigest = bcs.tuple([bcs.u64(), ObjectDigest]);
 
 const ObjectIn = bcs.enum('ObjectIn', {
@@ -157,7 +139,7 @@ const ObjectIn = bcs.enum('ObjectIn', {
     Exist: bcs.tuple([VersionDigest, Owner]),
 });
 
-const ObjectOut = bcs.enum('ObjectOut', {
+export const ObjectOut = bcs.enum('ObjectOut', {
     NotExist: null,
     ObjectWrite: bcs.tuple([ObjectDigest, Owner]),
     PackageWrite: VersionDigest,
@@ -183,7 +165,7 @@ const UnchangedSharedKind = bcs.enum('UnchangedSharedKind', {
     PerEpochConfig: null,
 });
 
-const TransactionEffectsV2 = bcs.struct('TransactionEffectsV2', {
+const TransactionEffectsV1 = bcs.struct('TransactionEffectsV1', {
     status: ExecutionStatus,
     executedEpoch: bcs.u64(),
     gasUsed: GasCostSummary,
@@ -199,5 +181,4 @@ const TransactionEffectsV2 = bcs.struct('TransactionEffectsV2', {
 
 export const TransactionEffects = bcs.enum('TransactionEffects', {
     V1: TransactionEffectsV1,
-    V2: TransactionEffectsV2,
 });
diff --git a/sdk/typescript/src/client/types/generated.ts b/sdk/typescript/src/client/types/generated.ts
index a8a48b0e2a6..30bcba8d817 100644
--- a/sdk/typescript/src/client/types/generated.ts
+++ b/sdk/typescript/src/client/types/generated.ts
@@ -228,7 +228,7 @@ export interface EndOfEpochInfo {
     epochEndTimestamp: string;
     lastCheckpointId: string;
     mintedTokensAmount: string;
-    /** existing fields from `SystemEpochInfoEvent` (without epoch) */
+    /** existing fields from `SystemEpochInfoEventV1` (without epoch) */
     protocolVersion: string;
     referenceGasPrice: string;
     storageCharge: string;
@@ -690,6 +690,11 @@ export interface IotaSystemStateSummary {
      * epoch to go above this.
      */
     maxValidatorCount: string;
+    /**
+     * Minimum number of active validators at any moment. We do not allow the number of validators in any
+     * epoch to go under this.
+     */
+    minValidatorCount: string;
     /** Lower-bound on the amount of stake required to become a validator. */
     minValidatorJoiningStake: string;
     /** ID of the object that contains the list of new validators that will join at the end of the epoch. */
@@ -1479,7 +1484,7 @@ export type IotaTransactionBlockKind =
       } /** A transaction which updates global authenticator state */
     | {
           epoch: string;
-          kind: 'AuthenticatorStateUpdate';
+          kind: 'AuthenticatorStateUpdateV1';
           new_active_jwks: IotaActiveJwk[];
           round: string;
       } /** A transaction which updates global randomness state */
diff --git a/sdk/typescript/src/graphql/generated/2024.10/schema.graphql b/sdk/typescript/src/graphql/generated/2024.10/schema.graphql
index fba63a69734..be787e02e22 100644
--- a/sdk/typescript/src/graphql/generated/2024.10/schema.graphql
+++ b/sdk/typescript/src/graphql/generated/2024.10/schema.graphql
@@ -191,7 +191,7 @@ type AuthenticatorStateExpireTransaction {
 	"""
 	minEpoch: Epoch
 	"""
-	The initial version that the AuthenticatorStateUpdate was shared at.
+	The initial version that the AuthenticatorStateUpdateV1 was shared at.
 	"""
 	authenticatorObjInitialSharedVersion: UInt53!
 }
@@ -4400,7 +4400,7 @@ type Validator {
 	"""
 	stakingPool: MoveObject @deprecated(reason: "The staking pool is a wrapped object. Access its fields directly on the `Validator` type.")
 	"""
-	The ID of this validator's `0x3::staking_pool::StakingPool`.
+	The ID of this validator's `0x3::staking_pool::StakingPoolV1`.
 	"""
 	stakingPoolId: IotaAddress!
 	"""
diff --git a/sdk/typescript/src/transactions/ObjectCache.ts b/sdk/typescript/src/transactions/ObjectCache.ts
index 6ce896a5d82..f33455d6304 100644
--- a/sdk/typescript/src/transactions/ObjectCache.ts
+++ b/sdk/typescript/src/transactions/ObjectCache.ts
@@ -267,11 +267,11 @@ export class ObjectCache {
     }
 
     async applyEffects(effects: typeof bcs.TransactionEffects.$inferType) {
-        if (!effects.V2) {
+        if (!effects.V1) {
             throw new Error(`Unsupported transaction effects version ${effects.$kind}`);
         }
 
-        const { lamportVersion, changedObjects } = effects.V2;
+        const { lamportVersion, changedObjects } = effects.V1;
 
         const deletedIds: string[] = [];
         const addedObjects: ObjectCacheEntry[] = [];
diff --git a/sdk/typescript/src/transactions/executor/caching.ts b/sdk/typescript/src/transactions/executor/caching.ts
index 6db0f214b1e..a57c342eabe 100644
--- a/sdk/typescript/src/transactions/executor/caching.ts
+++ b/sdk/typescript/src/transactions/executor/caching.ts
@@ -99,7 +99,7 @@ export class CachingTransactionExecutor {
     }
 
     async applyEffects(effects: typeof bcs.TransactionEffects.$inferType) {
-        this.#lastDigest = effects.V2?.transactionDigest ?? null;
+        this.#lastDigest = effects.V1?.transactionDigest ?? null;
         await this.cache.applyEffects(effects);
     }
 
diff --git a/sdk/typescript/src/transactions/executor/parallel.ts b/sdk/typescript/src/transactions/executor/parallel.ts
index 1d1e797f48f..36cf8455056 100644
--- a/sdk/typescript/src/transactions/executor/parallel.ts
+++ b/sdk/typescript/src/transactions/executor/parallel.ts
@@ -228,7 +228,7 @@ export class ParallelTransactionExecutor {
             const effects = bcs.TransactionEffects.parse(effectsBytes);
 
             const gasResult = getGasCoinFromEffects(effects);
-            const gasUsed = effects.V2?.gasUsed;
+            const gasUsed = effects.V1?.gasUsed;
 
             if (gasCoin && gasUsed && gasResult.owner === this.#signer.toIotaAddress()) {
                 const totalUsed =
@@ -428,14 +428,14 @@ export class ParallelTransactionExecutor {
         });
 
         const effects = bcs.TransactionEffects.parse(Uint8Array.from(result.rawEffects!));
-        effects.V2?.changedObjects.forEach(([id, { outputState }], i) => {
-            if (i === effects.V2?.gasObjectIndex || !outputState.ObjectWrite) {
+        effects.V1?.changedObjects.forEach(([id, { outputState }], i) => {
+            if (i === effects.V1?.gasObjectIndex || !outputState.ObjectWrite) {
                 return;
             }
 
             this.#coinPool.push({
                 id,
-                version: effects.V2!.lamportVersion,
+                version: effects.V1!.lamportVersion,
                 digest: outputState.ObjectWrite[0],
                 balance: BigInt(this.#initialCoinBalance),
             });
diff --git a/sdk/typescript/src/transactions/executor/serial.ts b/sdk/typescript/src/transactions/executor/serial.ts
index 8c0d92fef79..c11e6878b4c 100644
--- a/sdk/typescript/src/transactions/executor/serial.ts
+++ b/sdk/typescript/src/transactions/executor/serial.ts
@@ -41,7 +41,7 @@ export class SerialTransactionExecutor {
     }
 
     #cacheGasCoin = async (effects: typeof bcs.TransactionEffects.$inferType) => {
-        if (!effects.V2) {
+        if (!effects.V1) {
             return;
         }
 
@@ -117,11 +117,11 @@ export class SerialTransactionExecutor {
 }
 
 export function getGasCoinFromEffects(effects: typeof bcs.TransactionEffects.$inferType) {
-    if (!effects.V2) {
+    if (!effects.V1) {
         throw new Error('Unexpected effects version');
     }
 
-    const gasObjectChange = effects.V2.changedObjects[effects.V2.gasObjectIndex!];
+    const gasObjectChange = effects.V1.changedObjects[effects.V1.gasObjectIndex!];
 
     if (!gasObjectChange) {
         throw new Error('Gas object not found in effects');
@@ -139,7 +139,7 @@ export function getGasCoinFromEffects(effects: typeof bcs.TransactionEffects.$in
         ref: {
             objectId,
             digest,
-            version: effects.V2.lamportVersion,
+            version: effects.V1.lamportVersion,
         },
         owner: owner.AddressOwner || owner.ObjectOwner!,
     };
diff --git a/sdk/typescript/src/version.ts b/sdk/typescript/src/version.ts
index f786b1ed7a7..58ae2f1dd5b 100644
--- a/sdk/typescript/src/version.ts
+++ b/sdk/typescript/src/version.ts
@@ -5,4 +5,4 @@
 // This file is generated by genversion.mjs. Do not edit it directly.
 
 export const PACKAGE_VERSION = '0.2.0';
-export const TARGETED_RPC_VERSION = '0.4.0';
+export const TARGETED_RPC_VERSION = '0.5.0-alpha';
diff --git a/sdk/typescript/test/e2e/parallel-executor.test.ts b/sdk/typescript/test/e2e/parallel-executor.test.ts
index 391f1819633..35cd2b08626 100644
--- a/sdk/typescript/test/e2e/parallel-executor.test.ts
+++ b/sdk/typescript/test/e2e/parallel-executor.test.ts
@@ -146,9 +146,9 @@ describe('ParallelTransactionExecutor', { retry: 3 }, () => {
                 const result = await executor.executeTransaction(txb);
 
                 const effects = bcs.TransactionEffects.fromBase64(result.effects);
-                const newCoinId = effects.V2?.changedObjects.find(
+                const newCoinId = effects.V1?.changedObjects.find(
                     ([_id, { outputState }], index) =>
-                        index !== effects.V2.gasObjectIndex && outputState.ObjectWrite,
+                        index !== effects.V1.gasObjectIndex && outputState.ObjectWrite,
                 )?.[0]!;
 
                 return newCoinId;
diff --git a/sdk/typescript/test/e2e/serial-executor.test.ts b/sdk/typescript/test/e2e/serial-executor.test.ts
index 89c48bd8cdf..ab2ba8b74df 100644
--- a/sdk/typescript/test/e2e/serial-executor.test.ts
+++ b/sdk/typescript/test/e2e/serial-executor.test.ts
@@ -46,9 +46,9 @@ describe('SerialExecutor', { retry: 3 }, () => {
 
         const effects = bcs.TransactionEffects.fromBase64(result.effects);
 
-        const newCoinId = effects.V2?.changedObjects.find(
+        const newCoinId = effects.V1?.changedObjects.find(
             ([_id, { outputState }], index) =>
-                index !== effects.V2.gasObjectIndex && outputState.ObjectWrite,
+                index !== effects.V1.gasObjectIndex && outputState.ObjectWrite,
         )?.[0]!;
 
         expect(toolbox.client.getCoins).toHaveBeenCalledTimes(1);
@@ -82,9 +82,9 @@ describe('SerialExecutor', { retry: 3 }, () => {
 
         await toolbox.client.waitForTransaction({ digest: result.digest });
 
-        const newCoinId = effects.V2?.changedObjects.find(
+        const newCoinId = effects.V1?.changedObjects.find(
             ([_id, { outputState }], index) =>
-                index !== effects.V2.gasObjectIndex && outputState.ObjectWrite,
+                index !== effects.V1.gasObjectIndex && outputState.ObjectWrite,
         )?.[0]!;
 
         expect(toolbox.client.getCoins).toHaveBeenCalledTimes(1);
@@ -106,6 +106,6 @@ describe('SerialExecutor', { retry: 3 }, () => {
         const result2 = await executor.executeTransaction(txb3);
 
         expect(result2.digest).not.toEqual(result.digest);
-        expect(bcs.TransactionEffects.fromBase64(result2.effects).V2?.status.Success).toEqual(true);
+        expect(bcs.TransactionEffects.fromBase64(result2.effects).V1?.status.Success).toEqual(true);
     });
 });